SquirrelMail

From: gustavf Date: Thu, 25 May 2000 07:42:19 +0000 (+0000) Subject: Moved printing of HTML-header into page_header.php. X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=2a833d7253739cb67eb69aa760f7b37fe7aedd8c Moved printing of HTML-header into page_header.php. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@507 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/page_header.php b/functions/page_header.php index 8f8b4f10..8ad38b9d 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -42,7 +42,21 @@ if ($default_charset != "") header ("Content-Type: text/html; charset=$default_charset"); + function displayHtmlHeader ($title="") { + echo ''; + echo "\n\n"; + echo "\n"; + echo "\n"; + echo "SquirrelMail"; + echo "\n\n"; + } + function displayPageHeader($color, $mailbox) { + displayHtmlHeader ($color); + + printf('', + $color[8], $color[4], $color[7], $color[7], $color[7]); + /** Here is the header and wrapping table **/ $shortBoxName = readShortMailboxName($mailbox, "."); $shortBoxName = stripslashes($shortBoxName); diff --git a/src/addrbook_search.php b/src/addrbook_search.php index f07840e2..ad41bfef 100644 --- a/src/addrbook_search.php +++ b/src/addrbook_search.php @@ -36,17 +36,8 @@ include("../src/load_prefs.php"); sqimap_logout ($imapConnection); -?> - - - - -<?php - printf("%s: %s", $org_title, _("Address Book")); -?> - + displayHtmlHeader(); -\n"; displayPageHeader($color, "None"); //

diff --git a/src/addressbook.php b/src/addressbook.php index 1caaee19..4ef5313d 100644 --- a/src/addressbook.php +++ b/src/addressbook.php @@ -98,13 +98,6 @@ exit(); } - print "\n"; - print "\n"; - printf("%s: %s\n", $org_title, _("Address Book")); - print "\n\n"; - - printf('', - $color[8], $color[4], $color[7], $color[7], $color[7]); displayPageHeader($color, "None"); diff --git a/src/compose.php b/src/compose.php index 3bbb5f1f..8a1a200b 100644 --- a/src/compose.php +++ b/src/compose.php @@ -321,7 +321,6 @@ sendMessage($send_to, $send_to_cc, $send_to_bcc, $subject, $body, $reply_id); header ("Location: right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=1"); } else { - echo "\n"; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); checkInput(true); @@ -329,7 +328,6 @@ showInputForm(); } } else if ($html_addr_search_done) { - echo "\n"; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); @@ -357,7 +355,6 @@ //* can think of a better way, please implement it. include ("addrbook_search_html.php"); } else if (isset($attach)) { - echo "\n"; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); @@ -385,7 +382,6 @@ showInputForm(); } else if (isset($do_delete)) { - echo "\n"; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); @@ -397,7 +393,6 @@ showInputForm(); } else { - echo "\n"; $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); displayPageHeader($color, $mailbox); diff --git a/src/delete_message.php b/src/delete_message.php index 9c013ff1..fdaefc5a 100644 --- a/src/delete_message.php +++ b/src/delete_message.php @@ -14,8 +14,6 @@ include("../src/load_prefs.php"); - echo "\n"; - $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); sqimap_mailbox_select($imapConnection, $mailbox); diff --git a/src/download.php b/src/download.php index 982c7e0f..f57369cf 100644 --- a/src/download.php +++ b/src/download.php @@ -17,7 +17,6 @@ include("../src/load_prefs.php"); function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) { - echo "\n"; displayPageHeader($color, "None"); echo "

"; diff --git a/src/empty_trash.php b/src/empty_trash.php index 4a18b8ba..ecc1ef18 100644 --- a/src/empty_trash.php +++ b/src/empty_trash.php @@ -47,7 +47,6 @@ walkTreeInPreOrderEmptyTrash(0, $imap_stream, $foldersTree); sqimap_mailbox_select($imap_stream, $trash_folder, $numMessages); - echo "\n"; displayPageHeader($color, $mailbox); messages_deleted_message($trash_folder, $sort, $startMessage, $color); sqimap_logout($imap_stream); diff --git a/src/folders.php b/src/folders.php index 1a86bd75..cf385562 100644 --- a/src/folders.php +++ b/src/folders.php @@ -14,8 +14,6 @@ include("../src/load_prefs.php"); - echo "\n"; - displayPageHeader($color, "None"); echo "\n"; diff --git a/src/folders_create.php b/src/folders_create.php index 8731191e..7b321d94 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -46,7 +46,6 @@ // if ($auto_forward == true) { // header ("Location: webmail.php?right_frame=folders.php"); // } else { - echo "\n"; displayPageHeader($color, "None"); echo "

