X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servService.inc;h=850a9551550e61b9f2ae218bd37b010e3bdb3c7f;hb=f46b5bdda0a7bb0773e5fc982c0c5098a77b10c8;hp=020f6d58d5b26eab772e6dce69362aab2269b948;hpb=954d85102ed73971fb026c26f1167161303d48e9;p=gosa.git

diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 020f6d58d..850a95515 100644
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -7,24 +7,25 @@ class servservice extends plugin
   var $cli_description= "Some longer text\nfor help";
   var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
 
-  var $goExportEntry  = array();
-  var $goTimeSource   = array();
-  var $goLdapBase= "";
-  var $goXdmcpIsEnabled ="";
-  var $goFontPath= "";
-  var $goNTPServer="";
-  var $goLdapServer="";
-  var $goTerminalServer="";
-  var $goSyslogServer="";
-  var $goCupsServer="";
-  var $o_subWindow = NULL;
+  var $goExportEntry    = array();
+  var $goTimeSource     = array();
+  var $goLdapBase       = "";
+  var $goXdmcpIsEnabled = "";
+  var $goFontPath       = "";
+  var $goNTPServer      = "";
+  var $goShareServer      = "";
+  var $goLdapServer     = "";
+  var $goTerminalServer = "";
+  var $goSyslogServer   = "";
+  var $goCupsServer     = "";
+  var $o_subWindow      = NULL;
 
   /* attribute list for save action */
   var $ignore_account= TRUE;
   var $attributes       = array("goLdapBase","goXdmcpIsEnabled","goFontPath");
   var $possible_objectclasses= array( "goShareServer", "goNtpServer", "goServer", "goLdapServer",
                                       "goTerminalServer", "goSyslogServer", "goCupsServer");
-  var $objectclasses    = array("top","goServer"); 
+  var $objectclasses    = array( "top","goServer"); 
   var $additionaloc     = array( "goShareServer"     => array("goExportEntry"),
                                  "goNtpServer"     => array("goTimeSource"),
                                  "goLdapServer"    => array("goLdapBase"),
@@ -246,7 +247,6 @@ class servservice extends plugin
   /* Save to LDAP */
   function save()
   {
-
     plugin::save();
 
     $tmp= array();
@@ -257,7 +257,7 @@ class servservice extends plugin
         $tmp[]= $oc;
       }
     }
-
+    
     /* Merge our current objectclasses */
     foreach($this->objectclasses as $oc){
       if (!in_array_ics($oc, $tmp)){
@@ -268,15 +268,6 @@ class servservice extends plugin
     /* Reassign cleaned value */
     $this->attrs['objectClass']= $tmp;
 
-    /* Remove illegal attributes */
-    foreach ($this->additionaloc as $oc => $attrs){
-      if (!in_array($oc, $this->objectclasses)){
-        foreach ($attrs as $attr){
-          $this->attrs[$attr]= array();
-        }
-      }
-    }
-
     /* Arrays */
     foreach (array("goTimeSource", "goExportEntry") as $name){
       $this->attrs[$name]= array();
@@ -285,13 +276,14 @@ class servservice extends plugin
       }
     }
  
-    $oc = array();
-    foreach($this->attrs['objectClass'] as $name){
-      if($name!="goNfsServer"){
-        $oc[]=$name; 
+    /* Remove illegal attributes */
+    foreach ($this->additionaloc as $oc => $attrs){
+      if (!in_array($oc, $this->objectclasses)){
+        foreach ($attrs as $attr){
+          $this->attrs[$attr]= array();
+        }
       }
     }
-    $this->attrs['objectClass']=$oc;
 
     /* Write to LDAP */
     $ldap= $this->config->get_ldap_link();