Fixed error handling, when display_errors is set to flase

[gosa.git] / include / php_setup.inc

diff --git a/include/php_setup.inc b/include/php_setup.inc
index 95fb9a53ef578065893e268a6e9aa0709b1b6459..2901f8d2a6675e6a9109bcd967bc43111b21ddc3 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -22,8 +22,8 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 {
   global $error_collector,$config, $error_collector_mailto;
 
-  if(@class_exists("log")){
-    new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
+  if(function_exists("gosa_log")){
+    gosa_log($errno." ".$errstr." ".$errfile." ".$errline);
   }
 
   /* Return if error reporting is set to zero */
@@ -36,20 +36,6 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     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)){
@@ -57,34 +43,42 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     }
   }
 
+  /* 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']))){
 
+      
       /* Write to syslog */
-      new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
+      if(class_exists("log") && !preg_match("/No such object/",$errstr)){
+        new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
+      }
       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);
+  }
 
   /* Create header as needed */
   if ($error_collector == ""){
 
     /* Mailto body header */
-    $error_collector_mailto .=prepare4mailbody(
+    if(function_exists("prepare4mailbody")){
+      $error_collector_mailto .=prepare4mailbody(
                                 "Oups. Seems like you've catched some kind of bug inside GOsa/PHP. You may want to help ".
                                 "us to improve the software stability. If so, please provide some more information below.".
                                 "\n\n".
                                 "*** GOsa bug report ***".
                                 "\nGOsa Version: ".get_gosa_version().
-                                "\nDate: ".date("d.m.Y").
-                                "\nTime: ".date("H:i:s").
                                 "\n\n".
                                 "Please describe what you did to produce this error as detailed as possible. Can you ".
                                 "reproduce this bug using the demo on http://www.gosa-project.org ?".
                                 "\n\n".
                                 "*** PHP error information ***\n\n");
-
+      }
+    
     if (isset($_SESSION['js']) && $_SESSION['js']==FALSE){
       $error_collector= "<div>";
     } else {
@@ -216,10 +210,13 @@ function dummy_error_handler()
 }
 
 
+/* Set timezone */
+date_default_timezone_set("GMT");
+
 /* Get base dir for reference */
 $BASE_DIR= dirname(dirname(__FILE__));
 $ROOT_DIR= $BASE_DIR."/html";
-error_reporting (E_ALL);
+error_reporting (E_ALL | E_STRICT);
 
 /* Register error handler */
 $error_collector= "";
@@ -231,7 +228,7 @@ 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");
+ini_set("include_path",".:$BASE_DIR/include:$BASE_DIR/include/php_writeexcel");
 
 /* Do smarty setup */
 require("smarty/Smarty.class.php");
@@ -240,10 +237,5 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $smarty->caching= false;
 $smarty->php_handling= SMARTY_PHP_REMOVE;
 
-/* Set timezone */
-if (function_exists("date_default_timezone_set")){
-  date_default_timezone_set("GMT");
-}
-
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>