X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=a658c6e5122ab28effa0c5a86abfaa21a90735ad;hb=2c86c02c16613d2e95d735e15b2b26d17c563453;hp=c1131462ab0e6c7064e4d641cdc111a591431bad;hpb=96b1b59739f8c572ae3d5206bf34b11ad045406e;p=squirrelmail.git diff --git a/functions/page_header.php b/functions/page_header.php index c1131462..a658c6e5 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -3,7 +3,7 @@ /** * page_header.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * Prints the page header (duh) @@ -11,38 +11,58 @@ * $Id$ */ -require_once('../functions/strings.php'); -require_once('../functions/imap_utf7_decode_local.php'); -require_once('../functions/html.php'); -//require_once('../functions/imap_mailbox.php'); +require_once(SM_PATH . 'functions/strings.php'); +require_once(SM_PATH . 'functions/html.php'); +require_once(SM_PATH . 'functions/imap_mailbox.php'); +require_once(SM_PATH . 'functions/global.php'); + /* Always set up the language before calling these functions */ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) { - global $theme_css, $custom_css, $base_uri; + if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) { + global $base_uri; + } + global $theme_css, $custom_css; - echo '' . - "\n\n\n\n"; + echo '' . + "\n\n" . html_tag( 'html' ,'' , '', '', '' ) . "\n\n"; if ( !isset( $custom_css ) || $custom_css == 'none' ) { if ($theme_css != '') { - echo ""; + echo ""; } } else { - echo ''; + echo ''; } if ($do_hook) { - do_hook("generic_header"); + do_hook('generic_header'); } - echo "\n$title$xtra\n\n"; + echo "\n$title$xtra\n"; + + /* work around IE6's scrollbar bug */ + echo << + + + +ECHO; + + echo "\n\n\n"; } function displayInternalLink($path, $text, $target='') { - global $base_uri; - + sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); if ($target != '') { $target = " target=\"$target\""; } @@ -51,10 +71,12 @@ function displayInternalLink($path, $text, $target='') { function displayPageHeader($color, $mailbox, $xtra='', $session=false) { - global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, - $compose_new_win, $username, $datadir, $compose_width, $compose_height, - $attachemessages, $session; + global $hide_sm_attributions, $PHP_SELF, $frame_top, + $compose_new_win, $compose_width, $compose_height, + $attachemessages, $provider_name, $provider_uri; + sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION ); + sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION ); $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); if ($qmark = strpos($module, '?')) { $module = substr($module, 0, $qmark); @@ -63,8 +85,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { $frame_top = '_top'; } - if ($session != false) { - $compose_uri = $base_uri.'src/compose.php?mailbox='. urlencode($mailbox).'&attachedmessages=true&session='."$session"; + if ($session) { + $compose_uri = $base_uri.'src/compose.php?mailbox='.urlencode($mailbox).'&attachedmessages=true&session='."$session"; } else { $compose_uri = $base_uri.'src/compose.php?newmessage=1'; $session = 0; @@ -89,7 +111,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { ' var newwin = window.open(comp_uri' . ', "_blank",'. '"width='.$compose_width. ',height='.$compose_height. - '",scrollbars="yes",resizable="yes");'."\n". + ',scrollbars=yes,resizable=yes");'."\n". "}\n\n"; @@ -102,7 +124,7 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { "\n"; } - displayHtmlHeader ('Squirrelmail', $js); + displayHtmlHeader ('SquirrelMail', $js); $onload = $xtra; break; case 'src/compose.php': @@ -130,8 +152,8 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { $js .= "// -->\n". "\n"; - $onload = "onLoad=\"checkForm();\""; - displayHtmlHeader ('Squirrelmail', $js); + $onload = 'onload="checkForm();"'; + displayHtmlHeader ('SquirrelMail', $js); break; default: @@ -172,16 +194,15 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { ' var newwin = window.open(comp_uri' . ', "_blank",'. '"width='.$compose_width. ',height='.$compose_height. - '",scrollbars="yes",resizable="yes");'."\n". + ',scrollbars=yes,resizable=yes");'."\n". "}\n\n"; } - $js .= $xtra; $js .= "// -->\n". "\n"; - $onload = "onLoad=\"checkForm();\""; - displayHtmlHeader ('Squirrelmail', $js); + $onload = 'onload="checkForm();"'; + displayHtmlHeader ('SquirrelMail', $js); break; } @@ -211,38 +232,41 @@ function displayPageHeader($color, $mailbox, $xtra='', $session=false) { . html_tag( 'td', '', 'left' ) ."\n"; $urlMailbox = urlencode($mailbox); if ($compose_new_win == '1') { - echo "". _("Compose"). ''; + echo ''. _("Compose").''; } else { displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right'); } echo "  \n"; - displayInternalLink ("src/addressbook.php", _("Addresses"), 'right'); + displayInternalLink ('src/addressbook.php', _("Addresses"), 'right'); echo "  \n"; - displayInternalLink ("src/folders.php", _("Folders"), 'right'); + displayInternalLink ('src/folders.php', _("Folders"), 'right'); echo "  \n"; - displayInternalLink ("src/options.php", _("Options"), 'right'); + displayInternalLink ('src/options.php', _("Options"), 'right'); echo "  \n"; displayInternalLink ("src/search.php?mailbox=$urlMailbox", _("Search"), 'right'); echo "  \n"; - displayInternalLink ("src/help.php", _("Help"), 'right'); + displayInternalLink ('src/help.php', _("Help"), 'right'); echo "  \n"; - do_hook("menuline"); + do_hook('menuline'); echo " \n" . html_tag( 'td', '', 'right' ) ."\n"; + if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/'; + if (!isset($provider_name)) $provider_name= 'SquirrelMail'; echo ($hide_sm_attributions ? ' ' : - 'SquirrelMail'); + ''.$provider_name.''); echo "\n". " \n". - "\n\n"; + "
\n\n"; } /* blatently copied/truncated/modified from the above function */ function compose_Header($color, $mailbox) { - global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win; + global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, + $data_dir, $username, $frame_top, $compose_new_win; $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 ); @@ -256,7 +280,7 @@ function compose_Header($color, $mailbox) { switch ( $module ) { case 'src/search.php': $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1; - $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\""; + $onload = "onload=\"document.forms[$pos].elements[2].focus();\""; displayHtmlHeader (_("Compose")); break; default: @@ -283,7 +307,7 @@ function compose_Header($color, $mailbox) { "}\n"; $js .= "// -->\n". "\n"; - $onload = "onLoad=\"checkForm();\""; + $onload = 'onload="checkForm();"'; displayHtmlHeader (_("Compose"), $js); break;