diff --git a/include/php_setup.inc b/include/php_setup.inc
index 07b2dc57cb86fe243009206c5bf3d6cf955e7f2c..ec13459435faafcdfcb6492c3f538883d69db13b 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
{
global $error_collector,$config;
+ if(@class_exists("log")){
+ new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
+ }
+
/* Return if error reporting is set to zero */
if (error_reporting() == 0){
return;
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;
}
}
if (isset($_SESSION['js']) && $_SESSION['js']==FALSE){
$error_collector= "<div>";
} else {
- $error_collector= "<table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black'><tr><td><img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'> <font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:0; visibility: hidden'>";
+ $error_collector= "<table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'><tr><td><img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'> <font style='font-size:14px;font-weight:bold'>"._("Generating this page caused the PHP interpreter to raise some errors!")."</font></td><td align=right><button onClick='toggle(\"errorbox\")'>"._("Toggle information")."</button></td></tr></table><div id='errorbox' style='position:absolute; z-index:150; visibility: hidden'>";
}
}
$trace= debug_backtrace();
/* Generate trace history */
- for ($index= 1; $index<count($trace); $index++){
+ for ($index= 0; $index<count($trace); $index++){
$ct= $trace[$index];
$loc= "";
if (isset($ct['class'])){
$args= "";
if (isset($ct['args'])){
foreach ($ct['args'] as $arg){
+
+ /* Avoid convertig object to string errors */
+ if(is_object($arg)){
+ $arg = "CLASS: ".get_class($arg);
+ }
+
$args.= htmlentities("\"$arg\", ");
}
}
if ($args == ""){
$args= "-";
}
- $file= $ct['file'];
- $line= $ct['line'];
+ if(isset($ct['file'])) {
+ $file= $ct['file'];
+ }else{
+ $file="";
+ }
+ if(isset($ct['line'])) {
+ $line= $ct['line'];
+ }else{
+ $line="";
+ }
$color= ($index&1)?'#404040':'606060';
$error_collector.= "<tr style='background-color:$color'><td style='padding-left:20px' width=\"30%\">"._("Trace")."[$index]: $loc</td>";
$error_collector.= "<td>"._("File").": $file ("._('Line')." $line)</td><td width=\"10%\">"._("Type").": $type</td></tr>";
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;