X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=1a236400b7b7dbde0f9a6f697254c4ba9dcd1493;hb=03dc576b115b1d93bebea357c7f7b282fd5046f4;hp=5ce415148927dc0f8630d1dc0dc4f353a24438b1;hpb=113e5e9d3fff9929a5b3feaae6217769d8d908d6;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 5ce41514..1a236400 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -12,8 +12,10 @@
*/
require_once('../functions/strings.php');
-
-// Always set up the language before calling these functions
+require_once('../functions/imap_utf7_decode_local.php');
+require_once('../functions/html.php');
+//require_once('../functions/imap_mailbox.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;
@@ -23,51 +25,117 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
- echo "\n";
+ echo "";
}
} else {
echo '\n";
+ $base_uri . 'themes/css/'.$custom_css.'">';
}
- if( $do_hook ) {
- do_hook ("generic_header");
+ if ($do_hook) {
+ do_hook("generic_header");
}
- echo "
$title$xtra\n\n";
+ echo "\n$title$xtra\n\n";
}
+
function displayInternalLink($path, $text, $target='') {
global $base_uri;
if ($target != '') {
$target = " target=\"$target\"";
}
-
echo ''.$text.'';
}
-function displayPageHeader($color, $mailbox) {
+function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
- global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win, $username, $datadir;
-
- displayHtmlHeader ();
+ global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top,
+ $compose_new_win, $username, $datadir, $compose_width, $compose_height,
+ $attachemessages, $session;
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+ if ($qmark = strpos($module, '?')) {
+ $module = substr($module, 0, $qmark);
+ }
if (!isset($frame_top)) {
$frame_top = '_top';
}
- /*
- Locate the first displayable form element
- */
+ if ($session != false) {
+ $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;
+ }
+
switch ( $module ) {
- case 'src/search.php':
- $pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
- $onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+ case 'src/read_body.php':
+ $js ='';
+ if ($compose_new_win == '1') {
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+ $compose_width = '640';
+ }
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+ $compose_height = '550';
+ }
+ $js .= "\n".'\n";
+
+ }
+ displayHtmlHeader ('Squirrelmail', $js);
+ $onload = $xtra;
break;
+ case 'src/compose.php':
+ $js = '\n";
+ $onload = "onLoad=\"checkForm();\"";
+ displayHtmlHeader ('Squirrelmail', $js);
+ break;
+
default:
- echo '\n";
+ $js .= "// -->\n". "\n";
+
+
$onload = "onLoad=\"checkForm();\"";
+ displayHtmlHeader ('Squirrelmail', $js);
break;
}
- echo "\n\n";
+ echo "\n\n";
/** Here is the header and wrapping table **/
- $shortBoxName = readShortMailboxName($mailbox, $delimiter);
+ $shortBoxName = imap_utf7_decode_local(
+ readShortMailboxName($mailbox, $delimiter));
if ( $shortBoxName == 'INBOX' ) {
$shortBoxName = _("INBOX");
}
- echo "\n"
- . "\n"
- . " \n"
- . " \n";
+ echo "\n"
+ . html_tag( 'table', '', '', $color[4], 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) ."\n"
+ . html_tag( 'tr', '', '', $color[9] ) ."\n"
+ . html_tag( 'td', '', 'left' ) ."\n";
if ( $shortBoxName <> '' && strtolower( $shortBoxName ) <> 'none' ) {
- echo ' ' . _("Current Folder") . ": $shortBoxName \n";
+ echo ' ' . _("Current Folder") . ": $shortBoxName \n";
} else {
echo ' ';
}
- echo " | \n"
- . " \n";
+ echo " | \n"
+ . html_tag( 'td', '', 'right' ) ."\n";
displayInternalLink ('src/signout.php', _("Sign Out"), $frame_top);
- echo " \n"
- . "
\n"
- . " \n"
- . " \n";
+ echo " | \n"
+ . "
\n"
+ . html_tag( 'tr', '', '', $color[4] ) ."\n"
+ . 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');
@@ -154,12 +229,13 @@ function displayPageHeader($color, $mailbox) {
do_hook("menuline");
- echo " \n";
+ echo " | \n"
+ . html_tag( 'td', '', 'right' ) ."\n";
echo ($hide_sm_attributions ? ' ' :
- "SquirrelMail\n");
- echo " \n".
- " \n".
- "
\n\n";
+ 'SquirrelMail');
+ echo "\n".
+ " \n".
+ "\n\n";
}
/* blatently copied/truncated/modified from the above function */
@@ -167,7 +243,6 @@ function compose_Header($color, $mailbox) {
global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win;
- displayHtmlHeader (_("Compose"));
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
if (!isset($frame_top)) {
@@ -181,9 +256,10 @@ function compose_Header($color, $mailbox) {
case 'src/search.php':
$pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
$onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+ displayHtmlHeader (_("Compose"));
break;
default:
- echo '\n";
$onload = "onLoad=\"checkForm();\"";
+ displayHtmlHeader (_("Compose"), $js);
break;
}
- echo "\n\n";
+ echo "\n\n";
}
?>