Stop using session_unregister()

[squirrelmail.git] / templates / default_advanced / page_header.tpl
diff --git a/templates/default_advanced/page_header.tpl b/templates/default_advanced/page_header.tpl

index d85ef9b9c7bf81bb83fb370b11f45d4c2892f9cd..3750ab6a83122659baba2a87741aefb5831d4f8e 100644 (file)
--- a/templates/default_advanced/page_header.tpl
+++ b/templates/default_advanced/page_header.tpl
@@ -5,7 +5,7 @@
   *
   * Template to create the header for each page.
   *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2009 The SquirrelMail Project Team
   * @license http://opensource.org/licenses/gpl-license.php GNU Public License
   * @version $Id: page_header.tpl 12135 2007-01-15 08:27:10Z pdontthink $
   * @package squirrelmail
@@ -51,16 +51,24 @@ $options_str = $options_link_default;
  $search_str = $search_link_default;
  $help_str = $help_link_default;
  
-$compose_link  = makeComposeLink ('src/compose.php?mailbox='.$urlMailbox.'&amp;startMessage='.$startMessage, $compose_str);
-$signout_link  = makeInternalLink ('src/signout.php', $signout_str, $frame_top);
-$address_link  = makeInternalLink ('src/addressbook.php', $address_str);
-$folders_link  = makeInternalLink ('src/folders.php', $folders_str);
-$search_link   = makeInternalLink ('src/search.php?mailbox='.$urlMailbox, $search_str);
-$options_link  = makeInternalLink ('src/options.php', $options_str);
-$help_link             = makeInternalLink ('src/help.php', $help_str);
+$compose_link = makeComposeLink('src/compose.php?mailbox=' . $urlMailbox
+                                . '&amp;startMessage=' . $startMessage,
+                                $compose_str, '', $accesskey_menubar_compose);
+$signout_link = makeInternalLink('src/signout.php', $signout_str, $frame_top,
+                                 $accesskey_menubar_signout);
+$address_link = makeInternalLink('src/addressbook.php', $address_str, '',
+                                 $accesskey_menubar_addresses);
+$folders_link = makeInternalLink('src/folders.php', $folders_str, '',
+                                 $accesskey_menubar_folders);
+$search_link  = makeInternalLink('src/search.php?mailbox='.$urlMailbox,
+                                 $search_str, '', $accesskey_menubar_search);
+$options_link = makeInternalLink('src/options.php', $options_str, '',
+                                 $accesskey_menubar_options);
+$help_link    = makeInternalLink('src/help.php', $help_str, '',
+                                 $accesskey_menubar_help);
  
  ?>
-<body <?php echo $body_tag_js; ?>>
+<body <?php if (!empty($onload)) echo ' onload="' . $onload . '"'; ?>>
  <?php
  
     /** if preview pane turned on, do not show menubar above message */
@@ -102,7 +110,7 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
     <?php echo $options_link; ?>&nbsp;&nbsp;
     <?php echo $search_link; ?>&nbsp;&nbsp;
     <?php echo $help_link; ?>&nbsp;&nbsp;
-   <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?>
+   <?php if (!empty($plugin_output['menuline'])) echo $plugin_output['menuline']; ?>
    </td>
    <td class="sqm_providerInfo">
      <?php 
@@ -129,9 +137,9 @@ $help_link          = makeInternalLink ('src/help.php', $help_str);
  <!--
     var delayed_page_load_uri = '';
     function delayed_page_load(page_uri)
-   { page_load_uri = page_uri; setTimeout('page_load()', 500); }
+   { delayed_page_load_uri = page_uri; setTimeout('page_load()', 500); }
     function page_load()
-   { document.location = page_load_uri; }
+   { document.location = delayed_page_load_uri; }
     function refresh_message_list()
     {
  <?php if (!empty($message_list_href)) { ?>