Some plugins to rg=0: bug_report message_details newmail sent_subfolders spamcop...

[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 45adc59093799376f4bb60800dba7e822ffe70fb..ef1c22a06eda46ae005e87521acdf9c764c11661 100644 (file)
--- a/plugins/bug_report/bug_report.php
+++ b/plugins/bug_report/bug_report.php
@@ -16,22 +16,15 @@
  * $Id$
  */
 
-chdir('..');
+define('SM_PATH','../../');
 
-session_start();
+require_once(SM_PATH . 'include/validate.php');
 
-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");
+displayPageHeader($color, 'None');
 
 
 function Show_Array($array) {
+    $str = '';
     foreach ($array as $key => $value) {
         if ($key != 0 || $value != '') {
         $str .= "    * $key = $value\n";
@@ -44,7 +37,7 @@ function Show_Array($array) {
 }
 
 $browser = get_browser();
-$body_top .= "I subscribe to the squirrelmail-list 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" .
@@ -59,7 +52,7 @@ $body_top .= "I subscribe to the squirrelmail-list mailing list.\n" .
                 "(Optional) I got really bored and here's a fix:\n\n\n" .
                 "----------------------------------------------\n" .
             "\nMy browser information:\n" .
-            "  $HTTP_USER_AGENT\n" .
+            '  '.$_SERVER['HTTP_USER_AGENT'] . "\n" .
             "  get_browser() information (List)\n" .
             Show_Array((array) $browser) .
             "\nMy web server information:\n" .
@@ -70,7 +63,7 @@ $body_top .= "I subscribe to the squirrelmail-list mailing list.\n" .
             "  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";
@@ -80,9 +73,9 @@ if ($ldap_server[0] && ! extension_loaded('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);
+$imap_stream = fsockopen ($imapServerAddress, $imapPort, $error_number, $error_string);
 $server_info = fgets ($imap_stream, 1024);
 if ($imap_stream) {
     // SUPRESS HOST NAME
@@ -107,9 +100,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";
 }
-
+$warning_html = '';
 $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";
@@ -175,7 +168,7 @@ $body = htmlspecialchars($body_top . $body);
    <tr>
      <td>
        This bug involves: <select name="send_to">
-         <option value="squirrelmail-list@lists.sourceforge.net">the general program</option>
+         <option value="squirrelmail-users@lists.sourceforge.net">the general program</option>
          <option value="squirrelmail-plugins@lists.sourceforge.net">a specific plugin</option>
        </select>
      </td>
@@ -191,4 +184,4 @@ $body = htmlspecialchars($body_top . $body);
    </tr>
    </table>
    </form>
-</body></html>
\ No newline at end of file
+</body></html>