We use cookies to ensure you get the best experience on our website
Home Esplora Aiuto
Registrati Accedi
0ct0pu5
/
squirrelmail
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Moved printing of HTML-header into page_header.php.

gustavf 25 anni fa
parent
2f055900af
commit
9963aaf5ab
20 ha cambiato i file con 16 aggiunte e 50 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 14 0
      functions/page_header.php
  2. 1 10
      src/addrbook_search.php
  3. 0 1
      src/addrbook_search_html.php
  4. 0 7
      src/addressbook.php
  5. 0 5
      src/compose.php
  6. 0 2
      src/delete_message.php
  7. 0 1
      src/download.php
  8. 0 1
      src/empty_trash.php
  9. 0 2
      src/folders.php
  10. 0 1
      src/folders_create.php
  11. 0 2
      src/folders_delete.php
  12. 0 1
      src/folders_rename_do.php
  13. 0 1
      src/folders_rename_getname.php
  14. 0 1
      src/folders_subscribe.php
  15. 1 1
      src/left_main.php
  16. 0 6
      src/move_messages.php
  17. 0 1
      src/options.php
  18. 0 2
      src/options_submit.php
  19. 0 2
      src/read_body.php
  20. 0 3
      src/right_main.php

+ 14 - 0
functions/page_header.php
Vedi File 

@@ -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);

+ 1 - 10
src/addrbook_search.php
Vedi File 

@@ -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]\" ";

+ 0 - 1
src/addrbook_search_html.php
Vedi File 

@@ -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">

+ 0 - 7
src/addressbook.php
Vedi File 

@@ -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");

+ 0 - 5
src/compose.php
Vedi File 

@@ -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);

+ 0 - 2
src/delete_message.php
Vedi File 

@@ -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);

+ 0 - 1
src/download.php
Vedi File 

@@ -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]\">";

+ 0 - 1
src/empty_trash.php
Vedi File 

@@ -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);

+ 0 - 2
src/folders.php
Vedi File 

@@ -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";

+ 0 - 1
src/folders_create.php
Vedi File 

@@ -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!");

+ 0 - 2
src/folders_delete.php
Vedi File 

@@ -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");

+ 0 - 1
src/folders_rename_do.php
Vedi File 

@@ -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!");

+ 0 - 1
src/folders_rename_getname.php
Vedi File 

@@ -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>";

+ 0 - 1
src/folders_subscribe.php
Vedi File 

@@ -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") {

+ 1 - 1
src/left_main.php
Vedi File 

@@ -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;

+ 0 - 6
src/move_messages.php
Vedi File 

@@ -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);
 
       }

+ 0 - 1
src/options.php
Vedi File 

@@ -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 **/

+ 0 - 2
src/options_submit.php
Vedi File 

@@ -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!");

+ 0 - 2
src/read_body.php
Vedi File 

@@ -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 **/

+ 0 - 3
src/right_main.php
Vedi File 

@@ -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.

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5