added display error switch to gosa.conf

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@883 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 1cb7f8567a02745b645dd04a8dea32fd1ed845fb..a45dbb93f603ff334f34c0761b95f865bdb77715 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -162,7 +162,8 @@
                iconsize="48x48"
                pwminlen="6"
                forceglobals="false"
-               smbhash='{SMBHASH}'>
+               smbhash='{SMBHASH}'
+               displayerros="false">
 
                <location name="{LOCATIONNAME}"
                        uidbase="1000"

diff --git a/include/php_setup.inc b/include/php_setup.inc
index c6769741cf2e655bdff4ada2bd1594980f1d9443..5fcfd69d0689d6628d27cd9d06c0b0dfa7dcd0d6 100644 (file)
--- 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,6 +53,15 @@ 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){
@@ -117,9 +126,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>";