X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fview_header.php;h=3d6652f31f272f995f773cc1554117d10e54e4c8;hb=c4faef335b2362c81b8ebf026d4066c12d70536c;hp=eb4718b102ae4f54af4833ded60faad4a2336b3f;hpb=47ccfad452e8d345542d09e59112cac317cffed8;p=squirrelmail.git
diff --git a/src/view_header.php b/src/view_header.php
index eb4718b1..3d6652f3 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -5,26 +5,39 @@
*
* This is the code to view the message header.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the view_header page */
+define('PAGE_NAME', 'view_header');
+
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+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) {
+/**
+ * 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();
@@ -40,18 +53,19 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
}
$cnum = 0;
for ($i=1; $i < count($read); $i++) {
- $line = htmlspecialchars($read[$i]);
+ $line = sm_encode_html_special_chars($read[$i]);
switch (true) {
- case (eregi("^>", $line)):
+ case (preg_match('/^>/i', $line)):
$second[$i] = $line;
$first[$i] = ' ';
$cnum++;
break;
- case (eregi("^[ |\t]", $line)):
+// 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 (eregi("^([^:]+):(.+)", $line, $regs)):
+ case (preg_match('/^([^:]+):(.+)/', $line, $regs)):
$first[$i] = $regs[1] . ':';
$second[$i] = $regs[2];
$cnum++;
@@ -83,54 +97,38 @@ 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 '