projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1fd9778)
Moved some output, so that page_header.php can send headers.
authorgustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 28 Feb 2000 14:47:23 +0000 (14:47 +0000)
committergustavf <gustavf@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Mon, 28 Feb 2000 14:47:23 +0000 (14:47 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@248 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/i18n.php patch | blob | blame | history
functions/page_header.php patch | blob | blame | history
src/right_main.php patch | blob | blame | history

diff --git a/functions/i18n.php b/functions/i18n.php
index 779513f131b29303323cdbc70ee7ffdd9b6c0fe3..0a08886b512357f4b2dd5ef327e7e68c557655c1 100644 (file)
--- a/functions/i18n.php
+++ b/functions/i18n.php
@@ -17,7 +17,7 @@
       // All HTML special characters are 7 bit and can be replaced first
       $string = htmlspecialchars ($string);
 
-      $charset = strolower($charset);
+      $charset = strtolower($charset);
 
       if (ereg("iso-8859-(.*)", $charset, $res)) {
          if ($res[1] == "1")
diff --git a/functions/page_header.php b/functions/page_header.php
index 324206b5855e1fd9f91a844a73bb1d59c4f3c553..cd4ba6ae9279f863690ffa9e002c149b415154c2 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -6,6 +6,10 @@
     **
     **/
 
+   // This is done to ensure that the character set is correct when
+   // receiving input from HTTP forms
+   header ("Content-Type: text/html; charset=iso-8859-1");
+
    function displayPageHeader($color, $mailbox) {
       /** Here is the header and wrapping table **/
       $shortBoxName = readShortMailboxName($mailbox, ".");
diff --git a/src/right_main.php b/src/right_main.php
index ddd01e4d2c87672f0a575b5fbe9d5d3e93759449..b87ea8d40335de4902b7ef517952808739d7a064 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -19,10 +19,7 @@
       echo _("You need a valid user and password to access this page!");
       exit;
    }
-?>
-<HTML>
-<FONT FACE="Arial,Helvetica">
-<?
+
    include("../config/config.php");
    include("../functions/imap.php");
    include("../functions/strings.php");
@@ -32,7 +29,10 @@
    include("../functions/mime.php");
    include("../functions/mailbox_display.php");
    include("../functions/display_messages.php");
-
+?>
+<HTML>
+<FONT FACE="Arial,Helvetica">
+<?
    /////////////////////////////////////////////////////////////////////////////////
    //
    // incoming variables from URL:
Unnamed repository; edit this file 'description' to name the repository.