X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fview_header.php;h=0e0b2e218901a711b90ab472364ab7017f44bbf9;hp=81b16c088d6389a03bf576dc8db69778f6fd28ce;hb=ebd2391cb0c5e3049870f90fa8a8b28707e9571a;hpb=dbdfdf6c123c81d3a3fd8d90ff0a781032dac59f

diff --git a/src/view_header.php b/src/view_header.php
index 81b16c08..0e0b2e21 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,63 +3,67 @@
 /**
  * view_header.php
  *
- * Copyright (c) 1999-2003 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-2007 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) {
-    global $uid_support;
 
-    $header_full = array();
+    $header_output = array();
+    $second = array();
+    $first = array();
+
     if (!$passed_ent_id) {
-        $read=sqimap_run_command ($imapConnection, "FETCH $id BODY[HEADER]", 
-                              true, $a, $b, $uid_support);
+        $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, $uid_support);
-    }    
+        $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("^&gt;", $line)):
-            $second[$i] = $line;
-            $first[$i] = '&nbsp;';
-            $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 (eregi("^&gt;", $line)):
+                $second[$i] = $line;
+                $first[$i] = '&nbsp;';
+                $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;
         }
     }
     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]);
@@ -78,33 +82,6 @@ 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 '<BR>' .
-         '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0"'.
-         ' ALIGN="CENTER">' . "\n" .
-         "   <TR><TD BGCOLOR=\"$color[9]\" WIDTH=\"100%\" ALIGN=\"CENTER\"><B>".
-         _("Viewing Full Header") . '</B> - '.
-         '<a href="'; 
-    echo_template_var($ret_addr);
-    echo '">' ._("View message") . "</a></b></td></tr></table>\n";
-
-    echo_template_var($header, 
-         array(
-           "<table width='99%' cellpadding='2' cellspacing='0' border='0'".
-             "align=center>\n".'<tr><td>',
-           '<nobr><tt><b>',
-           '</b>',
-           '</tt></nobr>',
-           '</td></tr></table>'."\n" 
-         ) );
-    echo '</body></html>';
-}
-
 /* get global vars */
 if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
   $passed_id = (int) $temp;
@@ -114,17 +91,30 @@ 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, false, $imapServerAddress,
                                $imapPort, 0);
 $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox, false, false, true);
+$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id);
+
+$aTemplateHeaders = array();
+foreach ($header as $h) {
+    $aTemplateHeaders[] = array (
+                                    'Header' => $h[0],
+                                    'Value' => $h[1]
+                                );
+}
+
+sqgetGlobalVar('QUERY_STRING', $queryStr, SQ_SERVER);
+$ret_addr = SM_PATH . 'src/read_body.php?'.$queryStr;
+
+displayPageHeader( $color, $mailbox );
+
+$oTemplate->assign('view_message_href', $ret_addr);
+$oTemplate->assign('headers', $aTemplateHeaders);
 
-$header = parse_viewheader($imapConnection,$passed_id, $passed_ent_id); 
-view_header($header, $mailbox, $color);
+$oTemplate->display('view_header.tpl');
 
-?>
+$oTemplate->display('footer.tpl');