X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fpage_header.php;h=7ea711d077d104ddff771755a0e8eeb39ea8e5f2;hb=b44ee3f0f2ffca2217c29803f3c411e562ad937a;hp=b5e8bfe4f5b388cfa02c49da2fcdbdcd20a70b7c;hpb=8deeee935f5d6b0b350afabf69a70ab342d266f1;p=squirrelmail.git
diff --git a/functions/page_header.php b/functions/page_header.php
index b5e8bfe4..7ea711d0 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -3,7 +3,7 @@
/**
* page_header.php
*
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Prints the page header (duh)
@@ -11,95 +11,283 @@
* $Id$
*/
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!! ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION. ***/
-/*** + Base level indent should begin at left margin, as ***/
-/*** the first line of the function definition below. ***/
-/*** + All identation should consist of four space blocks ***/
-/*** + Tab characters are evil. ***/
-/*** + all comments should use "slash-star ... star-slash" ***/
-/*** style -- no pound characters, no slash-slash style ***/
-/*** + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD ***/
-/*** ALWAYS USE { AND } CHARACTERS!!! ***/
-/*** + Please use ' instead of ", when possible. Note " ***/
-/*** should always be used in _( ) function calls. ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
-// Always set up the language before calling these functions
-function displayHtmlHeader
- ($title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
-
- global $theme_css;
-
- echo '' .
- "\n\n\n
\n";
+require_once('../functions/strings.php');
+//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;
+
+ echo '' .
+ "\n\n\n\n";
+
+ if ( !isset( $custom_css ) || $custom_css == 'none' ) {
if ($theme_css != '') {
- echo "\n";
+ echo "";
}
+ } else {
+ echo '';
+ }
+
+ if ($do_hook) {
+ do_hook("generic_header");
+ }
+
+ echo "\n$title$xtra\n\n";
+}
- if( $do_hook ) {
- do_hook ("generic_header");
- }
- echo "$title$xtra\n\n";
-
- }
-
- function displayInternalLink ($path, $text, $target='') {
- global $base_uri;
-
- if ($target != '')
- $target = " target=\"$target\"";
-
- echo ''.$text.'';
- }
-
- function displayPageHeader($color, $mailbox) {
- global $delimiter, $hide_sm_attributions;
- displayHtmlHeader ();
-
- echo "\n\n";
-
- /** Here is the header and wrapping table **/
- $shortBoxName = readShortMailboxName($mailbox, $delimiter);
- echo "\n"
- . "