Fixed ogroup saving

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

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index 50931968045e1ad029dcdb134028d17e4d3352aa..4255fb71b205a03c3330d38a5c32d46768f1d40e 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -105,11 +105,11 @@ class faiTemplate extends plugin
 
         /*  check if this is a binary entry */
         if(in_array_ics($attrs,$this->subBinary)){
-          $var = addslashes( $ldap->get_attribute($object['dn'], $attrs,$r_array=0));
+          $var = $ldap->get_attribute($object['dn'], $attrs,$r_array=0);
         }
 
-        /* Fix slashes */
-        $var = addslashes($var);
+        $var = stripslashes($var);
+  
         $object[$attrs] = $var;
       }
     }
@@ -310,7 +310,8 @@ class faiTemplate extends plugin
     $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 = 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;
     }
@@ -318,7 +319,8 @@ class faiTemplate extends plugin
     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']);
+#      $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']);
       if($_SESSION['faifilter']['branch'] == "main"){
         $use_dn = $obj['dn'];
       }
@@ -400,7 +402,7 @@ class faiTemplate extends plugin
         if(empty($obj[$attrs])){
           $obj[$attrs] = array();
         }
-        $tmp[$attrs] = $obj[$attrs];
+        $tmp[$attrs] = stripslashes($obj[$attrs]);
       }    
         
       $tmp['objectClass'] = $this->subClasses;
@@ -450,7 +452,7 @@ class faiTemplate extends plugin
           "plDescription" => _("FAI template"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 0,
+          "plPriority"    => 24,
           "plSection"     => array("administration"),
           "plCategory"    => array("fai"),
           "plProvidedAcls" => array(