From 7a3bd55d4339c3b4177f3b3cd0fe8b46c204e132 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 10 Apr 2000 15:32:03 +0000
Subject: [PATCH] removed these, changing permissiosn

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@397 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_general.php  | 249 -----------------------------
 functions/imap_mailbox.php  | 263 ------------------------------
 functions/imap_messages.php | 307 ------------------------------------
 functions/page_header.php   |   5 +-
 4 files changed, 3 insertions(+), 821 deletions(-)
 delete mode 100755 functions/imap_general.php
 delete mode 100755 functions/imap_mailbox.php
 delete mode 100755 functions/imap_messages.php

diff --git a/functions/imap_general.php b/functions/imap_general.php
deleted file mode 100755
index 9d963825..00000000
--- a/functions/imap_general.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?
-   /**
-    **  imap.php
-    **
-    **  This implements all functions that do general imap functions.
-    **/
-
-   /******************************************************************************
-    **  Reads the output from the IMAP stream.  If handle_errors is set to true,
-    **  this will also handle all errors that are received.  If it is not set,
-    **  the errors will be sent back through $response and $message
-    ******************************************************************************/
-   function sqimap_read_data ($imap_stream, $pre, $handle_errors, $response, $message) {
-      global $color;
-
-      $read = fgets ($imap_stream, 1024);
-      $counter = 0;
-      while ((substr($read, 0, strlen("$pre OK")) != "$pre OK") &&
-             (substr($read, 0, strlen("$pre BAD")) != "$pre BAD") &&
-             (substr($read, 0, strlen("$pre NO")) != "$pre NO")) {
-         $data[$counter] = $read;
-         $read = fgets ($imap_stream, 1024);
-         $counter++;
-      }       
-      if (substr($read, 0, strlen("$pre OK")) == "$pre OK") {
-         $response = "OK";
-         $message = trim(substr($read, strlen("$pre OK"), strlen($read)));
-      }
-      else if (substr($read, 0, strlen("$pre BAD")) == "$pre BAD") {
-         $response = "BAD";
-         $message = trim(substr($read, strlen("$pre BAD"), strlen($read)));
-      }
-      else {   
-         $response = "NO";
-         $message = trim(substr($read, strlen("$pre NO"), strlen($read)));
-      }
-
-      if ($handle_errors == true) {
-         if ($response == "NO") {
-            echo "<br><b><font color=$color[2]>";
-            echo _("ERROR : Could not complete request.");
-            echo "</b><br>";
-            echo _("Reason Given: ");
-            echo "$message</font><br>";
-            exit;
-         } else if ($response == "BAD") {
-            echo "<br><b><font color=$color[2]>";
-            echo _("ERROR : Bad or malformed request.");
-            echo "</b><br>";
-            echo _("Server responded: ");
-            echo "$message</font><br>";
-            exit;
-         }
-      }
-      
-      return $data;
-   }
-   
-
-
-   
-   /******************************************************************************
-    **  Logs the user into the imap server.  If $hide is set, no error messages
-    **  will be displayed.  This function returns the imap connection handle.
-    ******************************************************************************/
-   function sqimap_login ($username, $password, $imap_server_address, $imap_port, $hide) {
-      global $color;
-      global $PHPSESSID;
-      $imap_stream = fsockopen ($imap_server_address, $imap_port, &$error_number, &$error_string);
-      $server_info = fgets ($imap_stream, 1024);
-      
-      /** Do some error correction **/
-      if (!$imap_stream) {
-         if (!$hide) {
-            echo "Error connecting to IMAP server: $imap_server_address.<br>\r\n";
-            echo "$error_number : $error_string<br>\r\n";
-         }
-         exit;
-      }
-
-      fputs ($imap_stream, "a001 LOGIN \"$username\" \"$password\"\r\n");
-      $read = fgets ($imap_stream, 1024);
-
-      /** If the connection was not successful, lets see why **/
-      if (substr($read, 0, 7) != "a001 OK") {
-         if (!$hide) {
-            if (substr($read, 0, 8) == "a001 BAD") {
-               echo "Bad request: $read<br>\r\n";
-               exit;
-            } else if (substr($read, 0, 7) == "a001 NO") {
-               ?>
-                  <html>
-                     <body bgcolor=ffffff>
-                        <br>
-                        <center>
-                        <table width=70% noborder bgcolor=ffffff align=center>
-                           <tr>
-                              <td bgcolor=dcdcdc>
-                                 <font color=cc0000>
-                                 <center>
-                                 <? echo _("ERROR") ?>
-                                 </center>
-                                 </font>
-                              </td>
-                           </tr>
-                           <tr>
-                              <td>
-                                 <center>
-                                 <? echo _("Unknown user or password incorrect.") ?><br>
-                                 <a href="login.php"><? echo _("Click here to try again") ?></a>
-                                 </center>
-                              </td>
-                           </tr>
-                        </table>
-                        </center>
-                     </body>
-                  </html>
-               <?
-               session_destroy();
-               exit;
-            } else {
-               echo "Unknown error: $read<br>";
-               exit;
-            }
-         } else {
-            exit;
-         }
-      }
-
-      return $imap_stream;
-   }
-
-
-   
-   
-   /******************************************************************************
-    **  Simply logs out the imap session
-    ******************************************************************************/
-   function sqimap_logout ($imap_stream) {
-      fputs ($imap_stream, "a001 LOGOUT\r\n");
-   }
-
-
-
-   /******************************************************************************
-    **  Returns the delimeter between mailboxes:  INBOX/Test, or INBOX.Test... 
-    ******************************************************************************/
-   function sqimap_get_delimiter ($imap_stream) {
-      fputs ($imap_stream, ". LSUB \"\" *\r\n");
-      $read = sqimap_read_data($imap_stream, ".", true, $a, $b);
-      $quote_position = strpos ($read[0], "\"");
-      $delim = substr ($read[0], $quote_position+1, 1);
-
-      return $delim;
-   }
-
-
-
-
-   /******************************************************************************
-    **  Gets the number of messages in the current mailbox. 
-    ******************************************************************************/
-   function sqimap_get_num_messages ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 EXAMINE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
-      for ($i = 0; $i < count($read_ary); $i++) {
-         if (substr(trim($read_ary[$i]), -6) == EXISTS) {
-            $array = explode (" ", $read_ary[$i]);
-            $num = $array[1];
-         }
-      }
-      return $num;
-   }
-
-   
-   /******************************************************************************
-    **  Returns a displayable email address 
-    ******************************************************************************/
-   function sqimap_find_email ($string) {
-      /** Luke Ehresman <lehresma@css.tayloru.edu>
-       ** <lehresma@css.tayloru.edu>
-       ** lehresma@css.tayloru.edu
-       **/
-
-      if (strpos($string, "<") && strpos($string, ">")) {
-         $string = substr($string, strpos($string, "<")+1);
-         $string = substr($string, 0, strpos($string, ">"));
-      }
-      return trim($string); 
-   }
-
-   
-   /******************************************************************************
-    **  Takes the From: field, and creates a displayable name.
-    **    Luke Ehresman <lkehresman@yahoo.com>
-    **           becomes:   Luke Ehresman
-    **    <lkehresman@yahoo.com>
-    **           becomes:   lkehresman@yahoo.com
-    ******************************************************************************/
-   function sqimap_find_displayable_name ($string) {
-      $string = " ".trim($string);
-      if (strpos($string, "<") && strpos($string, ">")) {
-         if (strpos($string, "<") == 1) {
-            $string = sqimap_find_email($string);
-         } else {
-            $string = trim($string);
-            $string = substr($string, 0, strpos($string, "<"));
-            $string = ereg_replace ("\"", "", $string);   
-         }   
-      }
-      return $string; 
-   }
-
-
-   
-   /******************************************************************************
-    **  Returns the number of unseen messages in this folder 
-    ******************************************************************************/
-   function sqimap_unseen_messages ($imap_stream, &$num_unseen) {
-      fputs ($imap_stream, "a001 SEARCH UNSEEN NOT DELETED\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message);
-      $unseen = false;
-      
-      if (strlen($read_ary[0]) > 10) {
-         $unseen = true;
-         $ary = explode (" ", $read_ary[0]);
-         $num_unseen = count($ary) - 2;
-      } else {
-         $unseen = false;
-         $num_unseen = 0;
-      }
-
-      return $unseen;
-   }
- 
-  
-   /******************************************************************************
-    **  Saves a message to a given folder -- used for saving sent messages
-    ******************************************************************************/
-   function sqimap_append ($imap_stream, $sent_folder, $length) {
-      fputs ($imap_stream, "a001 APPEND \"$sent_folder\" (\\Seen) \{$length}\r\n");
-      $tmp = fgets ($imap_stream, 1024);
-   } 
-
-   function sqimap_append_done ($imap_stream) {
-      fputs ($imap_stream, "\r\n");
-      $tmp = fgets ($imap_stream, 1024);
-   }
-?>
diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
deleted file mode 100755
index b9f461c9..00000000
--- a/functions/imap_mailbox.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?
-   /**
-    **  imap_mailbox.php
-    **
-    **  This impliments all functions that manipulate mailboxes
-    **/
-
-   /******************************************************************************
-    **  Expunges a mailbox 
-    ******************************************************************************/
-   function sqimap_mailbox_expunge ($imap_stream, $mailbox) {
-      sqimap_mailbox_select ($imap_stream, $mailbox);
-      fputs ($imap_stream, "a001 EXPUNGE\r\n");
-      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-   /******************************************************************************
-    **  Checks whether or not the specified mailbox exists 
-    ******************************************************************************/
-   function sqimap_mailbox_exists ($imap_stream, $mailbox) {
-      $boxes = sqimap_mailbox_list ($imap_stream);
-      $found = false;
-      for ($i = 0; $i < count ($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $mailbox)
-            $found = true;
-      }
-      return $found;
-   }
-
-
-   
-   /******************************************************************************
-    **  Selects a mailbox
-    ******************************************************************************/
-   function sqimap_mailbox_select ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SELECT \"$mailbox\"\r\n");
-      $read = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-   
-
-   /******************************************************************************
-    **  Creates a folder 
-    ******************************************************************************/
-   function sqimap_mailbox_create ($imap_stream, $mailbox, $type) {
-      if (strtolower($type) == "noselect") {
-         $dm = sqimap_get_delimiter($imap_stream);
-         $mailbox = $mailbox.$dm;
-      }
-      fputs ($imap_stream, "a001 CREATE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-
-      sqimap_subscribe ($imap_stream, $mailbox);
-   }
-
-
-
-   /******************************************************************************
-    **  Subscribes to an existing folder 
-    ******************************************************************************/
-   function sqimap_subscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 SUBSCRIBE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-
-
-   /******************************************************************************
-    **  Unsubscribes to an existing folder 
-    ******************************************************************************/
-   function sqimap_unsubscribe ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 UNSUBSCRIBE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-   }
-
-
-
-   
-   /******************************************************************************
-    **  This function simply deletes the given folder
-    ******************************************************************************/
-   function sqimap_mailbox_delete ($imap_stream, $mailbox) {
-      fputs ($imap_stream, "a001 DELETE \"$mailbox\"\r\n");
-      $read_ary = sqimap_read_data($imap_stream, "a001", true, $response, $message);
-      sqimap_unsubscribe ($imap_stream, $mailbox);
-   }
-
-
-
-   /******************************************************************************
-    **  Returns sorted mailbox lists in several different ways.
-    **  The array returned looks like this:
-    ******************************************************************************/
-   function sqimap_mailbox_list ($imap_stream) {
-      global $load_prefs_php, $prefs_php, $config_php, $data_dir, $username;
-      if (!isset($load_prefs_php))
-         include "../src/load_prefs.php";
-      else
-         global $folder_prefix;
-      global $special_folders, $list_special_folders_first, $default_folder_prefix;
-      
-      if (!function_exists ("ary_sort"))
-         include ("../functions/array.php");
-      
-      $dm = sqimap_get_delimiter ($imap_stream);
-
-      fputs ($imap_stream, "a001 LIST \"\" INBOX\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      $g = 0;
-      $phase = "inbox"; 
-      for ($i = 0; $i < count($read_ary); $i++) {
-         if (substr ($read_ary[$i], 0, 4) != "a001") {
-            $boxes[$g]["raw"] = $read_ary[$i];
-
-            $mailbox = find_mailbox_name($read_ary[$i]);
-            $dm_count = countCharInString($mailbox, $dm);
-            if (substr($mailbox, -1) == $dm)
-               $dm_count--;
-               
-            for ($j = 0; $j < $dm_count; $j++)
-               $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "  ";
-            $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-               
-            $boxes[$g]["unformatted-dm"] = $mailbox;
-            if (substr($mailbox, -1) == $dm)
-               $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-            $boxes[$g]["unformatted"] = $mailbox;
-            $boxes[$g]["id"] = $g;
-
-            /** Now lets get the flags for this mailbox **/
-            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
-            $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
-
-            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
-            $flags = substr($flags, 0, strpos($flags, ")"));
-            $flags = str_replace("\\", "", $flags);
-            $flags = trim(strtolower($flags));
-            if ($flags) {
-               $boxes[$g]["flags"] = explode(" ", $flags);
-            }
-         }
-         $g++;
-
-         if (!$read_ary[$i+1]) {
-            if ($phase == "inbox") {
-               if ($folder_prefix && (substr($folder_prefix, -1) != $dm))
-                  $folder_prefix = $folder_prefix . $dm;
-                           
-               fputs ($imap_stream, "a001 LSUB \"$folder_prefix\" *\r\n");
-               $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-               $phase = "lsub";
-               $i--;
-            }
-         }
-      }
-
-      $original = $boxes;
-
-      /** Get the folders into lower case so sorting is not case sensative */
-      for ($i = 0; $i < count($original); $i++) {
-         $boxes[$i]["unformatted"] = strtolower($boxes[$i]["unformatted"]);
-      }
-
-      /** Sort them **/
-      $boxes = ary_sort($boxes, "unformatted", 1);
-
-      /** Get them back from the original array, still sorted by the id **/
-      for ($i = 0; $i < count($boxes); $i++) {
-         for ($j = 0; $j < count($original); $j++) {
-            if ($boxes[$i]["id"] == $original[$j]["id"]) {
-               $boxes[$i] = $original[$j];
-            }
-         }
-      }     
- 
-      
-      for ($i = 0; $i < count($boxes); $i++) {
-         if ($boxes[$i]["unformatted"] == $special_folders[0]) {
-            $boxesnew[0] = $boxes[$i];
-            $boxes[$i]["used"] = true;
-         }
-      }
-      
-      if ($list_special_folders_first == true) {
-         for ($i = 0; $i < count($boxes); $i++) {
-            for ($j = 1; $j < count($special_folders); $j++) {
-               if (substr($boxes[$i]["unformatted"], 0, strlen($special_folders[$j])) == $special_folders[$j]) {
-                  $pos = count($boxesnew);
-                  $boxesnew[$pos] = $boxes[$i];
-                  $boxes[$i]["used"] = true;
-               }
-            }
-         }
-      }
-      
-      for ($i = 0; $i < count($boxes); $i++) {
-         if (($boxes[$i]["unformatted"] != $special_folders[0]) &&
-             ($boxes[$i]["used"] == false))  {
-            $pos = count($boxesnew);
-            $boxesnew[$pos] = $boxes[$i];
-            $boxes[$i]["used"] = true;
-         }
-      }
-
-      return $boxesnew;
-   }
-
-   
-   /******************************************************************************
-    **  Returns a list of all folders, subscribed or not
-    ******************************************************************************/
-   function sqimap_mailbox_list_all ($imap_stream) {
-      global $special_folders, $list_special_folders_first;
-      
-      if (!function_exists ("ary_sort"))
-         include ("../functions/array.php");
-      
-      $dm = sqimap_get_delimiter ($imap_stream);
-
-      fputs ($imap_stream, "a001 LIST \"INBOX\" *\r\n");
-      $read_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      $g = 0;
-      $phase = "inbox"; 
-      for ($i = 0; $i < count($read_ary); $i++) {
-         if (substr ($read_ary[$i], 0, 4) != "a001") {
-            $boxes[$g]["raw"] = $read_ary[$i];
-
-            $mailbox = find_mailbox_name($read_ary[$i]);
-            $dm_count = countCharInString($mailbox, $dm);
-            if (substr($mailbox, -1) == $dm)
-               $dm_count--;
-               
-            for ($j = 0; $j < $dm_count; $j++)
-               $boxes[$g]["formatted"] = $boxes[$g]["formatted"] . "  ";
-            $boxes[$g]["formatted"] .= readShortMailboxName($mailbox, $dm);
-               
-            $boxes[$g]["unformatted-dm"] = $mailbox;
-            if (substr($mailbox, -1) == $dm)
-               $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
-            $boxes[$g]["unformatted"] = $mailbox;
-            $boxes[$g]["id"] = $g;
-
-            /** Now lets get the flags for this mailbox **/
-            fputs ($imap_stream, "a002 LIST \"\" \"$mailbox\"\r\n"); 
-            $read_mlbx = sqimap_read_data ($imap_stream, "a002", true, $response, $message);
-
-            $flags = substr($read_mlbx[0], strpos($read_mlbx[0], "(")+1);
-            $flags = substr($flags, 0, strpos($flags, ")"));
-            $flags = str_replace("\\", "", $flags);
-            $flags = trim(strtolower($flags));
-            if ($flags) {
-               $boxes[$g]["flags"] = explode(" ", $flags);
-            }
-         }
-         $g++;
-      }
-      $boxes = ary_sort ($boxes, "unformatted", 1);
-      return $boxes;
-   }
-   
-?>
diff --git a/functions/imap_messages.php b/functions/imap_messages.php
deleted file mode 100755
index fe3255fa..00000000
--- a/functions/imap_messages.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?
-   /**
-    **  imap_messages.php
-    **
-    **  This implements functions that manipulate messages 
-    **/
-
-   /******************************************************************************
-    **  Copies specified messages to specified folder
-    ******************************************************************************/
-   function sqimap_messages_copy ($imap_stream, $start, $end, $mailbox) {
-      fputs ($imap_stream, "a001 COPY $start:$end \"$mailbox\"\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-   }
-
-   /******************************************************************************
-    **  Deletes specified messages and moves them to trash if possible
-    ******************************************************************************/
-   function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
-      global $move_to_trash, $trash_folder, $auto_expunge;
-
-      if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder))) {
-         sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
-         sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
-      } else {
-         sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
-      }
-   }
-
-   /******************************************************************************
-    **  Sets the specified messages with specified flag
-    ******************************************************************************/
-   function sqimap_messages_flag ($imap_stream, $start, $end, $flag) {
-      fputs ($imap_stream, "a001 STORE $start:$end +FLAGS (\\$flag)\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      
-   }
-
-   /******************************************************************************
-    **  Returns some general header information -- FROM, DATE, and SUBJECT
-    ******************************************************************************/
-   function sqimap_get_small_header ($imap_stream, $id, &$from, &$subject, &$date) {
-      fputs ($imap_stream, "a001 FETCH $id:$id RFC822.HEADER.LINES (From Subject Date)\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-
-      $subject = _("(no subject)");
-      $from = _("Unknown Sender");
-      for ($i = 0; $i < count($read); $i++) {
-         if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $from = sqimap_find_displayable_name(substr($read[$i], 5));
-         } else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
-            $date = substr($read[$i], 5);
-         } else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $subject = htmlspecialchars(substr($read[$i], 8));
-            if (strlen(trim($subject)) == 0)
-               $subject = _("(no subject)");
-         }
-      }
-   }
-
-   /******************************************************************************
-    **  Returns the flags for the specified messages 
-    ******************************************************************************/
-   function sqimap_get_flags ($imap_stream, $i) {
-      fputs ($imap_stream, "a001 FETCH $i:$i FLAGS\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-      if (strpos($read[0], "FLAGS")) {
-         $tmp = ereg_replace("\(", "", $read[0]);
-         $tmp = ereg_replace("\)", "", $tmp);
-         $tmp = str_replace("\\", "", $tmp);
-         $tmp = substr($tmp, strpos($tmp, "FLAGS")+6, strlen($tmp));
-         $tmp = trim($tmp);
-         $flags = explode(" ", $tmp);
-      } else {
-         $flags[0] = "None";
-      }
-      return $flags;
-   }
-
-   /******************************************************************************
-    **  Returns a message array with all the information about a message.  See
-    **  the documentation folder for more information about this array.
-    ******************************************************************************/
-   function sqimap_get_message ($imap_stream, $id, $mailbox) {
-      $message["INFO"]["ID"] = $id;
-      $message["INFO"]["MAILBOX"] = $mailbox;
-      $message["HEADER"] = sqimap_get_message_header($imap_stream, $id);
-      $message["ENTITIES"] = sqimap_get_message_body($imap_stream, $message["HEADER"]["BOUNDARY"], $id, $message["HEADER"]["TYPE0"], $message["HEADER"]["TYPE1"], $message["HEADER"]["ENCODING"], $message["HEADER"]["CHARSET"]);
-      return $message;
-   }
-
-   /******************************************************************************
-    **  Wrapper function that reformats the header information.
-    ******************************************************************************/
-   function sqimap_get_message_header ($imap_stream, $id) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[HEADER]\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-     
-      return sqimap_get_header($imap_stream, $read); 
-   }
-
-   /******************************************************************************
-    **  Wrapper function that returns entity headers for use by decodeMime
-    ******************************************************************************/
-   function sqimap_get_entity_header ($imap_stream, &$read, &$type0, &$type1, &$bound, &$encoding, &$charset, &$filename) {
-      $header = sqimap_get_header($imap_stream, $read);
-      $type0 = $header["TYPE0"]; 
-      $type1 = $header["TYPE1"];
-      $bound = $header["BOUNDARY"];
-      $encoding = $header["ENCODING"];
-      $charset = $header["CHARSET"];
-      $filename = $header["FILENAME"];
-   }
-
-   /******************************************************************************
-    **  Queries the IMAP server and gets all header information.
-    ******************************************************************************/
-   function sqimap_get_header ($imap_stream, $read) {
-      $i = 0;
-      // Set up some defaults
-      $header["TYPE0"] = "text";
-      $header["TYPE1"] = "plain";
-      $header["CHARSET"] = "us-ascii";
-
-      while ($i < count($read)) {
-         if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
-            $header["MIME"] = true;
-            $i++;
-         }
-
-         /** ENCODING TYPE **/
-         else if (substr(strtolower($read[$i]), 0, 26) == "content-transfer-encoding:") {
-            $header["ENCODING"] = strtolower(trim(substr($read[$i], 26)));
-            $i++;
-         }
-
-         /** CONTENT-TYPE **/
-         else if (strtolower(substr($read[$i], 0, 13)) == "content-type:") {
-            $cont = strtolower(trim(substr($read[$i], 13)));
-            if (strpos($cont, ";"))
-               $cont = substr($cont, 0, strpos($cont, ";"));
-
-
-            if (strpos($cont, "/")) {
-               $header["TYPE0"] = substr($cont, 0, strpos($cont, "/"));
-               $header["TYPE1"] = substr($cont, strpos($cont, "/")+1);
-            } else {
-               $header["TYPE0"] = $cont;
-            }
-
-
-            $line = $read[$i];
-            $i++;
-            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
-               str_replace("\n", "", $line);
-               str_replace("\n", "", $read[$i]);
-               $line = "$line $read[$i]";
-               $i++;
-            }
-
-            /** Detect the boundary of a multipart message **/
-            if (eregi("boundary=\"([^\"]+)\"", $line, $regs)) {                             
-               $header["BOUNDARY"] = $regs[1];                                             
-            }
-
-            /** Detect the charset **/
-            if (strpos(strtolower(trim($line)), "charset=")) {
-               $pos = strpos($line, "charset=") + 8;
-               $charset = trim($line);
-               if (strpos($line, " ", $pos) > 0) {
-                  $charset = substr($charset, $pos, strpos($line, " ", $pos));
-               } else {
-                  $charset = substr($charset, $pos);
-               }
-               $charset = str_replace("\"", "", $charset);
-               $header["CHARSET"] = $charset;
-            } else {
-               $header["CHARSET"] = "us-ascii";
-            }
-
-         }
-
-         else if (strtolower(substr($read[$i], 0, 20)) == "content-disposition:") {   
-            /** Add better dontent-disposition support **/
-            
-            $line = $read[$i];
-            $i++;
-            while ( (substr(substr($read[$i], 0, strpos($read[$i], " ")), -1) != ":") && (trim($read[$i]) != "") && (trim($read[$i]) != ")")) {
-               str_replace("\n", "", $line);
-               str_replace("\n", "", $read[$i]);
-               $line = "$line $read[$i]";
-               $i++;
-            }
-
-            /** Detects filename if any **/
-            if (strpos(strtolower(trim($line)), "filename=")) {
-               $pos = strpos($line, "filename=") + 9;
-               $name = trim($line);
-               if (strpos($line, " ", $pos) > 0) {
-                  $name = substr($name, $pos, strpos($line, " ", $pos));
-               } else {
-                  $name = substr($name, $pos);
-               }
-               $name = str_replace("\"", "", $name);
-               $header["FILENAME"] = $name;
-            }
-         }
-
-         /** REPLY-TO **/
-         else if (strtolower(substr($read[$i], 0, 9)) == "reply-to:") {
-            $header["REPLYTO"] = trim(substr($read[$i], 9, strlen($read[$i])));
-            $i++;
-         }
-
-         /** FROM **/
-         else if (strtolower(substr($read[$i], 0, 5)) == "from:") {
-            $header["FROM"] = trim(substr($read[$i], 5, strlen($read[$i]) - 6));
-            if ($header["REPLYTO"] == "")
-               $header["REPLYTO"] = $header["FROM"];
-            $i++;
-         }
-         /** DATE **/
-         else if (strtolower(substr($read[$i], 0, 5)) == "date:") {
-            $d = substr($read[$i], 5);
-            $d = trim($d);
-            $d = ereg_replace("  ", " ", $d);
-            $d = explode(" ", $d);
-            $header["DATE"] = getTimeStamp($d);
-            $i++;
-         }
-         /** SUBJECT **/
-         else if (strtolower(substr($read[$i], 0, 8)) == "subject:") {
-            $header["SUBJECT"] = trim(substr($read[$i], 8, strlen($read[$i]) - 9));
-            if (strlen(Chop($header["SUBJECT"])) == 0)
-               $header["SUBJECT"] = _("(no subject)");
-            $i++;
-         }
-         /** CC **/
-         else if (strtolower(substr($read[$i], 0, 3)) == "cc:") {
-            $pos = 0;
-            $header["CC"][$pos] = trim(substr($read[$i], 4));
-            $i++;
-            while ((substr($read[$i], 0, 1) == " ") && (trim($read[$i]) != "")) {
-               $pos++;
-               $header["CC"][$pos] = trim($read[$i]);
-               $i++;
-            }
-         }
-         /** TO **/
-         else if (strtolower(substr($read[$i], 0, 3)) == "to:") {
-            $pos = 0;
-            $header["TO"][$pos] = trim(substr($read[$i], 4));
-            $i++;
-            while ((substr($read[$i], 0, 1) == " ")  && (trim($read[$i]) != "")){
-               $pos++;
-               $header["TO"][$pos] = trim($read[$i]);
-               $i++;
-            }
-         }
-         /** MESSAGE ID **/
-         else if (strtolower(substr($read[$i], 0, 11)) == "message-id:") {
-            $header["MESSAGE-ID"] = trim(substr($read[$i], 11));
-            $i++;
-         }
-
-
-         /** ERROR CORRECTION **/
-         else if (substr($read[$i], 0, 1) == ")") {
-            if ($header["SUBJECT"] == "")
-                $header["SUBJECT"] = _("(no subject)");
-
-            if ($header["FROM"] == "")
-                $header["FROM"] = _("(unknown sender)");
-
-            if ($header["DATE"] == "")
-                $header["DATE"] = time();
-            $i++;
-         }
-         else {
-            $i++;
-         }
-      }
-      return $header;
-   }
-
-
-   /******************************************************************************
-    **  Returns the body of a message.
-    ******************************************************************************/
-   function sqimap_get_message_body ($imap_stream, $bound, $id, $type0, $type1, $encoding, $charset) {
-      fputs ($imap_stream, "a001 FETCH $id:$id BODY[TEXT]\r\n");
-      $read = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
-       
-      $i = 0;
-      $j = 0;
-      while ($i < count($read)-1) {
-         if ( ($i != 0) ) {
-            $bodytmp[$j] = $read[$i];
-            $j++;
-         }
-         $i++;
-      }
-      $body = $bodytmp;
-
-      return decodeMime($body, $bound, $type0, $type1, $encoding, $charset);
-   }
-?>
diff --git a/functions/page_header.php b/functions/page_header.php
index ec11e18b..30c54488 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -28,8 +28,9 @@
          
          // Setting cookie to use on the login screen the next time the
          // same user logs in.
-         setcookie("squirrelmail_language", $squirrelmail_language, 
-                   time()+2592000);
+         #setcookie("squirrelmail_language", $squirrelmail_language, 
+         #          time()+2592000);
+         $squirrelmail_language = $language;
       }
    } else {
       function _($string) {
-- 
2.25.1