X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fphp_setup.inc;h=2732905613aba9c873865be5fe039bda5cee9543;hb=d80790d56d1589784e14cef534cc2c1a7590fd9d;hp=92789b2f4f16a6ee80ba277227dc03110d461cac;hpb=96bcf1c6774971212667efa11268cd701e622790;p=gosa.git diff --git a/gosa-core/include/php_setup.inc b/gosa-core/include/php_setup.inc index 92789b2f4..273290561 100644 --- a/gosa-core/include/php_setup.inc +++ b/gosa-core/include/php_setup.inc @@ -1,31 +1,31 @@ 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 ?". @@ -79,7 +81,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) "*** PHP error information ***\n\n"); } - if (session::is_set('js') && $_SESSION['js']==FALSE){ + if (session::is_set('js') && session::get('js')==FALSE){ $error_collector= "