Added some group 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 73028ecb2b20c0dbb2f0700a537e5f899f31c970..2610db8aeb7f11680549e9a240681fedd28c07a6 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]="";
@@ -301,33 +311,20 @@ class faiScript extends plugin
     $ldap->cd ($this->dn);
 
     $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
-
-    $attr = prepare_ldap_fetch_to_be_saved($this->attrs);
-    if(isset($attr['FAIstate'][0])){
-      if(!preg_match("/removed$/",$attr['FAIstate'][0])){
-        $attr['FAIstate'][0] .= "|removed";
-      }   
-    }else{
-      $attr['FAIstate'][0] = "|removed";
+    if($_SESSION['faifilter']['branch'] == "main"){
+      $use_dn = $this->dn;
     }
-   
-    prepare_to_save_FAI_object($use_dn,$attr);
+  
+    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']);
-
-      $ldap->cat($obj['dn']);
-      $attr = prepare_ldap_fetch_to_be_saved($ldap->fetch());
-      if(isset($attr['FAIstate'][0])){
-        if(!preg_match("/removed$/",$attr['FAIstate'][0])){
-          $attr['FAIstate'][0] .= "|removed";
-        }   
-      }else{
-        $attr['FAIstate'][0] = "|removed";
+      if($_SESSION['faifilter']['branch'] == "main"){
+        $use_dn = $obj['dn'];
       }
-      prepare_to_save_FAI_object($use_dn,$attr);
+      prepare_to_save_FAI_object($use_dn,array(),true);
     }
+    $this->handle_post_events("remove");
   }
 
 
@@ -362,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 */
@@ -445,42 +427,33 @@ class faiScript extends plugin
         }
       }
 
-
       if($obj['status'] == "delete"){
-  
-        $tmp['FAIstate'] = "|removed";
-        prepare_to_save_FAI_object($sub_dn,$tmp);
-
-        $ldap->cd($sub_dn);
-        //$ldap->rmdir_recursive($sub_dn);
+        prepare_to_save_FAI_object($sub_dn,array(),true);
         $this->handle_post_events("remove");
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/script entry with dn '%s' failed."),$this->dn));
       }elseif($obj['status'] == "edited"){
-        $ldap->cd($sub_dn);
-        $this->cleanup();
         prepare_to_save_FAI_object($sub_dn,$tmp);
-       // $ldap->modify ($tmp); 
-
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
-        if($tmp['description']==array()){
-          unset($tmp['description']);
-        }
-        if($tmp['FAIscript']==array()){
-          $tmp['FAIscript']=" ";
-        }
-        $ldap->cd($this->config->current['BASE']);
-        $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
-        $ldap->cd($sub_dn);
         prepare_to_save_FAI_object($sub_dn,$tmp);
-       // $ldap->add($tmp); 
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/script entry with dn '%s' failed."),$this->dn));
       }
 
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
     }
   }
+  
+  /* Return plugin informations for acl handling */ 
+  function plInfo()
+  {
+    return (array(  
+          "plDescription"     => _("FAI script"),
+          "plSelfModify"      => FALSE,
+          "plDepends"         => array("objectClass" => "FAIclass"),
+          "cn"                => _("Name"),
+          "description"       => _("Description"),
+          "FAIpriority"       => _("Script priority"),
+          "FAIscript"         => _("FAI script")));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: