Udpated fai acls

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

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 9a398886ce00d66ed95eb75f1e3326c5ea5fd206..360ed01f34aa72a5395f431baf87f3cfa38fff23 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -68,11 +68,21 @@ class faiScript extends plugin
        */
       $ldap     = $this->config->get_ldap_link();
       $ldap->cd ($this->dn);
-      $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$this->subAttributes);
+      
+      $attrs_to_search = $this->subAttributes;
+      $attrs_to_search[] = "FAIstate";
+      $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
 
       while($object = $ldap->fetch()){
-        /* Set status for save management */
 
+        /* Skip objects, that are tagged as removed */
+        if(isset($object['FAIstate'][0])){
+          if(preg_match("/removed$/",$object['FAIstate'][0])){
+            continue;
+          }
+        }
+
+        /* Set status for save management */
         foreach($this->subAttributes as $attrs){
           if(!isset($object[$attrs][0])){
             $this->SubObjects[$object['cn'][0]][$attrs]="";
@@ -305,26 +315,16 @@ class faiScript extends plugin
       $use_dn = $this->dn;
     }
   
-    $del = array();
-    $del[] = prepare_to_save_FAI_object($use_dn,array(),true);
+    prepare_to_save_FAI_object($use_dn,array(),true);
     
     foreach($this->SubObjects as $name => $obj){
       $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
       if($_SESSION['faifilter']['branch'] == "main"){
         $use_dn = $obj['dn'];
       }
-      $del[] = prepare_to_save_FAI_object($use_dn,array(),true);
-    }
-
-    /* Delete unused objects */
-    foreach($del as $dn){
-      if(!empty($dn)){
-        $ldap->cat($dn);
-        if($ldap->count()){
-          $ldap->rmdir_recursive($dn);
-        }
-      }
+      prepare_to_save_FAI_object($use_dn,array(),true);
     }
+    $this->handle_post_events("remove");
   }
 
 
@@ -359,23 +359,8 @@ class faiScript extends plugin
     plugin::save();
 
     $ldap = $this->config->get_ldap_link();
-    $ldap->cat($this->dn,array("objectClass"));
 
     prepare_to_save_FAI_object($this->dn,$this->attrs);
-
-    if($ldap->count()!=0){
-      /* Write FAIscript to ldap*/
-      $ldap->cd($this->dn);
-      $this->cleanup();
-//      $ldap->modify ($this->attrs); 
-
-    }else{
-      /* Write FAIscript to ldap*/
-      $ldap->cd($this->config->current['BASE']);
-      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
-      $ldap->cd($this->dn);
-//      $ldap->add($this->attrs);
-    }
     show_ldap_error($ldap->get_error(), sprintf(_("Creating of FAI/script with dn '%s' failed."),$this->dn));
 
     /* Do object tagging */
@@ -442,7 +427,6 @@ class faiScript extends plugin
         }
       }
 
-
       if($obj['status'] == "delete"){
         prepare_to_save_FAI_object($sub_dn,array(),true);
         $this->handle_post_events("remove");
@@ -457,6 +441,26 @@ class faiScript extends plugin
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
     }
   }
+  
+
+  /* Return plugin informations for acl handling */ 
+  function plInfo()
+  {
+    return (array( 
+          "plShortName" => _("Script"),
+          "plDescription" => _("FAI script"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("fai"),
+          "plProvidedAcls" => array(
+            "cn"                => _("Name"),
+            "description"       => _("Description"),
+            "FAIpriority"       => _("Script priority"),
+            "FAIscript"         => _("FAI script"))
+          ));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: