X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=dd04c2d17586506bc222b06353f703b0d3f58ee3;hb=c0d04f9753371080831e9e79f41d7b4756df83ab;hp=fe30f23c3b06d1e7ae50acbc8b78815ac1c90a0b;hpb=869ece5d542664e592ec632eb2612a92dca90c9a;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index fe30f23c..dd04c2d1 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,13 +11,24 @@
* $Id$
*/
-require_once('../functions/strings.php');
-require_once('../functions/imap_utf7_decode_local.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 ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+ global $_SESSION;
+ }
+ if (isset($_SESSION['base_uri'])) {
+ $base_uri = $_SESSION['base_uri'];
+ }
+ else {
+ global $base_uri;
+ }
+ global $theme_css, $custom_css;
echo '' .
"\n\n\n
\n";
@@ -31,24 +42,38 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
$base_uri . 'themes/css/'.$custom_css.'">';
}
+ if ($do_hook) {
+ do_hook("generic_header");
+ }
+
echo "\n$title$xtra\n\n";
}
+
function displayInternalLink($path, $text, $target='') {
- global $base_uri;
+ if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+ global $_SESSION;
+ }
+ $base_uri = $_SESSION['base_uri'];
if ($target != '') {
$target = " target=\"$target\"";
}
-
echo ''.$text.'';
}
-function displayPageHeader($color, $mailbox, $xtra='') {
+function displayPageHeader($color, $mailbox, $xtra='', $session=false) {
+
+ global $hide_sm_attributions, $PHP_SELF, $frame_top,
+ $compose_new_win, $username, $datadir, $compose_width, $compose_height,
+ $attachemessages, $session;
- global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top,
- $compose_new_win, $username, $datadir, $compose_width, $compose_height;
+ if ( (float)substr(PHP_VERSION,0,3) < 4.1 ) {
+ global $_SESSION;
+ }
+ $base_uri = $_SESSION['base_uri'];
+ $delimiter = $_SESSION['delimiter'];
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
if ($qmark = strpos($module, '?')) {
$module = substr($module, 0, $qmark);
@@ -57,11 +82,16 @@ function displayPageHeader($color, $mailbox, $xtra='') {
$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/read_body.php':
+ $js ='';
if ($compose_new_win == '1') {
if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
$compose_width = '640';
@@ -69,21 +99,60 @@ function displayPageHeader($color, $mailbox, $xtra='') {
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);
- }
- displayHtmlHeader();
- $onload = '';
- break;
+ break;
+
default:
$js = '\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 = 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"
- . ' ';
+ 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');
@@ -174,12 +248,13 @@ function displayPageHeader($color, $mailbox, $xtra='') {
do_hook("menuline");
- echo " \n ";
+ echo " | \n"
+ . html_tag( 'td', '', 'right' ) ."\n";
echo ($hide_sm_attributions ? ' ' :
- 'SquirrelMail');
- echo "\n".
- " \n".
- "
\n\n";
+ 'SquirrelMail');
+ echo "\n".
+ " \n".
+ "
\n\n";
}
/* blatently copied/truncated/modified from the above function */
@@ -232,6 +307,6 @@ function compose_Header($color, $mailbox) {
}
- echo "\n\n";
+ echo "\n\n";
}
?>