From bfdbcf52100c707e1aee3993e7fe6216a73e85f2 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 18 Oct 2008 05:57:08 -0400
Subject: [PATCH] #1485505: PHP bug (?) workaround for html2text class autoloading
---
program/include/iniset.php | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5072d63..2be15b1 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -22,13 +22,15 @@
// application constants
-define('RCMAIL_VERSION', '0.1-trunk');
+define('RCMAIL_VERSION', '0.2-trunk');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
}
+
+define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
@@ -50,8 +52,7 @@
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
-ini_set('session.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
+ini_set('session.only_use_cookies', 1);
ini_set('error_reporting', E_ALL&~E_NOTICE);
set_magic_quotes_runtime(0);
@@ -61,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
*
@@ -69,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