From 9abd0f0089db877d2f6ec9f3a0b978ef3f11ce86 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 27 Nov 2008 06:25:31 -0500
Subject: [PATCH] - Allow UTF-8 folder names in config (#1485579) - Add junk_mbox option configuration in installer (#1485579)
---
program/include/iniset.php | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5fe1011..2be15b1 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -62,6 +62,11 @@
set_time_limit(120);
}
+// set internal encoding for mbstring extension
+if(extension_loaded('mbstring'))
+ mb_internal_encoding(RCMAIL_CHARSET);
+
+
/**
* Use PHP5 autoload for dynamic class loading
*
@@ -70,8 +75,18 @@
function __autoload($classname)
{
$filename = preg_replace(
- array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ array('/MDB2_(.+)/',
+ '/Mail_(.+)/',
+ '/^html_.+/',
+ '/^utf8$/',
+ '/html2text/'
+ ),
+ array('MDB2/\\1',
+ 'Mail/\\1',
+ 'html',
+ 'utf8.class',
+ 'lib/html2text' // see #1485505
+ ),
$classname
);
include_once $filename. '.php';
--
Gitblit v1.9.1