X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=98b916884ff95d3791e2c3b5bcc173c55eff3ff7;hb=a301f0d81f82189d51d9095b6a4429f14e537840;hp=6b6663edb6df6eab77bb48d85a2d55faca4b00c7;hpb=e7db48afbf9565737173583af6962520d2491acc;p=squirrelmail.git diff --git a/functions/page_header.php b/functions/page_header.php index 6b6663ed..98b91688 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -11,32 +11,15 @@ 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; - echo ''; - echo "\n\n"; - echo "\n"; - echo "\n"; - if ($theme_css != "") { - printf ('', - $theme_css); - echo "\n"; + echo '' . + "\n\n\n\n"; + if ($theme_css != '') { + echo "\n"; } do_hook ("generic_header"); @@ -45,37 +28,35 @@ echo "\n\n"; } - function displayInternalLink ($path, $text, $target="") { + function displayInternalLink ($path, $text, $target='') { global $base_uri; - if ($target != "") + if ($target != '') $target = " target=\"$target\""; echo ''.$text.''; } function displayPageHeader($color, $mailbox) { + global $delimiter; displayHtmlHeader (); - printf('', - $color[8], $color[4], $color[7], $color[7], $color[7]); - echo "\n\n"; + echo "\n\n"; /** Here is the header and wrapping table **/ - $shortBoxName = readShortMailboxName($mailbox, "."); + $shortBoxName = readShortMailboxName($mailbox, $delimiter); echo "\n"; + // echo "
"; echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; - echo "
\n"; + echo "
\n"; displayInternalLink ("src/signout.php", _("Sign Out"), "_top"); - echo " \n"; - echo "
" . _("Current Folder") . ": $shortBoxName 
\n"; + echo " 		\n"; + echo ' ' . _("Current Folder") . ": $shortBoxName \n"; echo "
\n\n"; - echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
\n"; + echo "
\n"; $urlMailbox = urlencode($mailbox); displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right"); echo "  \n"; @@ -92,10 +73,11 @@ do_hook("menuline"); - echo " \n"; + echo " \n"; echo " SquirrelMail\n"; echo "
\n\n"; + // echo "
"; } ?>