integrated xmailer plugin

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1725 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/load_prefs.php b/src/load_prefs.php
index a28d18dc2435a44fc8c236786a6d6234f7c248e9..377338e6105d38cb5f2bddf083c2004d7806631b 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -188,11 +188,12 @@
     $location_of_bar = getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
     $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', SMPREF_LOC_BETWEEN);
 
     $location_of_bar = getPref($data_dir, $username, 'location_of_bar', SMPREF_LOC_LEFT);
     $location_of_buttons = getPref($data_dir, $username, 'location_of_buttons', SMPREF_LOC_BETWEEN);
 

-    global $collapse_folders, $show_html_default;
+    global $collapse_folders, $show_html_default, $show_xmailer_default;

     $collapse_folders = getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
     /* show_html_default is a int value. */
     $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', SMPREF_ON));
     $collapse_folders = getPref($data_dir, $username, 'collapse_folders', SMPREF_ON);
 
     /* show_html_default is a int value. */
     $show_html_default = intval(getPref($data_dir, $username, 'show_html_default', SMPREF_ON));

+    $show_xmailer_default = intval(getPref($data_dir, $username, 'show_xmailer_default', SMPREF_OFF ) );

 
     global $include_self_reply_all;
     $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);
 
     global $include_self_reply_all;
     $include_self_reply_all = getPref($data_dir, $username, 'include_self_reply_all', SMPREF_ON);

diff --git a/src/options.php b/src/options.php
index d60d4eaf9b0c99d3d95d6c0890ec520f3064e09a..cbbfb26134af3ef444f8f66ecdc700c752f46f1a 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -95,6 +95,7 @@
         setPref($data_dir, $username, 'include_self_reply_all', $new_include_self_reply_all);
         setPref($data_dir, $username, 'page_selector', $new_page_selector);
         setPref($data_dir, $username, 'page_selector_max', $new_page_selector_max);
         setPref($data_dir, $username, 'include_self_reply_all', $new_include_self_reply_all);
         setPref($data_dir, $username, 'page_selector', $new_page_selector);
         setPref($data_dir, $username, 'page_selector_max', $new_page_selector_max);

+        setPref($data_dir, $username, 'show_xmailer_default', $new_show_xmailer_default);

 
         $js_autodetect_results = (isset($new_js_autodetect_results) ? $new_js_autodetect_results : SMPREF_JS_OFF);
         if ($new_javascript_setting == SMPREF_JS_AUTODETECT) {
 
         $js_autodetect_results = (isset($new_js_autodetect_results) ? $new_js_autodetect_results : SMPREF_JS_OFF);
         if ($new_javascript_setting == SMPREF_JS_AUTODETECT) {

diff --git a/src/options_display.php b/src/options_display.php
index f1ab70bf2ddbaa3fd8409ba31960baf82695d7d9..4df209c5b562308a8d1f5b0bbd4176aed5688b0f 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -196,6 +196,13 @@
         'refresh' => SMOPT_REFRESH_NONE
     );
 
         'refresh' => SMOPT_REFRESH_NONE
     );
 

+    $optvals[] = array(
+        'name'    => 'show_xmailer_default',
+        'caption' => _("Show the Mailer of incoming messages"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+

     /* Build all these values into an array of SquirrelOptions objects. */
     $options = createOptionArray($optvals);
 
     /* Build all these values into an array of SquirrelOptions objects. */
     $options = createOptionArray($optvals);
 

diff --git a/src/read_body.php b/src/read_body.php
index 421a44896c7ac8dc0f9bd70207d10f3472fa1fdf..8fda097212cbb40b3cfb36daa21fcd14c6eacafe 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -488,6 +488,23 @@
          "      </TR>" . "\n";
       }
    }
          "      </TR>" . "\n";
       }
    }

+   if ($show_xmailer_default) {
+      fputs ($imapConnection, sqimap_session_id() .
+                   " FETCH $passed_id BODY.PEEK[HEADER.FIELDS (X-Mailer)]\r\n");
+      $read = sqimap_read_data ($imapConnection, sqimap_session_id(), true, 
+                                                       $response, $readmessage);
+      $mailer = substr($read[1], strpos($read[1], " "));
+      if (trim($mailer)) {
+       echo "      <TR>\n" .
+         "         <TD BGCOLOR=\"$color[0]\" ALIGN=RIGHT VALIGN=TOP>\n" .
+         "            "._("Mailer").": \n".
+         "         </TD><TD BGCOLOR=\"$color[0]\" VALIGN=TOP colspan=2>\n" .
+         "            <B>$mailer</B>&nbsp;\n" .
+         "         </TD>" . "\n" .
+         "      </TR>" . "\n";
+      }
+   }
+

    do_hook("read_body_header");
    echo '</TABLE>' .
         '   </TD></TR>' .
    do_hook("read_body_header");
    echo '</TABLE>' .
         '   </TD></TR>' .