Several cleanup fixes for systems

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

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index bc732438676cce172781bb4f65c1ce9f22202021..ed47351eaf4726ca610532ebf4b3d7463cec06d3 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -41,7 +41,7 @@ class printgeneric extends plugin
   var $netConfigDNS;
 
   /* attribute list for save action */
-  var $attributes     = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD");
+  var $attributes     = array("cn", "description", "l", "labeledURI", "gotoPrinterPPD","gotoUserPrinter");
   var $objectclasses  = array("top", "gotoPrinter");
 
   function printgeneric ($config, $dn= NULL)
@@ -579,6 +579,9 @@ class printgeneric extends plugin
 
     /* Append printer user 
      */
+    if(is_string( $this->attrs['gotoUserPrinter'])){
+       $this->attrs['gotoUserPrinter']=array();
+    }
     foreach($this->member['AddUser'] as $mem){
       $this->attrs['gotoUserPrinter'][]=$mem['uid'][0];
     }

diff --git a/plugins/admin/systems/class_servDNS.inc b/plugins/admin/systems/class_servDNS.inc
index aa34030714e28a7ca0902b76ff32ccdee024cf4d..c31971f3fcf97125e264f3e9a8243b4b233653eb 100644 (file)
--- a/plugins/admin/systems/class_servDNS.inc
+++ b/plugins/admin/systems/class_servDNS.inc
@@ -9,7 +9,7 @@ class servdns extends plugin
 
   /* attribute list for save action */
   var $ignore_account   = FALSE;
-  var $attributes       = array(""); 
+  var $attributes       = array(); 
   var $objectclasses    = array("whatever");
 
   var $RecordTypes      = array();
@@ -388,8 +388,8 @@ class servdns extends plugin
     /* Update existing entries */
     foreach($actions['update'] as $dn => $attrs){
       $ldap->cd($dn);
-      $this->cleanup();
-$ldap->modify ($attrs); 
+      //$this->cleanup();
+      $ldap->modify ($attrs); 
 
     }
     show_ldap_error($ldap->get_error());

diff --git a/plugins/admin/systems/class_servKolab.inc b/plugins/admin/systems/class_servKolab.inc
index 9d317fa69207185710eae94dec6953bdcdeb4197..3303af3ff712f6ab0639c677cc146ae016662537 100644 (file)
--- a/plugins/admin/systems/class_servKolab.inc
+++ b/plugins/admin/systems/class_servKolab.inc
@@ -312,7 +312,7 @@ $ldap->modify ($attrs);
 
     /* Perform LDAP action */
     $ldap->cd($this->dn);
-    $this->cleanup();
+    $this->cleanup();;
     $ldap->$mode($this->attrs);
     show_ldap_error($ldap->get_error());
     

diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 281fd789796b9af4020c5e57a74796635a1cb62b..4871be46fb1e50ef9ea39ab613ff76b9306a35b2 100644 (file)
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -23,7 +23,7 @@ class servservice extends plugin
 
   /* attribute list for save action */
   var $ignore_account= TRUE;
-  var $attributes       = array("goLdapBase","goXdmcpIsEnabled","goFontPath");
+  var $attributes       = array("goLdapBase","goXdmcpIsEnabled","goFontPath","goExportEntry","goTimeSource");
   var $possible_objectclasses= array( "goShareServer", "goNtpServer", "goServer", "goLdapServer",
                                       "goTerminalServer", "goSyslogServer", "goCupsServer","goMailServer");
   var $objectclasses    = array( "top","goServer"); 
@@ -57,6 +57,7 @@ class servservice extends plugin
       $this->$name= $tmp;
     }
 
+
     $tmp =array();
     $tmp2=array();
     if(isset($this->attrs['goExportEntry'])){

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index b525f7b9d61622bdacc96c4031ec4906d1416932..763f0e7fa24164cbdfc9691941e073ebd7a4f26c 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -362,8 +362,8 @@ $ldap->modify ($this->attrs);
         
         if(count($ldap->fetch())){
           $ldap->cd($dn);
-          $this->cleanup();
-$ldap->modify ($attrs); 
+//          $this->cleanup();
+          $ldap->modify ($attrs); 
 
         }else{
           $ldap->cd($dn);