Displaying and fixing some XHTML

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index 8a2c111f1584288a1bc81b105df8e98df2598108..030eb869aa68c6c97855417bc7b95102bda9662b 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,68 +3,77 @@
 /**
  * view_header.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.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;
+function parse_viewheader($imapConnection,$id, $passed_ent_id) {
 
-   $header_full = array();
-   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);
-   }    
+    $header_full = 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)) {
+       switch (true) {
+         case (eregi("^&gt;", $line)):
             $second[$i] = $line;
             $first[$i] = '&nbsp;';
             $cnum++;
-        } else if (eregi("^[ |\t]", $line)) {
+           break;
+         case (eregi("^[ |\t]", $line)):
             $second[$i] = $line;
             $first[$i] = '';
-        } else if (eregi("^([^:]+):(.+)", $line, $regs)) {
+           break;
+         case (eregi("^([^:]+):(.+)", $line, $regs)):
             $first[$i] = $regs[1] . ':';
             $second[$i] = $regs[2];
             $cnum++;
-        } else {
+           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);
         }
     }
@@ -73,9 +82,8 @@ function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
 }
 
 function view_header($header, $mailbox, $color) {
-    global $QUERY_STRING, $base_uri;
-
-    $ret_addr = $base_uri . 'src/read_body.php?'.$QUERY_STRING;
+    sqgetGlobalVar('QUERY_STRING', $queryStr, SQ_SERVER);
+    $ret_addr = SM_PATH . 'src/read_body.php?'.$queryStr;
 
     displayPageHeader($color, $mailbox);
 
@@ -100,10 +108,20 @@ function view_header($header, $mailbox, $color) {
     echo '</body></html>';
 }
 
-if (!isset($passed_ent_id)) {
-  $passed_ent_id = '';
+/* get global vars */
+if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
+  $passed_id = (int) $temp;
 }
-$mailbox = decodeHeader($mailbox);
+if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
+  $mailbox = $temp;
+}
+if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
+  $passed_ent_id = '';
+} 
+sqgetGlobalVar('key',        $key,          SQ_COOKIE);
+sqgetGlobalVar('username',   $username,     SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad,   SQ_SESSION);
+sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, 
                                $imapPort, 0);