Some code cleanups to read_body.php

[squirrelmail.git] / plugins / bug_report / bug_report.php

diff --git a/plugins/bug_report/bug_report.php b/plugins/bug_report/bug_report.php
index 5f5b0f5..36cdc7d 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -16,22 +16,23 @@
  * $Id$
  */
 
  * $Id$
  */
 

-chdir('..');
-

 session_start();
 session_start();

+chdir('..');
+define('SM_PATH','../');

 
 

-require_once('../config/config.php');
-require_once('../functions/strings.php');
-require_once('../functions/page_header.php');
-require_once('../functions/display_messages.php');
-require_once('../functions/imap.php');
-require_once('../functions/array.php');
-require_once('../functions/i18n.php');
-require_once('../src/load_prefs.php');
-displayPageHeader($color, "None");
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/array.php');
+require_once(SM_PATH . 'functions/i18n.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+displayPageHeader($color, 'None');

 
 
 function Show_Array($array) {
 
 
 function Show_Array($array) {

+    $str = '';

     foreach ($array as $key => $value) {
         if ($key != 0 || $value != '') {
         $str .= "    * $key = $value\n";
     foreach ($array as $key => $value) {
         if ($key != 0 || $value != '') {
         $str .= "    * $key = $value\n";


@@ -44,7 +45,7 @@ function Show_Array($array) {
 }
 
 $browser = get_browser();
 }
 
 $browser = get_browser();

-$body_top .= "I subscribe to the squirrelmail-users mailing list.\n" .
+$body_top = "I subscribe to the squirrelmail-users mailing list.\n" .

                 "  [ ]  True - No need to CC me when replying\n" .
                 "  [ ]  False - Please CC me when replying\n" .
                 "\n" .
                 "  [ ]  True - No need to CC me when replying\n" .
                 "  [ ]  False - Please CC me when replying\n" .
                 "\n" .


@@ -70,7 +71,7 @@ $body_top .= "I subscribe to the squirrelmail-users mailing list.\n" .
             "  Version:  $version\n" .
             "  Plugins (List)\n" .
             Show_Array($plugins);
             "  Version:  $version\n" .
             "  Plugins (List)\n" .
             Show_Array($plugins);

-if ($ldap_server[0] && ! extension_loaded('ldap')) {
+if (isset($ldap_server) && $ldap_server[0] && ! extension_loaded('ldap')) {

     $warning = 1;
     $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " .
         "but the module is not loaded in PHP";
     $warning = 1;
     $warnings['ldap'] = "LDAP server defined in SquirrelMail config, " .
         "but the module is not loaded in PHP";


@@ -80,7 +81,7 @@ if ($ldap_server[0] && ! extension_loaded('ldap')) {
     $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP";
 }
 
     $corrections['ldap'][] = "Reconfigure SquirrelMail to not use LDAP";
 }
 

-$body .= "\nMy IMAP server information:\n" .
+$body = "\nMy IMAP server information:\n" .

             "  Server type:  $imap_server_type\n";
 $imap_stream = fsockopen ($imapServerAddress, $imapPort, $error_number, $error_string);
 $server_info = fgets ($imap_stream, 1024);
             "  Server type:  $imap_server_type\n";
 $imap_stream = fsockopen ($imapServerAddress, $imapPort, $error_number, $error_string);
 $server_info = fgets ($imap_stream, 1024);


@@ -107,9 +108,9 @@ if ($imap_stream) {
     $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP";
     $corrections['imap'][] = "Make sure the server responds to port $imapPort";
 }
     $corrections['imap'][] = "Make sure the mail server is running IMAP, not POP";
     $corrections['imap'][] = "Make sure the server responds to port $imapPort";
 }

-
+$warning_html = '';

 $warning_num = 0;
 $warning_num = 0;

-if ($warning) {
+if (isset($warning) && $warning) {

     foreach ($warnings as $key => $value) {
         if ($warning_num == 0) {
             $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n";
     foreach ($warnings as $key => $value) {
         if ($warning_num == 0) {
             $body_top .= "WARNINGS WERE REPORTED WITH YOUR SETUP:\n";