Fixed copy & paste errors

[gosa.git] / include / php_setup.inc

diff --git a/include/php_setup.inc b/include/php_setup.inc
index 321238ceb6b4f05adbe6ae4cad6c88831051b830..b3f839dcaa4d9c5e33fb80483683bd74b5843f0e 100644 (file)
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -22,6 +22,10 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 {
   global $error_collector,$error_collector_mailto,$config;
 
+  if(function_exists("gosa_log")){
+    gosa_log($errno." ".$errstr." ".$errfile." ".$errline);
+  }
+
   /* Return if error reporting is set to zero */
   if (error_reporting() == 0){
     return;
@@ -65,8 +69,9 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 
   /* Create header as needed */
   if ($error_collector == ""){
-   
+
     /* Mailto body header */ 
+    if(function_exists("prepare4mailbody")){
     $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.".
@@ -75,11 +80,20 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                                 "\nGOsa Version: ".get_gosa_version().
                                 "\nDate: ".date("d.m.Y").
                                 "\nTime: ".date("H:i:s").
+                                "\nUser-Agent: ".$_SERVER['HTTP_USER_AGENT']." ".
+                                "(Javascript is ".( (isset($_SESSION['js']) && $_SESSION['js']==FALSE) ? "inactive" : "active" ).")".
                                 "\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 ?".
                                 "\n\n".
+                                "*** PHP runtime information ***".
+                                "\nPHP Version: ".phpversion().
+                                "\nRunning on: ".php_uname().
+                                "\nLoaded Extensions: ".print_array(get_loaded_extensions()).
+                                "\nLDAP Module Version: ".get_module_setting('ldap','RCS Version').
+                                "\n\n".
                                 "*** PHP error information ***\n\n");
+      }
 
     if (isset($_SESSION['js']) && $_SESSION['js']==FALSE){
       $error_collector= "<div>";