projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: b515a4a)
Moved printing of HTML-header into page_header.php.
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 May 2000 07:42:19 +0000 (07:42 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 25 May 2000 07:42:19 +0000 (07:42 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@507 7612ce4b-ef26-0410-bec9-ea0150e637f0

20 files changed:
functions/page_header.php patch | blob | blame | history
src/addrbook_search.php patch | blob | blame | history
src/addrbook_search_html.php patch | blob | blame | history
src/addressbook.php patch | blob | blame | history
src/compose.php patch | blob | blame | history
src/delete_message.php patch | blob | blame | history
src/download.php patch | blob | blame | history
src/empty_trash.php patch | blob | blame | history
src/folders.php patch | blob | blame | history
src/folders_create.php patch | blob | blame | history
src/folders_delete.php patch | blob | blame | history
src/folders_rename_do.php patch | blob | blame | history
src/folders_rename_getname.php patch | blob | blame | history
src/folders_subscribe.php patch | blob | blame | history
src/left_main.php patch | blob | blame | history
src/move_messages.php patch | blob | blame | history
src/options.php patch | blob | blame | history
src/options_submit.php patch | blob | blame | history
src/read_body.php patch | blob | blame | history
src/right_main.php patch | blob | blame | history

diff --git a/functions/page_header.php b/functions/page_header.php
index 8f8b4f1037c2caba7c5840b1364928396c6c4e9a..8ad38b9d5c4ba7470636102b60e2f685d9c35f59 100644 (file)
--- 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 '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
+      echo "\n\n";
+      echo "<HTML>\n";
+      echo "<HEAD>\n";
+      echo "<TITLE>SquirrelMail</TITLE>";
+      echo "</HEAD>\n\n";
+   }
+
    function displayPageHeader($color, $mailbox) {
+      displayHtmlHeader ($color);
+
+      printf('<BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
+             $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 f07840e26aede3d950822db1dbf7e45a98ddf728..ad41bfefa0b50e08634bd5cfd8aabd299b67c530 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -36,17 +36,8 @@
    include("../src/load_prefs.php");
    sqimap_logout ($imapConnection);
 
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<HTML>
-<HEAD>
-<TITLE><?php 
-   printf("%s: %s", $org_title, _("Address Book")); 
-?></TITLE>
-</HEAD>
+   displayHtmlHeader();
 
-<?php
    // Choose correct colors for top and bottom frame
    if($show == "form") {
       echo "<BODY BGCOLOR=\"$color[3]\" TEXT=\"$color[6]\" ";
diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 0ead476eb8fa4dfa210814c203f2e5940cf02433..f4654b52763e2be7319f73f55a7ec4f802d40188 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -30,7 +30,6 @@
    include("../src/load_prefs.php");
 
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    //<form method=post action="compose.php?html_addr_search=true">
 
diff --git a/src/addressbook.php b/src/addressbook.php
index 1caaee19ce1489bed173b9a2bdce2449903d5f39..4ef5313dfb2fef2aa08aec233cad67c95829bfd9 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -98,13 +98,6 @@
       exit();
    }
 
-   print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n";
-   print "<HTML><HEAD><TITLE>\n";
-   printf("%s: %s\n", $org_title, _("Address Book")); 
-   print "</TITLE></HEAD>\n\n";
-
-   printf('<BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
-         $color[8], $color[4], $color[7], $color[7], $color[7]);
    displayPageHeader($color, "None");
 
 
diff --git a/src/compose.php b/src/compose.php
index 3bbb5f1fb818905692ec8b14f5eb8d97c90951a0..8a1a200b6524162e2cc4a59c3fd44f00af58882f 100644 (file)
--- 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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
       displayPageHeader($color, $mailbox);
 
@@ -385,7 +382,6 @@
       
       showInputForm();
    } else if (isset($do_delete)) {
-      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
       displayPageHeader($color, $mailbox);
 
@@ -397,7 +393,6 @@
 
       showInputForm();
    } else {
-      echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 9c013ff141b8d7716d2fad02c909f9eef72d9f96..fdaefc5a93fc23739c3cb4213406b25b5b759991 100644 (file)
--- a/src/delete_message.php
+++ b/src/delete_message.php
@@ -14,8 +14,6 @@
 
    include("../src/load_prefs.php");
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 982c7e0f69d5d08579a334c42adc7f8d8b699a25..f57369cf119e8721bc784232396ea10d789a9484 100644 (file)
--- 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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       displayPageHeader($color, "None");
 
       echo "<BR><TABLE WIDTH=90% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
diff --git a/src/empty_trash.php b/src/empty_trash.php
index 4a18b8bac87aed0612221ce005db2f7fa7ecba5c..ecc1ef18a2e08cb7ea116a3054312b02e098fc2e 100644 (file)
--- 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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 1a86bd7513c8a1b50eed2fdb37cac882d07cf0f7..cf385562d4305c36ed6747c64af758b1322cb556 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -14,8 +14,6 @@
 
    include("../src/load_prefs.php");
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-
    displayPageHeader($color, "None");
 
    echo "<TABLE WIDTH=100% COLS=1 ALIGN=CENTER>\n";
diff --git a/src/folders_create.php b/src/folders_create.php
index 8731191e76e96d221b30fead8b93c2c462802e73..7b321d9400a6450994fe778b47f2f6e3396a1136 100644 (file)
--- 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 "<html><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
       displayPageHeader($color, "None");
       echo "<BR><BR><BR><CENTER><B>";
       echo _("Folder Created!");
diff --git a/src/folders_delete.php b/src/folders_delete.php
index 98bae7a53fd4840a0e74da0d1447520e7ebad983..0a3eef3eed9a247291822b67520668beb3883a5f 100644 (file)
--- a/src/folders_delete.php
+++ b/src/folders_delete.php
@@ -21,8 +21,6 @@
 
    include("../src/load_prefs.php");
 
-   echo "<HTML>";
-   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");  
 
    
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 31e756577b7f48dd2793253b0145b2bbd44b53a3..52359c6cc7260c80730789370ec4d707b8fc5e7e 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -44,7 +44,6 @@
    /** Log out this session **/
    sqimap_logout($imapConnection);
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    echo "<BR><BR><BR><CENTER><B>";
    echo _("Folder Renamed!");
diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 1c46a2dec4ac60110ac94af051dc7d88f21c71fc..d574edae90f0bfd3e427ed9b837c5f4a77049276 100644 (file)
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -30,7 +30,6 @@
 
    $old_name = stripslashes($old_name);
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    echo "<TABLE WIDTH=100% COLS=1>";
    echo "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><B>";
diff --git a/src/folders_subscribe.php b/src/folders_subscribe.php
index 37994473be7591697fdd3adf662d03caf996cafa..a4141fda198180ac8dd00b60113163091946b282 100644 (file)
--- a/src/folders_subscribe.php
+++ b/src/folders_subscribe.php
@@ -24,7 +24,6 @@
       sqimap_unsubscribe ($imapConnection, $mailbox);
    }
 
-   echo "<html><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    echo "<BR><BR><BR><CENTER><B>";
    if ($method == "sub") {
diff --git a/src/left_main.php b/src/left_main.php
index c8bc624aa7411bed2e8ed2e7e22318c46236c61b..c2f01fca912764141ca821b4c400ca18894097c9 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -28,7 +28,7 @@
       include("../functions/i18n.php");
 
 
-   echo "<HTML>";
+   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 a4c85d96126fe9f15bf468833d7ada6b29eda26a..b208e39e7312c8ca53f76b5392bd4745f0c0bb30 100644 (file)
--- a/src/move_messages.php
+++ b/src/move_messages.php
@@ -14,8 +14,6 @@
 
    include("../src/load_prefs.php");
 
-//   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-
    function putSelectedMessagesIntoString($msg) {
       $j = 0;
       $i = 0;
@@ -64,12 +62,10 @@
          if ($auto_forward) {   
             header ("Location: right_main.php");
          } else {
-            echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
             displayPageHeader($color, $mailbox);
             messages_deleted_message($mailbox, $sort, $startMessage, $color);
          }
       } else {
-         echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
             displayPageHeader($color, $mailbox);
             messages_moved_message($mailbox, $sort, $startMessage, $color);
          }
       } else {
-         echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 6e45190c84c0645387c47f3b294f7bc9f19c06f1..58ff03e3be500332a35dbbf956232594b3d74ad3 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -23,7 +23,6 @@
    $boxes = sqimap_mailbox_list($imapConnection, $boxes);
    fputs($imapConnection, "1 logout\n");
 
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 506b95f2737145ae99a1fd0a507e6aff1dba35bf..643120ff9120bf9c06a089fdece12216295270c4 100644 (file)
--- a/src/options_submit.php
+++ b/src/options_submit.php
@@ -52,8 +52,6 @@
    setcookie("squirrelmail_language", $language, time()+2592000);
    $squirrelmail_language = $language;
 
-   echo "<HTML>";
-   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    displayPageHeader($color, "None");
    echo "<BR><BR><BR><CENTER><B>";
    echo _("Options Saved!");
diff --git a/src/read_body.php b/src/read_body.php
index 7ef156042419906e12f9b847789c9c86c80375ce..08a7d1fa9fbc011efeca288cb5e6cc880a7f1c85 100644 (file)
--- 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 "<HTML>";
-   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\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 d4e613b553310f0cdfca1e64dc21113e1a9101f2..be8f683e997d5f0a4378e1068919002390e7e232 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -38,8 +38,6 @@
    if (!isset($display_messages_php))
       include("../functions/display_messages.php");
 ?>
-<HTML>
-<FONT FACE="Arial,Helvetica">
 <?php
    /////////////////////////////////////////////////////////////////////////////////
    //
@@ -61,7 +59,6 @@
 
    /** If it was a successful login, lets load their preferences **/
    include("../src/load_prefs.php");
-   echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
    // If the page has been loaded without a specific mailbox,
    //    just show a page of general info.
Unnamed repository; edit this file 'description' to name the repository.