X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fpage_header.php;h=7910dd84d56b57de86ef94c86f7b6984951881ec;hp=0a9e40ba018b00bee0508c765f051dab70ac405a;hb=97b1248c028b0c59ccd28a094dffa41720b29006;hpb=d51894be063bf2e1349762bc554358c62d368e36 diff --git a/functions/page_header.php b/functions/page_header.php index 0a9e40ba..7910dd84 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -1,100 +1,214 @@ '; - echo "\n\n"; - echo "\n"; - echo "
\n"; - if ($theme_css != "") { - printf ('', - $theme_css); - echo "\n"; - } - - do_hook ("generic_header"); - - echo "\n"; - displayInternalLink ("src/signout.php", _("Sign Out"), "_top"); - echo " | \n";
- echo " " . _("Current Folder") . ": $shortBoxName \n";
- echo " | \n";
- echo "
\n"; - $urlMailbox = urlencode($mailbox); - displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right"); - echo " \n"; - displayInternalLink ("src/addressbook.php", _("Addresses"), "right"); - echo " \n"; - displayInternalLink ("src/folders.php", _("Folders"), "right"); - 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 "
\n"; + if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) { + echo ' ' . _("Current Folder") . ": $shortBoxName \n"; + } else { + echo ' '; + } + echo " | \n" + . ''; + displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top); + echo " | \n" + . "
\n"; + $urlMailbox = urlencode($mailbox); + if ($compose_new_win == '1') { + echo "'. _("Compose"). ''; + } + else { + displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right'); + } + echo " \n"; + displayInternalLink ("src/addressbook.php", _("Addresses"), 'right'); + echo " \n"; + displayInternalLink ("src/folders.php", _("Folders"), 'right'); + 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 ($hide_sm_attributions ? ' ' : + 'SquirrelMail'); + echo " | \n". + "