Template for view header feature.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11927 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/view_header.php b/src/view_header.php
index 0feda56cf96015a42677f4aeda231f34e75371f1..a9b3a8514c03f5631316dfa823b411d64ed0387f 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -79,76 +79,6 @@ function parse_viewheader($imapConnection,$id, $passed_ent_id) {
     return $header_output;
 }
 
-/**
- * Temporary test function to process template vars with formatting.
- * I use it for viewing the message_header (view_header.php) with
- * a sort of template.
- * @param mixed $var
- * @param mixed $format_ar
- * @since 1.3.0
- * @todo if function is temporary, then why it is used.
- * @deprecated
- */
-function echo_template_var($var, $format_ar = array() ) {
-    $frm_last = count($format_ar) -1;
-
-    if (isset($format_ar[0])) echo $format_ar[0];
-    $i = 1;
-
-    switch (true) {
-    case (is_string($var)):
-        echo $var;
-        break;
-    case (is_array($var)):
-        $frm_a = array_slice($format_ar,1,$frm_last-1);
-        foreach ($var as $a_el) {
-            if (is_array($a_el)) {
-                echo_template_var($a_el,$frm_a);
-            } else {
-                echo $a_el;
-                if (isset($format_ar[$i])) {
-                    echo $format_ar[$i];
-                }
-                $i++;
-            }
-        }
-        break;
-    default:
-        break;
-    }
-    if (isset($format_ar[$frm_last]) && $frm_last>$i ) {
-        echo $format_ar[$frm_last];
-    }
-}
-
-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></td></tr></table>\n";
-
-    echo_template_var($header,
-        array(
-            '<table width="99%" cellpadding="2" cellspacing="0" border="0" '.
-                "align=center>\n".'<tr><td>',
-            '<tt style="white-space: nowrap;"><b>',
-            '</b>',
-            '</tt>',
-            '</td></tr></table>'."\n"
-         )
-    );
-    echo '</body></html>';
-}
-
 /* get global vars */
 if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
   $passed_id = (int) $temp;
@@ -164,8 +94,25 @@ sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
 $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);
-view_header($header, $mailbox, $color);
 
-?>
+$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);
+
+$oTemplate->display('view_header.tpl');
+
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file

diff --git a/templates/default/css/default.css b/templates/default/css/default.css
index 911f80ba4775c5d5b87242a9bcbce7dfa70425f8..2bee390eabace236aebe5e8cb20713a29ec8846c 100644 (file)
--- a/templates/default/css/default.css
+++ b/templates/default/css/default.css
@@ -1018,7 +1018,19 @@ div.printerFriendly td.attachName {
     font-weight: bold;
 }
 
+div.viewHeader table.table1 {
+    width: 100%;
+}
 
+div.viewHeader td.headers {
+    padding-left:5px;
+    font-family: monospace, sans-serif;
+    font-size: small;
+}
+
+div.viewHeader span.headerName {
+    font-weight: bold;
+}
 
 
 

diff --git a/templates/default/view_header.tpl b/templates/default/view_header.tpl
new file mode 100644 (file)
index 0000000..a78ec55
--- /dev/null
+++ b/templates/default/view_header.tpl
@@ -0,0 +1,51 @@
+<?php
+/**
+ * view_header.tpl
+ *
+ * Template for displaying the full header of a message
+ * 
+ * The following variables are available in this template:
+ *      $view_message_href - URL to navigate back to the full message
+ *      $headers - Array containing all headers from the message.  Each element
+ *                 represents a separate header and contains the following fields:
+ * 
+ *          $el['Header'] - The name of the header
+ *          $el['Value']  - The value of the header.
+ * 
+ *                 All headers have been scrubbed by Squirrelmail already.
+ *
+ * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ * @subpackage templates
+ */
+
+/** add required includes **/
+
+/** extract template variables **/
+extract($t);
+
+/** Begin template **/
+?>
+<div class="viewHeader">
+<table cellspacing="0" class="table1">
+ <tr>
+  <td class="header2">
+   <?php echo _("Viewing Full Header"); ?> -
+   <small><a href="<?php echo $view_message_href; ?>"><?php echo _("View message"); ?></a></small>
+  </td>
+ </tr>
+ <tr>
+  <td class="headers">
+   <?php
+    foreach ($headers as $header) {
+        ?>
+   <span class="headerName"><?php echo $header['Header']; ?></span> <span class="headerValue"><?php echo $header['Value']; ?></span>
+        <?php
+    }
+   ?>
+  </td>
+ </tr>
+</table>
+</div>
\ No newline at end of file