X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fview_header.php;h=0e0b2e218901a711b90ab472364ab7017f44bbf9;hp=4d5d0dcc19000d2f8e3b6213a3123755684eb720;hb=ebd2391cb0c5e3049870f90fa8a8b28707e9571a;hpb=36cd4eaaad5d791c897ed4be937821267a34670e

diff --git a/src/view_header.php b/src/view_header.php
index 4d5d0dcc..0e0b2e21 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,90 +3,118 @@
 /**
  * view_header.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This is the code to view the message header.
  *
- * $Id$
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  */
 
+/** This is the view_header page */
+define('PAGE_NAME', 'view_header');
 
-function  parse_viewheader($imapConnection,$id,$template_vars) {
-   global $uid_support;
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-   $header_full = array();
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/url_parser.php');
 
-   $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]", 
-                              true, $a, $b, $uid_support);
+function parse_viewheader($imapConnection,$id, $passed_ent_id) {
 
+    $header_output = array();
+    $second = array();
+    $first = array();
+
+    if (!$passed_ent_id) {
+        $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]",
+                              true, $a, $b, TRUE);
+    } else {
+        $query = "FETCH $id BODY[".$passed_ent_id.'.HEADER]';
+        $read=sqimap_run_command ($imapConnection, $query,
+                              true, $a, $b, TRUE);
+    }
     $cnum = 0;
     for ($i=1; $i < count($read); $i++) {
         $line = htmlspecialchars($read[$i]);
-        if (eregi("^&gt;", $line)) {
-            $second[$i] = $line;
-            $first[$i] = '&nbsp;';
-            $cnum++;
-        } else if (eregi("^[ |\t]", $line)) {
-            $second[$i] = $line;
-            $first[$i] = '';
-        } else if (eregi("^([^:]+):(.+)", $line, $regs)) {
-            $first[$i] = $regs[1] . ':';
-            $second[$i] = $regs[2];
-            $cnum++;
-        } else {
-            $second[$i] = trim($line);
-            $first[$i] = '';
+        switch (true) {
+            case (eregi("^&gt;", $line)):
+                $second[$i] = $line;
+                $first[$i] = '&nbsp;';
+                $cnum++;
+                break;
+            case (eregi("^[ |\t]", $line)):
+                $second[$i] = $line;
+                $first[$i] = '';
+                break;
+            case (eregi("^([^:]+):(.+)", $line, $regs)):
+                $first[$i] = $regs[1] . ':';
+                $second[$i] = $regs[2];
+                $cnum++;
+                break;
+            default:
+                $second[$i] = trim($line);
+                $first[$i] = '';
+                break;
         }
     }
     for ($i=0; $i < count($second); $i = $j) {
-        if (isset($first[$i])) {
-            $f = $first[$i];
-        }
-        if (isset($second[$i])) {
-            $s = nl2br($second[$i]);
-        }
+        $f = (isset($first[$i]) ? $first[$i] : '');
+        $s = (isset($second[$i]) ? nl2br($second[$i]) : '');
         $j = $i + 1;
         while (($first[$j] == '') && ($j < count($first))) {
             $s .= '&nbsp;&nbsp;&nbsp;&nbsp;' . nl2br($second[$j]);
             $j++;
         }
-        parseEmail($s);
-        if (isset($f)) {
+        $lowf=strtolower($f);
+        /* do not mark these headers as emailaddresses */
+        if($lowf != 'message-id:' && $lowf != 'in-reply-to:' && $lowf != 'references:') {
+            parseEmail($s);
+        }
+        if ($f) {
             $header_output[] = array($f,$s);
         }
     }
-
     sqimap_logout($imapConnection);
+    return $header_output;
+}
 
-    $template_vars['full_header'] = $header_output;
-
-    return $template_vars;
+/* get global vars */
+if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
+  $passed_id = (int) $temp;
+}
+if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
+  $mailbox = $temp;
+}
+if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
+  $passed_ent_id = '';
 }
+sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
 
-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 '">' ._("View message") . "</a></b></td></tr></table>\n";
+$imapConnection = sqimap_login($username, false, $imapServerAddress,
+                               $imapPort, 0);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
 
-    echo_template_var($template_vars['full_header'], 
-         array(
-           "<table width='99%' cellpadding='2' cellspacing='0' border='0'".
-             "align=center>\n".'<tr><td>',
-           '<nobr><tt><b>',
-           '</b>',
-           '</tt></nobr>',
-           '</td></tr></table>'."\n" 
-         ) );
-    echo $pagefooter;
+$aTemplateHeaders = array();
+foreach ($header as $h) {
+    $aTemplateHeaders[] = array (
+                                    'Header' => $h[0],
+                                    'Value' => $h[1]
+                                );
 }
 
-?>
+sqgetGlobalVar('QUERY_STRING', $queryStr, SQ_SERVER);
+$ret_addr = SM_PATH . 'src/read_body.php?'.$queryStr;
+
+displayPageHeader( $color, $mailbox );
+
+$oTemplate->assign('view_message_href', $ret_addr);
+$oTemplate->assign('headers', $aTemplateHeaders);
+
+$oTemplate->display('view_header.tpl');
+
+$oTemplate->display('footer.tpl');