X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=1673fac147b0d37a9949eb915e0eaf4e94d6cc39;hb=4cb1746c0df09e049ec1a79dcf76b181eb82595c;hp=51b3c09d735856346476063b694ffb58b66f67d4;hpb=d03f35823cb991b22439f56fd7329fdac246b96b;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 51b3c09d..1673fac1 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -30,10 +30,6 @@ function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE
$base_uri . "themes/css/$custom_css\">\n";
}
- if( $do_hook ) {
- do_hook ("generic_header");
- }
-
echo "
$title$xtra\n\n";
}
@@ -47,11 +43,9 @@ function displayInternalLink($path, $text, $target='') {
echo ''.$text.'';
}
-function displayPageHeader($color, $mailbox) {
-
- global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top;
+function displayPageHeader($color, $mailbox, $xtra='') {
- displayHtmlHeader ();
+ global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win, $username, $datadir;
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
if (!isset($frame_top)) {
@@ -65,44 +59,61 @@ function displayPageHeader($color, $mailbox) {
case 'src/search.php':
$pos = getPref($data_dir, $username, 'search_pos', 0 ) - 1;
$onload = "onLoad=\"document.forms[$pos].elements[2].focus();\"";
+ displayHtmlHeader ();
break;
default:
- echo '
-
- ';
+ $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);
+ if ( $shortBoxName == 'INBOX' ) {
+ $shortBoxName = _("INBOX");
+ }
echo "\n"
. "\n"
. " \n"
@@ -120,7 +131,13 @@ function checkForm() {
. "
\n"
. " \n";
$urlMailbox = urlencode($mailbox);
- displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), 'right');
+ 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";
@@ -143,4 +160,56 @@ function checkForm() {
" |
\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;
+
+
+ $module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
+ if (!isset($frame_top)) {
+ $frame_top = '_top';
+ }
+
+ /*
+ Locate the first displayable form element
+ */
+ switch ( $module ) {
+ 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:
+ $js = '\n";
+ $onload = "onLoad=\"checkForm();\"";
+ displayHtmlHeader (_("Compose"), $js);
+ break;
+
+ }
+
+ echo "\n\n";
+}
?>