$first should not cause e_notice errors, but it still can be abused

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index 5948f8ac8193bb46936730c670262eb75f537834..824c69f4ac1b52a31b786dd22367f3cb10617290 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,11 +3,10 @@
 /**
  * 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.
  *
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -27,15 +26,18 @@ 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]);
@@ -62,7 +64,7 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
     }
     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 .= '&nbsp;&nbsp;&nbsp;&nbsp;' . nl2br($second[$j]);
@@ -92,18 +94,18 @@ function view_header($header, $mailbox, $color) {
             'align="center">' . "\n" .
          '<tr><td bgcolor="'.$color[9].'" width="100%" align="center"><b>'.
          _("Viewing Full Header") . '</b> - '.
-         '<a href="'; 
+         '<a href="';
     echo_template_var($ret_addr);
-    echo '">' ._("View message") . "</a></b></td></tr></table>\n";
+    echo '">' ._("View message") . "</a></td></tr></table>\n";
 
-    echo_template_var($header, 
+    echo_template_var($header,
         array(
             '<table width="99%" cellpadding="2" cellspacing="0" border="0" '.
                 "align=center>\n".'<tr><td>',
-            '<nobr><tt><b>',
+            '<tt style="white-space: nowrap;"><b>',
             '</b>',
-            '</tt></nobr>',
-            '</td></tr></table>'."\n" 
+            '</tt>',
+            '</td></tr></table>'."\n"
          )
     );
     echo '</body></html>';
@@ -118,17 +120,17 @@ if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
 }
 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, 
+$imapConnection = sqimap_login($username, $key, $imapServerAddress,
                                $imapPort, 0);
 $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
 
-$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id); 
+$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
 view_header($header, $mailbox, $color);
 
-?>
\ No newline at end of file
+?>