X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_header.php;h=a9b3a8514c03f5631316dfa823b411d64ed0387f;hb=01520835fafbe4eb34a55185df4d1be14ddc0ec1;hp=5948f8ac8193bb46936730c670262eb75f537834;hpb=134e4174c8919790bcc463587e90ac37cabc2f90;p=squirrelmail.git

diff --git a/src/view_header.php b/src/view_header.php
index 5948f8ac..a9b3a851 100644
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -3,39 +3,37 @@
 /**
  * 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-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
 /**
- * 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) {
 
-    $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 +60,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]);
@@ -81,34 +79,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;
@@ -118,17 +88,31 @@ 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');
 ?>
\ No newline at end of file