X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=03727fce5982c85356ac3dcf53927404382bcd16;hb=46ccf08f0aaa3f7d779af1d6e223b301f25efbb8;hp=5fcfd69d0689d6628d27cd9d06c0b0dfa7dcd0d6;hpb=d2726983b0ac889de817ab5162cfbc7204a6e4fd;p=gosa.git

diff --git a/include/php_setup.inc b/include/php_setup.inc
index 5fcfd69d0..03727fce5 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -54,7 +54,8 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   }
 
   if((isset($config->data))){ 
-    if((isset($config->data['MAIN']['DISPLAYERRORS']))&&(!preg_match("/true/i",$config->data['MAIN']['DISPLAYERRORS']))){
+    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;
@@ -64,10 +65,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 
   /* Create header as needed */
   if ($error_collector == ""){
-    if ($_SESSION['js']==FALSE){
+    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')."'>&nbsp;<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')."'>&nbsp;<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'>";
     }
   }
  
@@ -79,7 +80,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     $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'])){
@@ -114,8 +115,16 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
       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>";
@@ -163,5 +172,10 @@ $smarty->template_dir = $BASE_DIR.'/ihtml/';
 $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:
 ?>