Updated some FAI plugins

-Testet HTML Posts && ACLs.

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc
index 6778811fb4bfd420e72a37469cb3cf9df757a926..5753521c68310288c0de6ec92d391efbbc619683 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiHook.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc
@@ -418,11 +418,6 @@ class faiHook extends plugin
   {
     if((isset($_POST['FAIhook_posted'])) && !preg_match("/^freeze/", $this->FAIstate)){
       plugin::save_object();
-      foreach($this->attributes as $attrs){
-        if(isset($_POST[$attrs])){
-          $this->$attrs = $_POST[$attrs];
-        }
-      }
     }
   }
 

diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc
index 2488e4c545599677ea6a45c032eae424d69d0984..7a480bbea4acc83676a45c10e9707fab401af1cb 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiScript.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc
@@ -451,11 +451,6 @@ class faiScript extends plugin
   {
     if((isset($_POST['FAIscript_posted'])) && !preg_match("/freeze/", $this->FAIstate)){
       plugin::save_object();
-      foreach($this->attributes as $attrs){
-        if(isset($_POST[$attrs])){
-          $this->$attrs = $_POST[$attrs];
-        }
-      }
     }
     
     /* Get sort order */

diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplateEntry.inc b/gosa-plugins/fai/admin/fai/class_faiTemplateEntry.inc
index b71bf4bce40672b82c6cba1f9605709ee4f2e409..84e578b0b78eb261ed331f7894898a82fffd5500 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiTemplateEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiTemplateEntry.inc
@@ -147,6 +147,10 @@ class faiTemplateEntry extends plugin
     /* Check if form is posted and we are not freezed */
     if((isset($_POST['SubObjectFormSubmitted'])) && !preg_match("/freeze/", $this->FAIstate)){
 
+      /* Remember destination current path 
+          depending on the ACLs we will assemble a new one later.
+       */
+      $cur_path = $this->FAItemplatePath;
       plugin::save_object();
 
       /* Set user.group (FAIowner) attribute */  
@@ -173,11 +177,20 @@ class faiTemplateEntry extends plugin
           $tmode= $tmode.$dest;
         }
         $this->FAImode= $tmode;
+      }
+
+      /* Check if we are allowed to change the destination directory 
+       */
+      if($this->acl_is_writeable("FAItemplatePath")){
+        $cur_path = $this->FAItemplatePath.'/'.basename($cur_path);
+      }
 
-        /* Assemble cn/FAItemplatePath */
-        $this->cn= preg_replace('/\/+/', '/', $this->FAItemplatePath.'/'.$this->cn);
-        $this->FAItemplatePath= $this->cn;
+      /* Check if we are allowed to change the destination directory 
+       */
+      if($this->acl_is_writeable("cn")){
+        $cur_path = dirname($cur_path).'/'.$this->cn;
       }
+      $this->FAItemplatePath = $cur_path;
     }
   }
 

diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc
index 7c7f3f69a5e1d2a3dc7584d0ecfb46de31ca1233..40ece132514c32bb34b116f27ba164e1ca17b31b 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc
@@ -276,11 +276,6 @@ class faiVariable extends plugin
   {
     if((isset($_POST['FAIvariable_posted'])) && !preg_match("/freeze/", $this->FAIstate) ){
       plugin::save_object();
-      foreach($this->attributes as $attrs){
-        if(isset($_POST[$attrs])){
-          $this->$attrs = $_POST[$attrs];
-        }
-      }
     }
   }