X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=2901f8d2a6675e6a9109bcd967bc43111b21ddc3;hb=91db029a18ddebaba09292ae4e2ffcd011974d9e;hp=ec13459435faafcdfcb6492c3f538883d69db13b;hpb=04d9837e72728c01a0449760b158bd8616065d84;p=gosa.git

diff --git a/include/php_setup.inc b/include/php_setup.inc
index ec1345943..2901f8d2a 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -20,10 +20,10 @@
 
 function gosaRaiseError($errno, $errstr, $errfile, $errline)
 {
-  global $error_collector,$config;
+  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,87 @@ 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 */
+    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().
+                                "\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 {
-      $error_collector= "<table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'><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:150; visibility: hidden'>";
+      $error_collector= "
+        <table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'>
+          <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>
+              <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&amp;body=%BUGBODY%\">
+                <img border='0' src='images/mailto.png' title='"._("Send bug report to the GOsa Team")."' class='center' alt=''>&nbsp;"._("Send bugreport")."
+              </a>
+            </td>
+            <td align=right>
+              <button onClick='toggle(\"errorbox\")'>".
+                _("Toggle information")."
+              </button>
+            </td>
+          </tr>
+        </table>
+        <div id='errorbox' style='position:absolute; z-index:150; visibility: hidden'>";
     }
   }
  
   /* Create error header */
   $error_collector.= "<table summary=\"\" 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>";
+
+  $error_collector_mailto .= prepare4mailbody("=== Error === \n");
+  $error_collector_mailto .= prepare4mailbody("PHP error: $errstr ($errfile, line $errline)\n");
+  $error_collector_mailto .= prepare4mailbody("=== /Error === \n\n");
   
   /* Extract traceback data - if available */
   if (function_exists('debug_backtrace')){
     $trace= debug_backtrace();
 
+    $error_collector_mailto .= prepare4mailbody("=== Trace ===");
+
     /* Generate trace history */
     for ($index= 0; $index<count($trace); $index++){
+
+
       $ct= $trace[$index];
       $loc= "";
       if (isset($ct['class'])){
@@ -139,9 +178,21 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
       $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>";
+
+      /* Add trace part to mailto body */
+      $error_collector_mailto .= prepare4mailbody(
+                                   "\nTrace[".$index."]:".$loc.
+                                   "\nFile : ".$file.
+                                   "\nLine : ".$line.
+                                   "\nType : ".$type.
+                                   "\n  ".$args.
+                                   "\n");
+
     }
   }
 
+  $error_collector_mailto .= prepare4mailbody("=== /Trace === \n");
+
   /* Close error table */
   $error_collector.= "</table>";
 
@@ -159,13 +210,17 @@ 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= "";
+$error_collector_mailto= "";
 set_error_handler('gosaRaiseError');
 
 $variables_order= "ES";
@@ -173,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");
@@ -182,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:
 ?>