X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fphp_setup.inc;h=e83379c9826cdd039a758e2d177d6658e75e8a22;hb=075b806cd405200df8712134e09f803eb9c5fe02;hp=c6769741cf2e655bdff4ada2bd1594980f1d9443;hpb=385c34aae7951f24c79bdd4d26812677a1f38ab6;p=gosa.git

diff --git a/include/php_setup.inc b/include/php_setup.inc
index c6769741c..e83379c98 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -20,7 +20,7 @@
 
 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){
@@ -53,12 +53,22 @@ 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 */
+      gosa_log ("PHP error: $errstr ($errfile, line $errline)");
+      return;
+    }
+  }
+
+
   /* 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'>";
     }
   }
  
@@ -70,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'])){
@@ -98,6 +108,12 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
       $args= "";
       if (isset($ct['args'])){
         foreach ($ct['args'] as $arg){
+       
+          /* Avoid convertig object to string errors */ 
+          if(is_object($arg)){
+            $arg = "CLASS:&nbsp;".get_class($arg);
+          }
+  
           $args.= htmlentities("\"$arg\", ");
         }
       }
@@ -105,8 +121,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>";
@@ -117,9 +141,6 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   /* 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>";
@@ -157,5 +178,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:
 ?>