Removed Russian Apache code since we no longer support Russian Apache Charset recodings

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1353 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index 6a12f0cbcbe15eb7df50040940fce4586c889598..19d831367eca158ff89b7169338b39b6c4758b27 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -408,34 +408,6 @@
       $attachments[] = $newAttachment;
     }
   
-   function SqConvertRussianCharsets(){
-    //
-    // This function is here because Russian Apache is a bastard when it comes to
-    // attachments. The solution is to turn off attachment recoding for multipart
-    // forms and do it manually.
-    // See graf@relhum.org for support.
-    //
-    global $CHARSET, $SOURCE_CHARSET, $send_to, $send_to_cc, $send_to_bcc, $subject, $body;
-    $charset_ary = array("koi8-r" => "k",
-                            "windows-1251" => "w",
-                         "ibm866" => "a",
-                         "ISO-8859-5" => "i");
-    $body = convert_cyr_string($body, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to = convert_cyr_string($send_to, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to_cc = convert_cyr_string($send_to_cc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $send_to_bcc = convert_cyr_string($send_to_bcc, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-    $subject = convert_cyr_string($subject, $charset_ary[$CHARSET], $charset_ary[$SOURCE_CHARSET]);
-   } // end SqConvertRussianCharsets()
-   
-   // Russian Apache sets $CHARSET. See if this is Russian Apache.
-   // If so, check if the source charset (koi8-r) is different from the 
-   // one submitted by the browser. If so, recode the parts of the form
-   // to the needed format so SM can proceed and not mangle the cyrillic
-   // input.
-   // See graf@relhum.org for support.
-   //
-   if (isset($CHARSET) && $CHARSET != $SOURCE_CHARSET) SqConvertRussianCharsets();
-   
    if (!isset($mailbox) || $mailbox == "" || ($mailbox == "None"))
       $mailbox = "INBOX";