X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fview_header.php;h=9112261796b75b6c3df7cb4a79a363d03b036f3b;hp=2f8c55c1e159c4752efdc8bd1aa517c07f507806;hb=a798d8b2a36f3f7d30e58f350df31e31f9fefaf8;hpb=6201339c4c48f41291e01617f70b732210860eee
diff --git a/src/view_header.php b/src/view_header.php
index 2f8c55c1..91122617 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,63 +3,68 @@
/**
* view_header.php
*
- * 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$
+ * @copyright 1999-2010 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 . '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) {
- $header_full = array();
+ $header_output = array();
+ $second = array();
+ $first = array();
+
if (!$passed_ent_id) {
- $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]",
+ $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,
+ $read=sqimap_run_command ($imapConnection, $query,
true, $a, $b, TRUE);
- }
+ }
$cnum = 0;
for ($i=1; $i < count($read); $i++) {
$line = htmlspecialchars($read[$i]);
- switch (true) {
- case (eregi("^>", $line)):
- $second[$i] = $line;
- $first[$i] = ' ';
- $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;
+ 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) {
$f = (isset($first[$i]) ? $first[$i] : '');
- $s = (isset($second[$i]) ? nl2br($second[$i]) : '');
+ $s = (isset($second[$i]) ? nl2br($second[$i]) : '');
$j = $i + 1;
while (($first[$j] == '') && ($j < count($first))) {
$s .= ' ' . nl2br($second[$j]);
@@ -78,53 +83,37 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
return $header_output;
}
-function view_header($header, $mailbox, $color) {
- sqgetGlobalVar('QUERY_STRING', $queryStr, SQ_SERVER);
- $ret_addr = SM_PATH . 'src/read_body.php?'.$queryStr;
-
- displayPageHeader($color, $mailbox);
-
- echo '
' .
- '
\n";
-
- echo_template_var($header,
- array(
- "\n".'',
- '',
- '',
- '',
- ' |
'."\n"
- ) );
- echo '