Fix: Messages forwarded as attachments from message list were not getting flagged...

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index fb53d0da233c57124db7219b8c67c76c71a59c41..c7e0fb650a8f28997888da32838c36ad161bae2e 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -5,7 +5,7 @@
  *
  * Prints the page header (duh)
  *
- * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @copyright © 1999-2009 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -172,7 +172,7 @@ EOS;
  * @param string $target    The target frame for this link
  * @param string $accesskey The access key to be used, if any
  */
-function makeInternalLink($path, $text, $target='', $accesskey='') {
+function makeInternalLink($path, $text, $target='', $accesskey='NONE') {
     global $base_uri, $oTemplate;
 //    sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
 
@@ -187,7 +187,9 @@ function makeInternalLink($path, $text, $target='', $accesskey='') {
 
     return create_hyperlink($base_uri . $path, $text, $target,
                             '', '', '', '',
-                            (empty($accesskey) ? array() : array('accesskey' => $accesskey)));
+                            ($accesskey == 'NONE'
+                            ? array()
+                            : array('accesskey' => $accesskey)));
 }
 
 /**
@@ -256,7 +258,13 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sOnload = '') {
         $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
                     readShortMailboxName($mailbox, $delimiter)));
         if (getPref($data_dir, $username, 'translate_special_folders')) {
-            $shortBoxName = _($shortBoxName);
+            global $sent_folder, $trash_folder, $draft_folder;
+            if ($mailbox == $sent_folder)
+                $shortBoxName = _("Sent");
+            else if ($mailbox == $trash_folder)
+                $shortBoxName = _("Trash");
+            else if ($mailbox == $sent_folder)
+                $shortBoxName = _("Drafts");
         }
         $urlMailbox = urlencode($mailbox);
     } else {
@@ -276,6 +284,21 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sOnload = '') {
     $oTemplate->assign('urlMailbox', $urlMailbox);
     $oTemplate->assign('startMessage', $startMessage);
     $oTemplate->assign('hide_sm_attributions', $hide_sm_attributions);
+
+    // access keys
+    //
+    global $accesskey_menubar_compose, $accesskey_menubar_addresses,
+           $accesskey_menubar_folders, $accesskey_menubar_options,
+           $accesskey_menubar_search, $accesskey_menubar_help,
+           $accesskey_menubar_signout;
+    $oTemplate->assign('accesskey_menubar_compose', $accesskey_menubar_compose);
+    $oTemplate->assign('accesskey_menubar_addresses', $accesskey_menubar_addresses);
+    $oTemplate->assign('accesskey_menubar_folders', $accesskey_menubar_folders);
+    $oTemplate->assign('accesskey_menubar_options', $accesskey_menubar_options);
+    $oTemplate->assign('accesskey_menubar_search', $accesskey_menubar_search);
+    $oTemplate->assign('accesskey_menubar_help', $accesskey_menubar_help);
+    $oTemplate->assign('accesskey_menubar_signout', $accesskey_menubar_signout);
+
     $oTemplate->display('page_header.tpl');
 
     global $null;