X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=139f195d92b668dfd7f2445367d8b3af69cf398b;hb=6bc38be280f4dd4b0386b2c256749934cb37e86e;hp=d9bf3dc458ca0645e40cd3ebdfbd9c06db094ded;hpb=84aad3fd1d569fb7912e619feac2d757795752b6;p=gosa.git
diff --git a/include/php_setup.inc b/include/php_setup.inc
index d9bf3dc45..139f195d9 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -20,29 +20,23 @@
function gosaRaiseError($errno, $errstr, $errfile, $errline)
{
- global $error_collector,$config;
+ global $error_collector,$config, $error_collector_mailto;
- /* Return if error reporting is set to zero */
- if (error_reporting() == 0){
- return;
+ if(@class_exists("log")){
+ new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
}
- /* Workaround for buggy imap_open error outputs */
- if (preg_match('/imap_open/', $errstr)){
- return;
+ if(function_exists("gosa_log")){
+ gosa_log($errno." ".$errstr." ".$errfile." ".$errline);
}
- /* 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 if error reporting is set to zero */
+ if (error_reporting() == 0){
return;
}
- /* FIXME: Same as above. Compatibility does error flooding.*/
- if (preg_match('/zend.ze1_compatibility_mode/', $errstr)){
+ /* Workaround for buggy imap_open error outputs */
+ if (preg_match('/imap_open/', $errstr)){
return;
}
@@ -57,7 +51,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
if((isset($config->data['MAIN']['DISPLAYERRORS']))&&(!preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS']))){
/* Write to syslog */
- gosa_log ("PHP error: $errstr ($errfile, line $errline)");
+ new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
return;
}
}
@@ -65,22 +59,67 @@ function gosaRaiseError($errno, $errstr, $errfile, $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= "
";
} else {
- $error_collector= "
"._("Generating this page caused the PHP interpreter to raise some errors!")."
";
+ $error_collector= "
+
+
+
+
+ ".
+ _("Generating this page caused the PHP interpreter to raise some errors!")."
+
+