move global include earlier..

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index 8a2c111f1584288a1bc81b105df8e98df2598108..8a4dc046ab4a3a3f1ff69ef26e09b24372511a61 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,7 +3,7 @@
 /**
  * view_header.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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.
@@ -20,7 +20,7 @@ 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) {
+function parse_viewheader($imapConnection,$id, $passed_ent_id) {
    global $uid_support;
 
    $header_full = array();
@@ -35,36 +35,39 @@ function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
     $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)) {
+        if(strtolower($f) != 'message-id:') {
+               parseEmail($s);
+       }
+        if ($f) {
             $header_output[] = array($f,$s);
         }
     }
@@ -73,9 +76,7 @@ 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;
+    $ret_addr = SM_PATH . 'src/read_body.php?'.$_SERVER['QUERY_STRING'];
 
     displayPageHeader($color, $mailbox);
 
@@ -100,10 +101,20 @@ function view_header($header, $mailbox, $color) {
     echo '</body></html>';
 }
 
-if (!isset($passed_ent_id)) {
+/* get global vars */
+$passed_id = $_GET['passed_id'];
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$delimiter = $_SESSION['delimiter'];
+$onetimepad = $_SESSION['onetimepad'];
+
+if (!isset($_GET['passed_ent_id'])) {
   $passed_ent_id = '';
+} else {
+    $passed_ent_id = $_GET['passed_ent_id'];
 }
-$mailbox = decodeHeader($mailbox);
+
+$mailbox = urldecode($_GET['mailbox']);
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, 
                                $imapPort, 0);