I neglected to make these two values globals.

[squirrelmail.git] / functions / page_header.php

diff --git a/functions/page_header.php b/functions/page_header.php
index 9dc2a5c2c277c6c1f783088841d4bd91477251f6..2bc875069a79839dff551aa4976ab22349c5367d 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,20 +11,7 @@
        return;
    define('page_header_php', true);
 
-   include('../src/validate.php');
-   include("../functions/prefs.php");
-   include("../functions/plugin.php");
-
-   // Check to see if gettext is installed
-   $headers_sent=set_up_language(getPref($data_dir, $username, "language"));
-
-   // This is done to ensure that the character set is correct.
-   // But first checks whether we have already sent headers
-   // with charset when we were setting up the user language.
-   // Otherwise user ends up with the default charset overriding
-   // his selected one.
-   if (!$headers_sent && $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;
@@ -75,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";
@@ -92,7 +79,7 @@
 
       do_hook("menuline");
 
-      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"1%\">\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";