X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=139f195d92b668dfd7f2445367d8b3af69cf398b;hb=6c6148c73fa05be5904cb13385ed133bc615fdca;hp=95fb9a53ef578065893e268a6e9aa0709b1b6459;hpb=41fd4a4b7ce9abec36b49cc8fcc80758bbf1d30c;p=gosa.git diff --git a/include/php_setup.inc b/include/php_setup.inc index 95fb9a53e..139f195d9 100644 --- a/include/php_setup.inc +++ b/include/php_setup.inc @@ -26,6 +26,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) 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 */ if (error_reporting() == 0){ return; @@ -36,20 +40,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)){ @@ -71,20 +61,20 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) 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= "