"; echo _("Folder Created!"); diff --git a/src/folders_delete.php b/src/folders_delete.php index 98bae7a5..0a3eef3e 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -21,8 +21,6 @@ include("../src/load_prefs.php"); - echo ""; - echo "\n"; displayPageHeader($color, "None"); diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php index 31e75657..52359c6c 100644 --- a/src/folders_rename_do.php +++ b/src/folders_rename_do.php @@ -44,7 +44,6 @@ /** Log out this session **/ sqimap_logout($imapConnection); - echo "\n"; displayPageHeader($color, "None"); echo "

"; echo _("Folder Renamed!"); diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php index 1c46a2de..d574edae 100644 --- a/src/folders_rename_getname.php +++ b/src/folders_rename_getname.php @@ -30,7 +30,6 @@ $old_name = stripslashes($old_name); - echo "\n"; displayPageHeader($color, "None"); echo "

"; echo "

"; diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php index 37994473..a4141fda 100644 --- a/src/folders_subscribe.php +++ b/src/folders_subscribe.php @@ -24,7 +24,6 @@ sqimap_unsubscribe ($imapConnection, $mailbox); } - echo "\n"; displayPageHeader($color, "None"); echo "

"; if ($method == "sub") { diff --git a/src/left_main.php b/src/left_main.php index c8bc624a..c2f01fca 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -28,7 +28,7 @@ include("../functions/i18n.php"); - echo ""; + displayHtmlHeader(); function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) { global $folder_prefix, $trash_folder, $sent_folder; diff --git a/src/move_messages.php b/src/move_messages.php index a4c85d96..b208e39e 100644 --- a/src/move_messages.php +++ b/src/move_messages.php @@ -14,8 +14,6 @@ include("../src/load_prefs.php"); -// echo "\n"; - function putSelectedMessagesIntoString($msg) { $j = 0; $i = 0; @@ -64,12 +62,10 @@ if ($auto_forward) { header ("Location: right_main.php"); } else { - echo "\n"; displayPageHeader($color, $mailbox); messages_deleted_message($mailbox, $sort, $startMessage, $color); } } else { - echo "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); } @@ -96,12 +92,10 @@ if ($auto_forward) { header ("Location: right_main.php"); } else { - echo "\n"; displayPageHeader($color, $mailbox); messages_moved_message($mailbox, $sort, $startMessage, $color); } } else { - echo "\n"; displayPageHeader($color, $mailbox); error_message(_("No messages were selected."), $mailbox, $sort, $startMessage, $color); } diff --git a/src/options.php b/src/options.php index 6e45190c..58ff03e3 100644 --- a/src/options.php +++ b/src/options.php @@ -23,7 +23,6 @@ $boxes = sqimap_mailbox_list($imapConnection, $boxes); fputs($imapConnection, "1 logout\n"); - echo "\n"; displayPageHeader($color, "None"); /** load up some of the values from the pref file **/ diff --git a/src/options_submit.php b/src/options_submit.php index 506b95f2..643120ff 100644 --- a/src/options_submit.php +++ b/src/options_submit.php @@ -52,8 +52,6 @@ setcookie("squirrelmail_language", $language, time()+2592000); $squirrelmail_language = $language; - echo ""; - echo "\n"; displayPageHeader($color, "None"); echo "

"; echo _("Options Saved!"); diff --git a/src/read_body.php b/src/read_body.php index 7ef15604..08a7d1fa 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -72,8 +72,6 @@ // including header and body $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); - echo ""; - echo "\n"; displayPageHeader($color, $mailbox); /** translate the subject and mailbox into url-able text **/ diff --git a/src/right_main.php b/src/right_main.php index d4e613b5..be8f683e 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -38,8 +38,6 @@ if (!isset($display_messages_php)) include("../functions/display_messages.php"); ?> - - \n"; // If the page has been loaded without a specific mailbox, // just show a page of general info.