diff --git a/include/php_setup.inc b/include/php_setup.inc
index a27f032ddedfb989342ca5bda2c2281f0c5e7d4b..03727fce5982c85356ac3dcf53927404382bcd16 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
function gosaRaiseError($errno, $errstr, $errfile, $errline)
{
function gosaRaiseError($errno, $errstr, $errfile, $errline)
{
- global $error_collector;
+ global $error_collector,$config;
/* Return if error reporting is set to zero */
if (error_reporting() == 0){
/* Return if error reporting is set to zero */
if (error_reporting() == 0){
}
}
}
}
+ if((isset($config->data))){
+ 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)");
+ return;
+ }
+ }
+
+
/* Create header as needed */
if ($error_collector == ""){
/* Create header as needed */
if ($error_collector == ""){
- if ($_SESSION['js']==FALSE){
+ if (isset($_SESSION['js']) && $_SESSION['js']==FALSE){
$error_collector= "<div>";
} else {
$error_collector= "<div>";
} else {
- $error_collector= "<table 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'>";
}
}
/* Create error header */
}
}
/* Create error header */
- $error_collector.= "<table width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>";
+ $error_collector.= "<table summary=\"\" width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>";
/* Extract traceback data - if available */
if (function_exists('debug_backtrace')){
$trace= debug_backtrace();
/* Generate trace history */
/* Extract traceback data - if available */
if (function_exists('debug_backtrace')){
$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'])){
$ct= $trace[$index];
$loc= "";
if (isset($ct['class'])){
$type= "-";
}
$args= "";
$type= "-";
}
$args= "";
- foreach ($ct['args'] as $arg){
- $args.= htmlentities("\"$arg\", ");
+ if (isset($ct['args'])){
+ foreach ($ct['args'] as $arg){
+ $args.= htmlentities("\"$arg\", ");
+ }
}
$args= preg_replace("/, $/", "", $args);
if ($args == ""){
$args= "-";
}
}
$args= preg_replace("/, $/", "", $args);
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>";
$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>";
/* Close error table */
$error_collector.= "</table>";
/* Close error table */
$error_collector.= "</table>";
- /* 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."</div>";
/* Flush in case of fatal errors */
if (preg_match('/^fatal/i', $errstr)){
echo $error_collector."</div>";
$smarty->caching= false;
$smarty->php_handling= SMARTY_PHP_REMOVE;
$smarty->caching= false;
$smarty->php_handling= SMARTY_PHP_REMOVE;
+/* Set timezone */
+if (function_exists("date_default_timezone_set")){
+ date_default_timezone_set("GMT");
+}
+
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>