index 1f821e2c7ae39f59c17aae6c2d852104a4061773..2732905613aba9c873865be5fe039bda5cee9543 100644 (file)
}
/* Error messages are hidden in GOsa, so we only send them to the logging class and abort here */
}
/* 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)");
}
/* 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;
return;
- }
}
/* Send all errors to logging class, except "Ldap : No such object" messages*/
}
/* Send all errors to logging class, except "Ldap : No such object" messages*/
/* Mailto body header */
if(function_exists("prepare4mailbody")){
/* Mailto body header */
if(function_exists("prepare4mailbody")){
+ $version= "unknown";
+ if(function_exists("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 ".
"us to improve the software stability. If so, please provide some more information below.".
"\n\n".
"*** GOsa bug report ***".
$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().
+ "\nGOsa Version: $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".
"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 ?".
</a>
</td>
<td align=right>
</a>
</td>
<td align=right>
- <button onClick='toggle(\"errorbox\")'>".
+ <button onClick='GOsa_toggle(\"errorbox\")'>".
_("Toggle information")."
</button>
</td>
_("Toggle information")."
</button>
</td>
$error_collector_mailto .= prepare4mailbody("=== Trace ===");
/* Generate trace history */
$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];
$ct= $trace[$index];
/* Bail out for incompatible/old PHP versions */
if (!version_compare(phpversion(),"5.2.0",">=")){
/* Bail out for incompatible/old PHP versions */
if (!version_compare(phpversion(),"5.2.0",">=")){
-# echo "PHP version needs to be 5.2.0 or above to run GOsa. Aborted.";
-## exit();
+ echo "PHP version needs to be 5.2.0 or above to run GOsa. Aborted.";
+ exit();
}
/* Set timezone */
}
/* Set timezone */
/* Register error handler */
$error_collector= "";
$error_collector_mailto= "";
/* 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);
$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");
/* Do smarty setup */
require("smarty/Smarty.class.php");