From d0cb897edbc1f05d4618b6bc56467a0386f99ca9 Mon Sep 17 00:00:00 2001 From: graf25 Date: Thu, 10 May 2001 20:26:05 +0000 Subject: [PATCH] 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 --- src/compose.php | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/src/compose.php b/src/compose.php index 6a12f0cb..19d83136 100644 --- 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"; -- 2.25.1