X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=324a6b740d31587455e3d2d3f1acf663cb16a213;hb=c0a9eb78c0756f85fdcff79f4e8c2b847453e2e7;hp=c9f3b3f6d9e493aeb290e126574e229c0faa8fbf;hpb=5de144d9622c4f1945b202521e4932db67cbc0b6;p=gosa.git
diff --git a/include/php_setup.inc b/include/php_setup.inc
index c9f3b3f6d..324a6b740 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -20,7 +20,15 @@
function gosaRaiseError($errno, $errstr, $errfile, $errline)
{
- global $error_collector,$config;
+ global $error_collector,$config, $error_collector_mailto;
+
+ if(@class_exists("log")){
+ 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){
@@ -57,7 +65,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 +73,69 @@ 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().
+ "\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= "
";
} 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!")."
+
+
";
@@ -148,6 +229,7 @@ error_reporting (E_ALL);
/* Register error handler */
$error_collector= "";
+$error_collector_mailto= "";
set_error_handler('gosaRaiseError');
$variables_order= "ES";
@@ -157,12 +239,6 @@ ini_set("display_errors",1);
ini_set("report_memleaks",1);
ini_set("include_path",".:$BASE_DIR/include");
-/* This specifies, how old a session file must be, before it is deleted
- Don't change this value, use gosa.conf session_lifetime instead
- ^ Value in seconds = 1 day, php.ini default is 1440 ~ 24 min
-*/
-ini_set("session.gc_maxlifetime",8640);
-
/* Do smarty setup */
require("smarty/Smarty.class.php");
$smarty = new Smarty;