Removed duplicated save_object

[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 2e30084b7e5ae67c05f41466ec2177bb96eac2f3..2a9e4043a31c4864af744d2bfc3aaf607f806d74 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -100,27 +100,37 @@ class faiPackage extends plugin
       $this->usedPackages = array();
     }  
 
-    $ldap = $this->config->get_ldap_link();
+
+    /* Create one filter with all package names, 
+       instead of calling $ldap->search for every single package 
+     */
+    $PackageFilter = "";
     foreach($this->usedPackages as $name){
-      $ldap->search("(&(objectClass=FAIdebconfInfo)(FAIpackage=".$name."))",array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection",""));
-      while($attr = $ldap->fetch()){
-
-        $tmp =array(); 
-        $tmp['Name']  = $attr['FAIvariable'][0];
-        $tmp['Type']  = $attr['FAIvariableType'][0];
-
-        if (isset($attr['FAIvariableContent'][0])){
-          if(!in_array($attr['FAIvariableType'],array("multiselect"))){
-            $tmp['Value'] = $attr['FAIvariableContent'][0];
-          }else{
-            $content = array();        
-            unset($attr['FAIvariableContent']['count']);
-            foreach($attr['FAIvariableContent'] as $attr){
-              $tmp['Value'][] = $attr;
-            }
+      $PackageFilter .= "(FAIpackage=".$name.")";
+    }
+    $PackageFilter = "(&(objectClass=FAIdebconfInfo)(|".$PackageFilter."))";
+    
+    /* Search for configuration objects */ 
+    $ldap = $this->config->get_ldap_link();
+    $ldap->search($PackageFilter,array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection"));
+
+    /* Walk through configurations and append them to our list of ConfiguredPackages */
+    while($attr = $ldap->fetch()){
+      $tmp =array(); 
+      $tmp['Name']  = $attr['FAIvariable'][0];
+      $tmp['Type']  = $attr['FAIvariableType'][0];
+
+      if (isset($attr['FAIvariableContent'][0])){
+        if(!in_array($attr['FAIvariableType'],array("multiselect"))){
+          $tmp['Value'] = $attr['FAIvariableContent'][0];
+        }else{
+          $content = array();        
+          unset($attr['FAIvariableContent']['count']);
+          foreach($attr['FAIvariableContent'] as $attr){
+            $tmp['Value'][] = $attr;
           }
-          $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
         }
+        $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
       }
     }
 
@@ -311,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");    
   }
 
@@ -433,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);
@@ -447,18 +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();
+    $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'];
@@ -466,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();
@@ -478,7 +503,10 @@ 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);
       }
     }