Also display new created variables

[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 45244b5c2db2cd1890d5b43c947ec5bda11171b6..fa81784ca939f47f4a092eb89600a363000befab 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -35,6 +35,7 @@ class faiVariable extends plugin
   var $SubObjects       = array();  // All leafobjects of this object
 
   var $FAIstate         = "";
+  var $ui   ;
 
   function faiVariable ($config, $dn= NULL)
   {
@@ -57,7 +58,7 @@ class faiVariable extends plugin
 
       $attrs_to_search = $this->subAttributes;
       $attrs_to_search[] = "FAIstate";
-      $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$this->subAttributes);
+      $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search);
 
       while($object = $ldap->fetch()){
       
@@ -84,13 +85,30 @@ class faiVariable extends plugin
         $this->SubObjects[$object['cn'][0]]['status']      = "edited";
         $this->SubObjects[$object['cn'][0]]['dn']          = $object['dn'];
       }
+
+      @log::log("view","fai/".get_class($this),$this->dn);
     }
+    $this->ui = get_userinfo();
   }
 
+
+  function acl_base_for_current_object($dn)
+  {
+    if($dn == "new"){
+      if($this->dn == "new"){
+        $dn= $_SESSION['CurrentMainBase'];
+      }else{
+        $dn = $this->dn;
+      }
+    }
+    return($dn);
+  }
+
+
   function execute()
   {
-       /* Call parent execute */
-       plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     /* Fill templating stuff */
     $smarty= get_smarty();
@@ -99,7 +117,7 @@ class faiVariable extends plugin
     /* Add new sub object */
     if(isset($_POST['AddSubObject'])){
       $this->dialog= new $this->subClassName($this->config,"new");
-      $this->dialog->sel_acl_base($_SESSION['CurrentMainBase']);
+      $this->dialog->set_acl_base($this->acl_base_for_current_object($this->dn));
       $this->dialog->set_acl_category("fai");
       $this->is_dialog=true;
     }
@@ -113,10 +131,7 @@ class faiVariable extends plugin
     if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){
 
       $var = $_POST['SubObject'][0];
-      $c_dn = $this->SubObjects[$var]['dn'];
-      if($c_dn=="new"){
-        $c_dn = $_SESSION['CurrentMainBase'];
-      }
+      $c_dn = $this->acl_base_for_current_object($this->SubObjects[$var]['dn']);
       $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$var]);
       $this->dialog->set_acl_category("fai");
       $this->dialog->set_acl_base($c_dn);
@@ -128,12 +143,8 @@ class faiVariable extends plugin
     if((isset($_POST['DelSubObject']))&&(isset($_POST['SubObject']))){
       foreach($_POST['SubObject'] as $var){
 
-        $c_dn = $this->SubObjects[$var]['dn'];
-        if($c_dn=="new"){
-          $c_dn = $_SESSION['CurrentMainBase'];
-        }
-        $ui = get_userinfo();
-        $acl = $ui->get_permissions($c_dn,"fai/faiVariable");
+        $c_dn = $this->acl_base_for_current_object($this->SubObjects[$var]['dn']);
+        $acl = $this->ui->get_permissions($c_dn,"fai/faiVariable");
         if(preg_match("/d/",$acl)){
           if($this->SubObjects[$var]['status'] == "edited"){
             $this->SubObjects[$var]['status']= "delete";
@@ -197,12 +208,21 @@ class faiVariable extends plugin
       return($display);
     }
 
-    $smarty->assign("SubObjects",$this->getList());
+    $ui = get_userinfo();
+    $ret = $this->getList();
+    $tmp = array();
+    foreach($this->SubObjects as $key => $obj){
+      $acl = $ui->get_permissions($obj['dn'],"fai/faiVariableEntry");
+      if(preg_match("/r/",$acl) || $obj['dn'] == "new"){
+        $tmp[$key] = $ret[$key];
+      } 
+    }
+    $smarty->assign("SubObjects",$tmp);
+
 
-      /* Magic quotes GPC, escapes every ' " \, to solve some security risks
+    /* Magic quotes GPC, escapes every ' " \, to solve some security risks
      * If we post the escaped strings they will be escaped again
      */
-
     foreach($this->attributes as $attrs){
       if(get_magic_quotes_gpc()){
         $smarty->assign($attrs,htmlentities (stripslashes(utf8_decode($this->$attrs))));
@@ -211,15 +231,10 @@ class faiVariable extends plugin
       }
     }
 
-    $this->ui = get_userinfo();
-    $c_dn = $this->dn;
-    if($c_dn == "new"){
-      $c_dn = $_SESSION['CurrentMainBase'];
-    }
+    $c_dn = $this->acl_base_for_current_object($this->dn);
     $smarty->assign("is_createable",     preg_match("/c/",$this->ui->get_permissions($c_dn,"fai/faiVariableEntry")) && $this->FAIstate!="freeze");
     $smarty->assign("is_removeable",  preg_match("/d/",$this->ui->get_permissions($c_dn,"fai/faiVariableEntry")) && $this->FAIstate!="freeze");
 
-
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translation) {
       $smarty->assign($name."ACL",$this->getacl($name));
@@ -259,26 +274,27 @@ class faiVariable extends plugin
    */
   function remove_from_parent()
   {
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd ($this->dn);
-
-#    $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
-    $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $this->dn);
-    if($_SESSION['faifilter']['branch'] == "main"){
-      $use_dn = $this->dn;
-    }
-
-    prepare_to_save_FAI_object($use_dn,array(),true);
+    if($this->acl_is_removeable()){
+      $ldap = $this->config->get_ldap_link();
+      $ldap->cd ($this->dn);
 
-    foreach($this->SubObjects as $name => $obj){
-#      $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $obj['dn']);
-      $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $obj['dn']);
+      $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $this->dn);
       if($_SESSION['faifilter']['branch'] == "main"){
-        $use_dn = $obj['dn'];
+        $use_dn = $this->dn;
       }
+  
       prepare_to_save_FAI_object($use_dn,array(),true);
+      @log::log("remove","fai/".get_class($this),$use_dn,$this->attributes);
+
+      foreach($this->SubObjects as $name => $obj){
+        $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_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");
     }
-    $this->handle_post_events("remove");
   }
 
 
@@ -315,6 +331,12 @@ class faiVariable extends plugin
     $ldap = $this->config->get_ldap_link();
     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));
+
+    if($this->initially_was_account){
+      @log::log("modify","fai/".get_class($this),$this->dn,$this->attributes);
+    }else{
+      @log::log("create","fai/".get_class($this),$this->dn,$this->attributes);
+    }
  
     /* Do object tagging */
     $this->handle_object_tagging();