Outputs HTML through the MagicHTML parser

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 4684a95baa5b00fa40f6be0e1f5f4b2955573a80..2bc875069a79839dff551aa4976ab22349c5367d 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -4,25 +4,14 @@
     **
     **  Prints the page header (duh)
     **
+    **  $Id$
     **/
 
-   session_start();
+   if (defined('page_header_php'))
+       return;
+   define('page_header_php', true);
 
-   $page_header_php = true;
-
-   if (!isset($prefs_php))
-      include ("../functions/prefs.php");
-   if (!isset($i18n_php))
-      include ("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include ("../functions/plugin.php");
-
-   // Check to see if gettext is installed
-   set_up_language(getPref($data_dir, $username, "language"));
-
-   // This is done to ensure that the character set is correct.
-   if ($default_charset != "")
-      header ("Content-Type: text/html; charset=$default_charset");
+   // Always set up the language before calling these functions
 
    function displayHtmlHeader ($title="SquirrelMail") {
      global $theme_css;
@@ -61,7 +50,6 @@
 
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
-      $shortBoxName = sqStripSlashes($shortBoxName);
       echo "<A NAME=pagetop></A>\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
       echo "   <TR BGCOLOR=\"$color[9]\">\n";
@@ -74,7 +62,7 @@
       echo "</TABLE>\n\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
       echo "   <TR>\n";
-      echo "      <TD ALIGN=left WIDTH=\"99%\">\n";
+      echo "      <TD ALIGN=left WIDTH=\"90%\">\n";
       $urlMailbox = urlencode($mailbox);
       displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
       echo "&nbsp;&nbsp;\n";
@@ -91,8 +79,8 @@
 
       do_hook("menuline");
 
-      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"1%\">\n";
-      echo "         <A HREF=\"http://www.squirrelmail.org/index.php3?from=1\" TARGET=\"_top\">SquirrelMail</A>\n";
+      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"10%\">\n";
+      echo "         <A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";
       echo "</TABLE>\n\n";