X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fphp_setup.inc;h=6566da07f23bf6ca10880b25945d1c2a9a827fdd;hb=4b3498ae8e78a11c7c99663d45bab6a0a14df052;hp=1f821e2c7ae39f59c17aae6c2d852104a4061773;hpb=4914ea25dd74f15f179161ed4c7b8e1b8280d3ec;p=gosa.git

diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc
index 1f821e2c7..6566da07f 100644
--- a/gosa-core/include/php_setup.inc
+++ b/gosa-core/include/php_setup.inc
@@ -44,16 +44,14 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   }
 
   /* Error messages are hidden in GOsa, so we only send them to the logging class and abort here */
-  if((isset($config->data))){ 
-    if((isset($config->data['MAIN']['DISPLAYERRORS']))&&(!preg_match("/^true$/i",$config->data['MAIN']['DISPLAYERRORS']))){
-
+  if(isset($config->data) && $config->get_cfg_value("displayerrors") != "true"){
       
       /* Write to syslog */
       if(class_exists("log") && !preg_match("/No such object/",$errstr)){
         new log("view","error","",array(),"PHP error: $errstr ($errfile, line $errline)");
       }
+
       return;
-    }
   }
   
   /* Send all errors to logging class, except "Ldap : No such object" messages*/
@@ -66,12 +64,16 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 
     /* Mailto body header */
     if(function_exists("prepare4mailbody")){
+      $version= "unknown";
+      if(function_exists("get_gosa_version")){
+	      $version= get_gosa_version();
+      }
       $error_collector_mailto .=prepare4mailbody(
                                 "Oups. Seems like you've catched some kind of bug inside GOsa/PHP. You may want to help ".
                                 "us to improve the software stability. If so, please provide some more information below.".
                                 "\n\n".
                                 "*** GOsa bug report ***".
-                                "\nGOsa Version: ".get_gosa_version().
+                                "\nGOsa Version: $version".
                                 "\n\n".
                                 "Please describe what you did to produce this error as detailed as possible. Can you ".
                                 "reproduce this bug using the demo on http://www.gosa-project.org ?".
@@ -97,7 +99,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
               </a>
             </td>
             <td align=right>
-              <button onClick='toggle(\"errorbox\")'>".
+              <button onClick='GOsa_toggle(\"errorbox\")'>".
                 _("Toggle information")."
               </button>
             </td>
@@ -121,7 +123,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     $error_collector_mailto .= prepare4mailbody("=== Trace ===");
 
     /* Generate trace history */
-    for ($index= 0; $index<count($trace); $index++){
+    for ($index= 0, $c= count($trace); $index<$c; $index++){
 
 
       $ct= $trace[$index];
@@ -249,8 +251,8 @@ function dummy_error_handler()
 
 /* Bail out for incompatible/old PHP versions */
 if (!version_compare(phpversion(),"5.2.0",">=")){
-#  echo "PHP version needs to be 5.2.0 or above to run GOsa. Aborted.";
-##  exit();
+  echo "PHP version needs to be 5.2.0 or above to run GOsa. Aborted.";
+  exit();
 }
 
 /* Set timezone */
@@ -264,7 +266,8 @@ error_reporting (E_ALL | E_STRICT);
 /* Register error handler */
 $error_collector= "";
 $error_collector_mailto= "";
-set_error_handler('gosaRaiseError');
+
+set_error_handler('gosaRaiseError', E_WARNING |  E_NOTICE | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_STRICT) ;
 
 $variables_order= "ES";
 ini_set("register_globals",0);