X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_header.php;h=27a5b94117a76eeb5a000e6f26dbb4df2cdac15b;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hp=96f2e99efb992d2b12fc95eb2a6d829b099abe28;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git
diff --git a/src/view_header.php b/src/view_header.php
index 96f2e99e..27a5b941 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,68 +3,93 @@
/**
* 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-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
-define('SM_PATH','../');
+/** This is the view_header page */
+define('PAGE_NAME', 'view_header');
+
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'src/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;
+/**
+ * Extract message headers
+ *
+ * @param resource $imapConnection
+ * @param string $id Message ID
+ * @param string $passed_ent_id Nested/attached/embedded message ID (if any)
+ *
+ * @return array List of all message headers, where each
+ * element is a sub-array that contains two
+ * elements: header name and header value
+ * (in that order) where the header value is
+ * HTML-formatted, ready for display in browser
+ *
+ */
+function parse_viewheader($imapConnection, $id, $passed_ent_id) {
+
+ $header_output = array();
+ $second = array();
+ $first = array();
- $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);
- }
+ 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("^>", $line)) {
- $second[$i] = $line;
- $first[$i] = ' ';
- $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] = '';
+ $line = sm_encode_html_special_chars($read[$i]);
+ switch (true) {
+ case (preg_match('/^>/i', $line)):
+ $second[$i] = $line;
+ $first[$i] = ' ';
+ $cnum++;
+ break;
+// FIXME: is the pipe character below a mistake? I think the original author might have thought it carried special meaning in the character class, which it does not... but then again, I am not currently trying to understand what this code actually does
+ case (preg_match('/^[ |\t]/', $line)):
+ $second[$i] = $line;
+ $first[$i] = '';
+ break;
+ case (preg_match('/^([^:]+):(.+)/', $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 .= ' ' . 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);
}
}
@@ -72,44 +97,38 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
return $header_output;
}
-function view_header($header, $mailbox, $color) {
- global $QUERY_STRING, $base_uri;
-
- $ret_addr = $base_uri . 'src/read_body.php?'.$QUERY_STRING;
-
- displayPageHeader($color, $mailbox);
-
- echo '
' .
- '
\n";
-
- echo_template_var($header,
- array(
- "\n".'',
- '',
- '',
- '',
- ' |
'."\n"
- ) );
- echo '