Added acls to mimetype

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

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 49aa77226df402ff31922b0a83f03d3ac42d7d97..eb2c71c0562278b3b7d1a4cebcef3278cdd01326 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -68,11 +68,21 @@ class faiVariable extends plugin
        */
       $ldap     = $this->config->get_ldap_link();
       $ldap->cd ($this->dn);
+
+      $attrs_to_search = $this->subAttributes;
+      $attrs_to_search[] = "FAIstate";
       $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$this->subAttributes);
 
       while($object = $ldap->fetch()){
+      
+        /* 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]="";
@@ -240,8 +250,22 @@ class faiVariable extends plugin
   {
     $ldap = $this->config->get_ldap_link();
     $ldap->cd ($this->dn);
-    $ldap->rmdir_recursive($this->dn);
-    $this->handle_post_events("remove");    
+
+    $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+    if($_SESSION['faifilter']['branch'] == "main"){
+      $use_dn = $this->dn;
+    }
+
+    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'];
+      }
+      prepare_to_save_FAI_object($use_dn,array(),true);
+    }
+    $this->handle_post_events("remove");
   }
 
 
@@ -276,21 +300,7 @@ class faiVariable extends plugin
     plugin::save();
  
     $ldap = $this->config->get_ldap_link();
-  
-    $ldap->cat($this->dn,array("objectClass"));
-    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(preg_replace('/^[^,]+,[^,]+,/', '', $this->dn));
-      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
-      $ldap->cd($this->dn);
-      $ldap->add($this->attrs);
-    }
+    prepare_to_save_FAI_object($this->dn,$this->attrs);
     show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$this->dn));
  
     /* Do object tagging */
@@ -348,36 +358,40 @@ class faiVariable extends plugin
           }
         }
       }
- 
+      
       if($obj['status'] == "delete"){
-        $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(_("Removing of FAI/variable with dn '%s' failed."),$sub_dn));
       }elseif($obj['status'] == "edited"){
-        $ldap->cd($sub_dn);
-        $this->cleanup();
-        $ldap->modify ($tmp); 
-
+        prepare_to_save_FAI_object($sub_dn,$tmp);
         $this->handle_post_events("modify");
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$sub_dn));
       }elseif($obj['status']=="new"){
-
-        if($tmp['description'] == array()){
-          unset($tmp['description']);
-        }
-
-        $ldap->cd(preg_replace('/^[^,]+,[^,]+,/', '', $sub_dn));
-        $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $sub_dn));
-        $ldap->cd($sub_dn);
-        $ldap->add($tmp); 
+        prepare_to_save_FAI_object($sub_dn,$tmp);
         $this->handle_post_events("add");
-        show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/variable with dn '%s' failed."),$sub_dn));
       }
 
       $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
     }
   }
+
+  
+  /* Return plugin informations for acl handling */ 
+  function plInfo()
+  {
+    return (array( 
+          "plShortName" => _("Variable"),
+          "plDescription" => _("FAI variable"),
+          "plSelfModify"  => FALSE,
+          "plDepends"     => array(),
+          "plPriority"    => 0,
+          "plSection"     => array("administration"),
+          "plCategory"    => array("fai"),
+          "plProvidedAcls" => array(
+            "cn"                => _("Name"),
+            "description"       => _("Description"),
+            "FAIvariableContent"=> _("Variable content"))
+          ));
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: