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

diff --git a/include/php_setup.inc b/include/php_setup.inc
index c9f3b3f6d..e83379c98 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -68,7 +68,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     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'>";
     }
   }
  
@@ -108,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\", ");
         }
       }
@@ -115,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>";
@@ -157,12 +171,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;