Removed samba properties

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4847 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc
index 2158806541b83b0ee86d2c2465de53f5993ef7c5..6480f8d5e6cbbe646d730c26093b086ef29141be 100644 (file)
--- a/plugins/admin/fai/class_faiManagement.inc
+++ b/plugins/admin/fai/class_faiManagement.inc
@@ -198,9 +198,8 @@ class faiManagement extends plugin
                                $ldap->cat($this->dn, array('objectClass'));
                                $attrs  = $ldap->fetch();
                                $type     = $this->get_type($attrs);                    
-                               $this->dialog = new $type[0]($this->config,     $this->config->data['TABS'][$type[2]], $this->dn);
+                               $this->dialog = new $type[0]($this->config,     $this->config->data['TABS'][$type[2]], $this->dn,"fai");
         $this->dialog->set_acl_base($this->dn);
-        $this->dialog->set_acl_category("fai");
                                $this->dialog->by_object[$type[1]]->remove_from_parent ();
                                unset ($this->dialog);
                                gosa_log ("FAI class '".$this->dn."' has been tagged as removed");
@@ -244,7 +243,6 @@ class faiManagement extends plugin
 
                        $this->dialog     = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
       $this->dialog->set_acl_base($this->dn);
-//      $this->dialog->set_acl_category("fai");
                        $this->is_dialog  = true;
 
       if($entry['FAIstate'] == "freeze"){
@@ -537,8 +535,8 @@ class faiManagement extends plugin
         $a_setup= $this->get_type(array("objectClass"=>array($this->dialog->objectClass)));
         $name = $this->dialog->save();
 
-        $this->dialog = new $a_setup[0]($this->config,
-            $this->config->data['TABS'][$a_setup[2]],$this->dn,$name);
+        $this->dialog = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
+        $this->dialog->set_acl_base($_SESSION['CurrentMainBase']);
         $this->dialog->by_object[$a_setup[1]]->cn = $name;
         $this->is_dialog = true;
       }                

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 3dd1a51366c7c333a749b81458cd3bba292bdf6d..054c3dcb628980867480066f060554e938093f16 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -285,7 +285,12 @@ class faiScript extends plugin
 
     $tmp = $this->plInfo();
     $this->ui = get_userinfo();
-    $smarty->assign("sub_object_is_addable", preg_match("/c/",$this->ui->get_permissions($this->dn,"fai/faiScriptEntry")));
+
+    $c_dn = $this->dn;  
+    if($c_dn == "new"){
+      $c_dn = $_SESSION['CurrentMainBase'];
+    }
+    $smarty->assign("sub_object_is_addable", preg_match("/c/",$this->ui->get_permissions($c_dn,"fai/faiScriptEntry")) && $this->FAIstate!="freeze");
     foreach($tmp['plProvidedAcls'] as $name => $translated){
       $smarty->assign($name."ACL",$this->getacl($name));
     }