Do not parse Message-ID as emailaddress.

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index 24163065814b54a6cfca18c138d25a8dd2bd2d7c..c7aa7e0e35d8ef67edf46ea946fccaee03e4b00e 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -11,15 +11,27 @@
  * $Id$
  */
 
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-function  parse_viewheader($imapConnection,$id,$template_vars) {
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/url_parser.php');
+
+function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
    global $uid_support;
 
    $header_full = array();
-
-   $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]", 
+   if (!$passed_ent_id) {
+       $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]", 
+                              true, $a, $b, $uid_support);
+   } else {
+       $query = "FETCH $id BODY[".$passed_ent_id.'.HEADER]';
+       $read=sqimap_run_command ($imapConnection, $query, 
                               true, $a, $b, $uid_support);
-    
+   }    
     $cnum = 0;
     for ($i=1; $i < count($read); $i++) {
         $line = htmlspecialchars($read[$i]);
@@ -51,44 +63,56 @@ function  parse_viewheader($imapConnection,$id,$template_vars) {
             $s .= '&nbsp;&nbsp;&nbsp;&nbsp;' . nl2br($second[$j]);
             $j++;
         }
-        parseEmail($s);
+        if(strtolower($f) != 'message-id:')
+       {
+               parseEmail($s);
+       }
         if (isset($f)) {
-            $header_output[] = array($s,$f);               
+            $header_output[] = array($f,$s);
         }
     }
-
     sqimap_logout($imapConnection);
+    return $header_output;
+}
 
-    $template_vars['full_header'] = $header_output;
+function view_header($header, $mailbox, $color) {
+    global $QUERY_STRING, $base_uri;
 
-    return $template_vars;
-}
+    $ret_addr = $base_uri . 'src/read_body.php?'.$QUERY_STRING;
+
+    displayPageHeader($color, $mailbox);
 
-function view_header($template_vars, $pageheader='', $pagefooter='') {
-    
-global $color;
-    
-    echo $pageheader;
     echo '<BR>' .
          '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0"'.
          ' ALIGN="CENTER">' . "\n" .
          "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>".
          _("Viewing Full Header") . '</B> - '.
          '<a href="'; 
-    echo_template_var($template_vars['return_address']);
+    echo_template_var($ret_addr);
     echo '">' ._("View message") . "</a></b></td></tr></table>\n";
 
-    echo_template_var($template_vars['full_header'], 
+    echo_template_var($header, 
          array(
            "<table width='99%' cellpadding='2' cellspacing='0' border='0'".
-             "align=center>\n".
-'<tr><td>',
+             "align=center>\n".'<tr><td>',
            '<nobr><tt><b>',
            '</b>',
            '</tt></nobr>',
            '</td></tr></table>'."\n" 
          ) );
-    echo $pagefooter;
+    echo '</body></html>';
+}
+
+if (!isset($passed_ent_id)) {
+  $passed_ent_id = '';
 }
+$mailbox = decodeHeader($mailbox);
+
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, 
+                               $imapPort, 0);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+
+$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id); 
+view_header($header, $mailbox, $color);
 
 ?>