![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/include/php_setup.inc b/include/php_setup.inc
index c6769741cf2e655bdff4ada2bd1594980f1d9443..2901f8d2a6675e6a9109bcd967bc43111b21ddc3 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
function gosaRaiseError($errno, $errstr, $errfile, $errline)
{
- global $error_collector;
+ global $error_collector,$config, $error_collector_mailto;
+
+ if(function_exists("gosa_log")){
+ gosa_log($errno." ".$errstr." ".$errfile." ".$errline);
+ }
/* Return if error reporting is set to zero */
if (error_reporting() == 0){
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)){
}
}
+ /* 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 */
+ 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 == ""){
- if ($_SESSION['js']==FALSE){
+
+ /* 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'><tr><td><img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'> <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'>";
+ $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')."'>
+ <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&body=%BUGBODY%\">
+ <img border='0' src='images/mailto.png' title='"._("Send bug report to the GOsa Team")."' class='center' alt=''> "._("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= 1; $index<count($trace); $index++){
+ for ($index= 0; $index<count($trace); $index++){
+
+
$ct= $trace[$index];
$loc= "";
if (isset($ct['class'])){
$args= "";
if (isset($ct['args'])){
foreach ($ct['args'] as $arg){
+
+ /* Avoid convertig object to string errors */
+ if(is_object($arg)){
+ $arg = "CLASS: ".get_class($arg);
+ }
+
$args.= htmlentities("\"$arg\", ");
}
}
if ($args == ""){
$args= "-";
}
- $file= $ct['file'];
- $line= $ct['line'];
+ if(isset($ct['file'])) {
+ $file= $ct['file'];
+ }else{
+ $file="";
+ }
+ if(isset($ct['line'])) {
+ $line= $ct['line'];
+ }else{
+ $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>";
+
+ /* 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>";
- /* Write to syslog */
- gosa_log ("PHP error: $errstr ($errfile, line $errline)");
-
/* Flush in case of fatal errors */
if (preg_match('/^fatal/i', $errstr)){
echo $error_collector."</div>";
}
+/* 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";
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");