X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiVariable.inc;h=fdf650198cee305ddb4104f1f881e474eebeafa6;hb=9b25237f54851184687508985664d73a12afcd87;hp=90faabf355e0ae6b27d56790bf7638da61fbc7a2;hpb=6d616a278a0cdf88007b6b9ff320c29a8225837e;p=gosa.git

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 90faabf35..fdf650198 100644
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -25,7 +25,7 @@ class faiVariable extends plugin
 
   /* Attributes to initialise for each subObject */
   var $subAttributes    = array("cn","description","FAIvariableContent"); 
-  var $sub64coded       = array("FAIvariableContent");  
+  var $sub64coded       = array();  
 
   /* Specific attributes */
   var $cn               = "";       // The class name for this object
@@ -70,11 +70,15 @@ class faiVariable extends plugin
         $this->SubObjects[$object['cn'][0]]['status']      = "edited";
         $this->SubObjects[$object['cn'][0]]['dn']          = $object['dn'];
       }
+      ksort($this->SubObjects);
     }
   }
 
   function execute()
   {
+	/* Call parent execute */
+	plugin::execute();
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $display= "";
@@ -85,9 +89,15 @@ class faiVariable extends plugin
       $this->is_dialog=true;
     }
 
+    if($this->dn != "new"){
+      $_SESSION['objectinfo']= $this->dn;
+    }
+
+
     /* Edit selected Sub Object */
     if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){
       $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]);
+      $_SESSION['objectinfo'] = $this->SubObjects[$_POST['SubObject']]['dn'];
       $this->is_dialog=true;
     }
     
@@ -125,6 +135,7 @@ class faiVariable extends plugin
         $this->is_dialog=false;
         unset($this->dialog);
         $this->dialog=NULL;
+        ksort($this->SubObjects);
       }
     }
 
@@ -144,11 +155,19 @@ class faiVariable extends plugin
 
     $smarty->assign("SubObjects",$this->getList());
     $smarty->assign("SubObjectKeys",array_flip($this->getList()));
-    /* Assign variables */
+
+      /* 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){
-      $smarty->assign($attrs,$this->$attrs);
+      if(get_magic_quotes_gpc()){
+        $smarty->assign($attrs,stripslashes($this->$attrs));
+      }else{
+        $smarty->assign($attrs,($this->$attrs));
+      }
     }
 
+
     $display.= $smarty->fetch(get_template_path('faiVariable.tpl', TRUE));
     return($display);
   }
@@ -159,11 +178,20 @@ class faiVariable extends plugin
     $a_return=array();
     foreach($this->SubObjects as $obj){
       if($obj['status'] != "delete"){
+
+        if((isset($obj['description']))&&(!empty($obj['description']))&&(!preg_match("/\[\*\]/",$obj['description']))){
           if (preg_match("/\[\*\]/", $obj['description'])){
             $a_return[$obj['cn']]= $obj['cn']." [".preg_replace("/\s*\[\*\]\s*/", "", $obj['description'])."]";
           } else {
             $a_return[$obj['cn']]= $obj['cn']."=".$obj['FAIvariableContent']." [".$obj['description']."]";
           }
+        }else{
+          if (preg_match("/\[\*\]/", $obj['description'])){
+            $a_return[$obj['cn']]= $obj['cn'];
+          } else {
+            $a_return[$obj['cn']]= $obj['cn']."=".$obj['FAIvariableContent'];
+          }
+        }
       }
     }
     return($a_return);
@@ -184,10 +212,12 @@ class faiVariable extends plugin
    */
   function save_object()
   {
-    plugin::save_object();
-    foreach($this->attributes as $attrs){
-      if(isset($_POST[$attrs])){
-        $this->$attrs = $_POST[$attrs];
+    if(isset($_POST['FAIvariable_posted'])){
+      plugin::save_object();
+      foreach($this->attributes as $attrs){
+        if(isset($_POST[$attrs])){
+          $this->$attrs = $_POST[$attrs];
+        }
       }
     }
   }
@@ -197,10 +227,6 @@ class faiVariable extends plugin
   function check()
   {
     $message= array();
-    $str = utf8_encode("üöä");
-    if((empty($this->description))||(preg_match("/[^a-z0-9".$str."\.,;:\-_\? ]/i",$this->description))){
-      $message[]=_("Please enter a valid description.");
-    }
     return ($message);
   }
 
@@ -219,8 +245,8 @@ class faiVariable extends plugin
       $ldap->modify($this->attrs);
     }else{
       /* Write FAIscript to ldap*/
-      $ldap->cd($this->dn);
-      $ldap->create_missing_trees($this->dn);
+      $ldap->cd(preg_replace('/^[^,]+,[^,]+,/', '', $this->dn));
+      $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
     }
@@ -260,6 +286,13 @@ class faiVariable extends plugin
       $tmp['objectClass'] = $this->subClasses;
 
       $sub_dn = "cn=".$obj['cn'].",".$this->dn;
+
+      if($obj['status']=="new"){
+        $ldap->cat($sub_dn);
+        if($ldap->count()){
+          $obj['status']="modify";
+        }
+      }
  
       if($obj['status'] == "delete"){
         $ldap->cd($sub_dn);
@@ -270,8 +303,13 @@ class faiVariable extends plugin
         $ldap->modify($tmp);
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
-        $ldap->cd($sub_dn);
-        $ldap->create_missing_trees($sub_dn);
+
+        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); 
         $this->handle_post_events("add");