Removed $config reference

[gosa.git] / plugins / admin / fai / class_faiPackage.inc

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index f634e130506c898c5dbf814c7f8d308cd9e889ba..2a9e4043a31c4864af744d2bfc3aaf607f806d74 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -321,6 +321,7 @@ class faiPackage extends plugin
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
     $ldap->rmdir_recursive($this->dn);
+    show_ldap_error($ldap->get_error(), _("Removing FAI package base failed"));
     $this->handle_post_events("remove");    
   }
 
@@ -443,7 +444,7 @@ class faiPackage extends plugin
 
     //    $this->attrs["FAIinstallMethod"]= "aptitude";
 
-    $ldap->cat($this->dn);
+    $ldap->cat($this->dn, array('dn'));
     if($ldap->count()!=0){
       /* Write FAIscript to ldap*/
       $ldap->cd($this->dn);
@@ -457,23 +458,25 @@ class faiPackage extends plugin
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
-    show_ldap_error($ldap->get_error());
+    show_ldap_error($ldap->get_error(), _("Saving FAI package base failed"));
 
     /* Do object tagging */
     $this->handle_object_tagging();
-    show_ldap_error($ldap->get_error());
     $ldap->cd($this->dn);
 
     /* Save Package configurations */
     foreach($this->ConfiguredPackages as $pkgname => $attrs){
       foreach($attrs as $name => $attr){
+      
+        $pkgattrs = array();
 
         foreach($attr as $n=>$v){
           if(empty($v)) $v = array();
         }
 
         /* Set attributes */
-        $pkgattrs['objectClass']          = "FAIdebconfInfo";
+        $pkgattrs['objectClass'][]        = "FAIdebconfInfo";
+
         $pkgattrs['FAIpackage']           = $pkgname;
         $pkgattrs['FAIvariable']          = $name;
         $pkgattrs['FAIvariableType']      = $attr['Type'];
@@ -481,7 +484,14 @@ class faiPackage extends plugin
         $pkgdn =  "FAIvariable=".$name.",".$this->dn;
 
         /* cehck if object already exists */
-        $ldap->cat($pkgdn);
+        $ldap->cat($pkgdn,array("objectClass"));
+
+        /* Workaround for missing "gosaAdministrativeUnitTag" */
+        $attrs = $ldap->fetch();
+        if((isset($attrs['objectClass'])) && (in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass']))){
+          $pkgattrs['objectClass'][] = "gosaAdministrativeUnitTag";
+        }
+    
         if($ldap->count()!=0){
           $ldap->cd($pkgdn);
           $this->cleanup();
@@ -493,7 +503,7 @@ class faiPackage extends plugin
           $ldap->cd($pkgdn);
           $ldap->add($pkgattrs);
         }
-        show_ldap_error($ldap->get_error());
+        show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
 
         /* Handle tagging */
         $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);