From 7d0b34db310042ef624a06118380f2a099096f08 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 10 Nov 2009 06:02:52 -0500
Subject: [PATCH] - additional character set name cleanup to support e.g. "_ISO-2022-JP$SIO"

---
 program/include/main.inc |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/program/include/main.inc b/program/include/main.inc
index 258f719..7466be7 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -300,8 +300,11 @@
   {
   $charset = strtoupper($charset);
 
-  # RFC1642
-  $charset = str_replace('UNICODE-1-1-', '', $charset);
+  $charset = preg_replace(array(
+    '/^[^0-9A-Z]+/',	// e.g. _ISO-8859-JP$SIO
+    '/\$.*$/',		// e.g. _ISO-8859-JP$SIO
+    '/UNICODE-1-1-/',	// RFC1642
+    ), '', $charset);
 
   # Aliases: some of them from HTML5 spec.
   $aliases = array(
@@ -1410,7 +1413,7 @@
 {
   global $RCMAIL;
   
-  if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')
+  if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off')
     return true;
   if ($port && $_SERVER['SERVER_PORT'] == $port)
     return true;

--
Gitblit v1.9.1