Packagelist sorted

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

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 269c255ad9a50eb198fb621a257ac9e104ea4e44..ca376017c2e0d9a4f9c408ec048c36c8a40a4d88 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -25,7 +25,7 @@ class faiHook extends plugin
 
   /* Attributes to initialise for each subObject */
   var $subAttributes    = array("cn","description","FAItask","FAIscript"); 
-  var $sub64coded       = array("FAItask","FAIscript");
+  var $sub64coded       = array();
 
   /* Specific attributes */
   var $cn               = "";       // The class name for this object
@@ -61,7 +61,7 @@ class faiHook extends plugin
             $this->SubObjects[$object['cn'][0]][$attrs]=$object[$attrs][0];
           }
         }
-      
+     
         $this->SubObjects[$object['cn'][0]]['status']      = "edited";
         $this->SubObjects[$object['cn'][0]]['dn']          = $object['dn'];
 
@@ -69,7 +69,12 @@ class faiHook extends plugin
           $this->SubObjects[$object['cn'][0]][$codeIt]=base64_decode($this->SubObjects[$object['cn'][0]][$codeIt]);
         }
 
+        foreach($this->subAttributes as $attrs){
+          $this->SubObjects[$object['cn'][0]][$attrs]=addslashes($this->SubObjects[$object['cn'][0]][$attrs]);
+        }
+        $this->SubObjects[$object['cn'][0]]['FAIscript']   = addslashes($this->readBinary("FAIscript",$object['dn']));
       }
+      ksort($this->SubObjects);
     }
   }
 
@@ -85,9 +90,11 @@ class faiHook extends plugin
       $this->is_dialog=true;
     }
 
+    $_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;
     }
     
@@ -135,6 +142,7 @@ class faiHook extends plugin
         $this->is_dialog=false;
         unset($this->dialog);
         $this->dialog=NULL;
+        ksort($this->SubObjects);
       }
     }
 
@@ -154,11 +162,19 @@ class faiHook 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('faiHook.tpl', TRUE));
     return($display);
   }
@@ -169,7 +185,11 @@ class faiHook extends plugin
     $a_return=array();
     foreach($this->SubObjects as $obj){
       if($obj['status'] != "delete"){
-        $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+        if((isset($obj['description']))&&(!empty($obj['description']))){
+          $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+        }else{
+          $a_return[$obj['cn']]= $obj['cn'];
+        }
       }
     }
     return($a_return);
@@ -190,10 +210,12 @@ class faiHook extends plugin
    */
   function save_object()
   {
-    plugin::save_object();
-    foreach($this->attributes as $attrs){
-      if(isset($_POST[$attrs])){
-        $this->$attrs = $_POST[$attrs];
+    if(isset($_POST['FAIhook_posted'])){
+      plugin::save_object();
+      foreach($this->attributes as $attrs){
+        if(isset($_POST[$attrs])){
+          $this->$attrs = $_POST[$attrs];
+        }
       }
     }
   }
@@ -203,10 +225,6 @@ class faiHook 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);
   }
 
@@ -252,7 +270,7 @@ class faiHook extends plugin
     foreach($Objects as $name => $obj){
 
       foreach($this->sub64coded as $codeIt){
-        $obj[$codeIt]=base64_encode($obj[$codeIt]);
+        $obj[$codeIt]=base64_encode(stripslashes($obj[$codeIt]));
       }
 
       $tmp = array();
@@ -260,12 +278,23 @@ class faiHook extends plugin
         if(empty($obj[$attrs])){
           $obj[$attrs] = array();
         }
-        $tmp[$attrs] = $obj[$attrs];
+        if(!is_array($obj[$attrs])){
+          $tmp[$attrs] = stripslashes($obj[$attrs]);
+        }else{
+          $tmp[$attrs] = $obj[$attrs];
+        }
       }    
 
       $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);
@@ -276,6 +305,9 @@ class faiHook extends plugin
         $ldap->modify($tmp);
         $this->handle_post_events("modify");
       }elseif($obj['status']=="new"){
+        if($tmp['description']==array()){
+          unset($tmp['description']);
+        }
         $ldap->cd($this->config->current['BASE']);
         $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $sub_dn));
         $ldap->cd($sub_dn);
@@ -285,6 +317,38 @@ class faiHook extends plugin
       show_ldap_error($ldap->get_error()); 
     }
   }
+  
+  function readBinary($attr,$dn){
+    $Data  ="";
+    $ds= ldap_connect($this->config->current['SERVER']);
+    ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+    if (function_exists("ldap_set_rebind_proc") && isset($this->config->current['RECURSIVE']) && $this->config->current['RECURSIVE'] == "true") {
+      ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
+      ldap_set_rebind_proc($ds, array(&$this, "rebind"));
+    }
+
+    if(isset($this->config->current['TLS']) &&  $this->config->current['TLS'] == "true"){
+      ldap_start_tls($ds);
+    }
+
+    $r  = ldap_bind($ds);
+    $sr = @ldap_read($ds, $dn, $attr."=*", array($attr));
+
+    if ($sr) {
+      $ei=ldap_first_entry($ds, $sr);
+      if ($ei) {
+        if ($info = ldap_get_values_len($ds, $ei, $attr)){
+          $Data= $info[0];
+        }
+      }
+    }
+
+    /* close conncetion */
+    ldap_unbind($ds);
+    return($Data);
+  }
+
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: