X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=98b916884ff95d3791e2c3b5bcc173c55eff3ff7;hp=1eb18dffa339ffd7f807a279367d120dda6cac0a;hb=a5d53045e42db1c8fc3f875467439c5ec8367c1e;hpb=88c813966455692c10444dbf9e091f2b920486a2 diff --git a/functions/page_header.php b/functions/page_header.php index 1eb18dff..98b91688 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -4,91 +4,60 @@ ** ** 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 - if (function_exists("_")) { - // Setting the language to use for gettext if it is not English - // (the default language) or empty. - $squirrelmail_language = getPref ($data_dir, $username, "language"); - if ($squirrelmail_language != "en" && $squirrelmail_language != "") { - putenv("LC_ALL=$squirrelmail_language"); - bindtextdomain("squirrelmail", "../locale/"); - textdomain("squirrelmail"); - $default_charset = $languages[$squirrelmail_language]["CHARSET"]; - } - } else { - function _($string) { - return $string; - } - } - - // 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; - 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"); - echo "$title"; + echo "$title\n"; 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) { - displayHtmlHeader ($color); + 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 = stripslashes($shortBoxName); + $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"; - $urlMailbox = $mailbox; + echo "
\n"; + $urlMailbox = urlencode($mailbox); displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right"); echo "  \n"; displayInternalLink ("src/addressbook.php", _("Addresses"), "right"); @@ -97,15 +66,18 @@ echo "  \n"; displayInternalLink ("src/options.php", _("Options"), "right"); echo "  \n"; + displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), "right"); + echo "  \n"; displayInternalLink ("src/help.php", _("Help"), "right"); echo "  \n"; do_hook("menuline"); - echo " \n"; - echo " SquirrelMail\n"; + echo " \n"; + echo " SquirrelMail\n"; echo "
\n\n"; + // echo "
"; } ?>