X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_header.php;h=4f86662d13072bb75da76615c82486b52f3ec6e4;hb=57ba5fa9aeb9e5f4073afd7dbd8ac379b35f0e3e;hp=a87b2fbee8eea1c252b04ed2df56d89f1fe869cb;hpb=65f8ca875317292daa540e5887b65c93fab1661e;p=squirrelmail.git

diff --git a/src/view_header.php b/src/view_header.php
index a87b2fbe..4f86662d 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,35 +3,37 @@
 /**
  * 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.
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 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;
+    global $uid_support;
 
-   $header_full = array();
-   if (!$passed_ent_id) {
-       $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]", 
+    $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, 
+    } 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]);
@@ -64,9 +66,11 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
             $s .= '&nbsp;&nbsp;&nbsp;&nbsp;' . nl2br($second[$j]);
             $j++;
         }
-        if(strtolower($f) != 'message-id:') {
-		parseEmail($s);
-	}
+        $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);
         }
@@ -76,7 +80,8 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
 }
 
 function view_header($header, $mailbox, $color) {
-    $ret_addr = SM_PATH . 'src/read_body.php?'.$_SERVER['QUERY_STRING'];
+    sqgetGlobalVar('QUERY_STRING', $queryStr, SQ_SERVER);
+    $ret_addr = SM_PATH . 'src/read_body.php?'.$queryStr;
 
     displayPageHeader($color, $mailbox);
 
@@ -102,19 +107,19 @@ function view_header($header, $mailbox, $color) {
 }
 
 /* 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'];
+if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
+  $passed_id = (int) $temp;
 }
-
-$mailbox = decodeHeader($_GET['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);