Handle postfix_mynetworks as single value seperated by ,

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3593 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index d6a30a0e95bdbb42f8de8435567c443a2910a30d..901133c6216a60096187c842c51a67dd1444ded6 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -70,19 +70,6 @@ class servkolab extends plugin {
       }
     } 
 
-    /* Parse mynetworks */
-    if(isset($this->attrs['postfix-mynetworks'])){
-      if(is_array($this->attrs['postfix-mynetworks'])){  
-        unset($this->attrs['postfix-mynetworks']['count']);
-        $tmp="";
-        foreach($this->attrs['postfix-mynetworks'] as $tm){
-          $tmp.=$tm.";";
-        }
-        $this->postfix_mynetworks = $tmp;
-      }
-    }else{
-      $this->postfix_mynetworks="";
-    }
   }
 
 
@@ -323,17 +310,6 @@ class servkolab extends plugin {
       $this->kolabHost[]= $this->cn;
     }
 
-    /* Create mynetworks array by splitting the string with ; */
-    $tmp = split(";",$this->postfix_mynetworks);
-    $this->postfix_mynetworks = array();
-    foreach($tmp as $tm){
-      trim($tm);
-      if(!empty($tm)){
-        $this->postfix_mynetworks[]=$tm;
-      }
-    }
-    $this->attrs['postfix_mynetworks']=$this->postfix_mynetworks;
-
     /* Call parents save to prepare $this->attrs */
     plugin::save();
 

diff --git a/plugins/admin/systems/servkolab.tpl b/plugins/admin/systems/servkolab.tpl
index 58578bade6c4048e3d5db5b8a796bb490f8206f5..446340eb235a98d1d610491d9373abecb7ff57a3 100644 (file)
--- a/plugins/admin/systems/servkolab.tpl
+++ b/plugins/admin/systems/servkolab.tpl
@@ -141,7 +141,7 @@
            <LABEL for="postfix_mynetworks">{t}Hosts/networks allowed to relay{/t}</LABEL><br>
         <input id="postfix_mynetworks" name="postfix_mynetworks" size="60" maxlength="220" value="{$postfix_mynetworks}" {$postfix_mynetworksACL} type="text">
                <br>
-               ( {t}Enter multiple values, seperated with{/t} ; )
+               ( {t}Enter multiple values, seperated with{/t} , )
        </td>
      </tr>
    </table>