From 230f944bf62f141f47c021dbfe6cc3d07b74a76d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 24 Dec 2008 09:29:47 -0500
Subject: [PATCH] Allow empty strings for imap_root config parameter (was changed in r2143) to remain backward compatible but cache imap root and delimiter in session
---
program/include/iniset.php | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 20fe279..fda13e9 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -52,8 +52,8 @@
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('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off')));
ini_set('error_reporting', E_ALL&~E_NOTICE);
set_magic_quotes_runtime(0);
@@ -63,6 +63,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
*
@@ -71,8 +76,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