X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=139f195d92b668dfd7f2445367d8b3af69cf398b;hb=aa64d91c3b51a232fe8bd1c8e112cadd8f8f1245;hp=08f75dfc1360279ca3ebdbc03822d41e030631f7;hpb=fcc078a3131b821697c17c5a3e912e210f75d715;p=gosa.git
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 08f75dfc1..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;
+ 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;
}
@@ -53,24 +47,79 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
}
}
+ 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)");
+ return;
+ }
+ }
+
+
/* 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= "
";
} 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!")."
+
+
";
- /* 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."
";
@@ -132,13 +206,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";
@@ -146,7 +224,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");