Happy New Year

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index fd43a16af92ebd5ad165e1af049ef2c674dba0e8..3d6652f31f272f995f773cc1554117d10e54e4c8 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -5,7 +5,7 @@
  *
  * This is the code to view the message header.
  *
- * @copyright © 1999-2009 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
@@ -23,7 +23,21 @@ require('../include/init.php');
 require_once(SM_PATH . 'functions/imap.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();
@@ -39,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("^&gt;", $line)):
+            case (preg_match('/^&gt;/i', $line)):
                 $second[$i] = $line;
                 $first[$i] = '&nbsp;';
                 $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++;
@@ -92,8 +107,9 @@ if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
 }
 sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
 
+global $imap_stream_options; // in case not defined in config
 $imapConnection = sqimap_login($username, false, $imapServerAddress,
-                               $imapPort, 0);
+                               $imapPort, 0, $imap_stream_options);
 $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
 $header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);