* Code cleanup for non pre-defined ttag variable

[gosa.git] / include / php_setup.inc

diff --git a/include/php_setup.inc b/include/php_setup.inc
index f443562eb5378ada1172bbbf02ee2783e7f0f8ff..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,15 +69,31 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
 
   /* Create header as needed */
   if ($error_collector == ""){
-   
+
     /* Mailto body header */ 
+    if(function_exists("prepare4mailbody")){
     $error_collector_mailto .=prepare4mailbody(
-                                "GOsa bug report".
-                                "\nGOsa Version : ".get_gosa_version().
-                                "\nDate : ".date("H:i:s d.m.Y").
-                                "\n".
-                                "\nTrace : ".
-                                "\n");
+                                "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().
+                                "\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>";
@@ -87,13 +107,15 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                 _("Generating this page caused the PHP interpreter to raise some errors!")."
               </font>
             </td>
+            <td align=right>
+              <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&amp;body=%BUGBODY%\">
+                <img border='0' src='images/mailto.png' title='"._("Send bug report to the GOsa Team")."' class='center' alt=''>&nbsp;"._("Send bugreport")."
+              </a>
+            </td>
             <td align=right>
               <button onClick='toggle(\"errorbox\")'>".
                 _("Toggle information")."
               </button>
-              <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&body=%BUGBODY%\">
-                <img src='images/mailto.png' title='"._("Send bug report to the GOsa Team")."' class='center'>&nbsp;"._("Send bugreport")."
-              </a>
             </td>
           </tr>
         </table>
@@ -104,12 +126,20 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
   /* Create error header */
   $error_collector.= "<table summary=\"\" width=\"100%\" cellspacing=0 style='background-color:#402005;color:white;border:2px solid red'><tr><td colspan=3><h1 style='color:white'>"._("PHP error")." \"$errstr\"</h1></td></tr>";
   
+  $error_collector_mailto .= prepare4mailbody("=== Error === \n");
+  $error_collector_mailto .= prepare4mailbody("PHP error: $errstr ($errfile, line $errline)\n");
+  $error_collector_mailto .= prepare4mailbody("=== /Error === \n\n");
+
   /* Extract traceback data - if available */
   if (function_exists('debug_backtrace')){
     $trace= debug_backtrace();
 
+    $error_collector_mailto .= prepare4mailbody("=== Trace ===");
+
     /* Generate trace history */
     for ($index= 0; $index<count($trace); $index++){
+
+
       $ct= $trace[$index];
       $loc= "";
       if (isset($ct['class'])){
@@ -175,6 +205,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
                                    "\n");
       }
   }
+  $error_collector_mailto .= prepare4mailbody("=== /Trace === \n");
 
   /* Close error table */
   $error_collector.= "</table>";