X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=1673fac147b0d37a9949eb915e0eaf4e94d6cc39;hb=51e2fd041cf1446f9fbfa0e1fc82ee3b5c2f61f3;hp=5ce415148927dc0f8630d1dc0dc4f353a24438b1;hpb=113e5e9d3fff9929a5b3feaae6217769d8d908d6;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index 5ce41514..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,12 +43,10 @@ function displayInternalLink($path, $text, $target='') {
echo ''.$text.'';
}
-function displayPageHeader($color, $mailbox) {
+function displayPageHeader($color, $mailbox, $xtra='') {
global $delimiter, $hide_sm_attributions, $base_uri, $PHP_SELF, $frame_top, $compose_new_win, $username, $datadir;
- displayHtmlHeader ();
-
$module = substr( $PHP_SELF, ( strlen( $PHP_SELF ) - strlen( $base_uri ) ) * -1 );
if (!isset($frame_top)) {
$frame_top = '_top';
@@ -65,9 +59,10 @@ 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 '\n";
$onload = "onLoad=\"checkForm();\"";
+ displayHtmlHeader ('Squirrelmail', $js);
break;
}
+
echo "\n\n";
/** Here is the header and wrapping table **/
$shortBoxName = readShortMailboxName($mailbox, $delimiter);
@@ -167,7 +165,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 +178,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;
}