Removed do nothing blocks

[gosa.git] / gosa-core / include / php_setup.inc

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index f0004b4640ee461c1267159fe1e9b043f775cb80..82289820300c81a961f69b28b8b35a63711b7d59 100644 (file)
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -26,36 +26,44 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 {
   global $error_collector,$config, $error_collector_mailto;
 
-  /* Return if error reporting is set to zero */
+  // To avoid recursion - restore original error handler.
+  restore_error_handler();
+
+  /* Return if error reporting is set to zero 
+   * Also exclude statements prefixed with @ - Comment out the block below to see suppressed errors. 
+   * e.g. @call_function_but_hide_errors()
+   */
   if (error_reporting() == 0){
+    set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
     return;
   }
 
   /* Workaround for buggy imap_open error outputs */
   if (preg_match('/imap_open/', $errstr)){
+    set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
     return;
   }
 
   /* Hide ldap size limit messages */
   if (preg_match('/ldap_error/', $errstr)){
     if (preg_match('/sizelimit/', $errstr)){
+      set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
       return;
     }
   }
 
   /* Error messages are hidden in GOsa, so we only send them to the logging class and abort here */
-  if((isset($config->data))){ 
-    if((isset($config->data['MAIN']['DISPLAYERRORS']))&&(!preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS']))){
+  if(isset($config->data) && $config->get_cfg_value("displayerrors") != "true"){
 
-      
-      /* Write to syslog */
-      if(class_exists("log") && !preg_match("/No such object/",$errstr)){
-        new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
-      }
-      return;
+    /* Write to syslog */
+    if(class_exists("log") && !preg_match("/No such object/",$errstr)){
+      new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
     }
+
+    set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
+    return;
   }
-  
+ 
   /* Send all errors to logging class, except "Ldap : No such object" messages*/
   if(class_exists("log") && !preg_match("/No such object/",$errstr)){
     new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
@@ -68,7 +76,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     if(function_exists("prepare4mailbody")){
       $version= "unknown";
       if(function_exists("get_gosa_version")){
-             $version= get_gosa-version();
+             $version= get_gosa_version();
       }
       $error_collector_mailto .=prepare4mailbody(
                                 "Oups. Seems like you've catched some kind of bug inside GOsa/PHP. You may want to help ".
@@ -101,13 +109,13 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
               </a>
             </td>
             <td align=right>
-              <button onClick='toggle(\"errorbox\")'>".
+              <button onClick=\"$('errorbox').toggle();\">".
                 _("Toggle information")."
               </button>
             </td>
           </tr>
         </table>
-        <div id='errorbox' style='position:absolute; z-index:150; visibility: hidden'>";
+        <div id='errorbox' style='position:absolute; z-index:150; display: none;'>";
     }
   }
  
@@ -125,7 +133,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     $error_collector_mailto .= prepare4mailbody("=== Trace ===");
 
     /* Generate trace history */
-    for ($index= 0; $index<count($trace); $index++){
+    for ($index= 0, $c= count($trace); $index<$c; $index++){
 
 
       $ct= $trace[$index];
@@ -201,6 +209,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   $error_collector.= "</table>";
 
   /* Flush in case of fatal errors */
+  set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
   if (preg_match('/^fatal/i', $errstr)){
     echo $error_collector."</div>";
     flush();
@@ -268,14 +277,15 @@ error_reporting (E_ALL | E_STRICT);
 /* Register error handler */
 $error_collector= "";
 $error_collector_mailto= "";
-set_error_handler('gosaRaiseError');
+
+set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
 
 $variables_order= "ES";
 ini_set("register_globals",0);
 ini_set("track_vars",1);
 ini_set("display_errors",1);
 ini_set("report_memleaks",1);
-ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel");
+ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/utils/excel:/usr/share/php");
 
 /* Do smarty setup */
 require("smarty/Smarty.class.php");
@@ -284,6 +294,9 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $smarty->caching= false;
 $smarty->php_handling= SMARTY_PHP_REMOVE;
 
+/* Global FPDF define */
+define('FPDF_FONTPATH', '/usr/share/php/fpdf/font/');
+
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>