From 7fdb9da98e080ad623e3099c05eab17041013cab Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 01 Apr 2010 11:54:57 -0400
Subject: [PATCH] - Fix sources list if 'ldap_public' is null/false
---
program/include/iniset.php | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 46f3750..5f7c59d 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -16,15 +16,30 @@
| Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: cache.inc 88 2005-12-03 16:54:12Z roundcube $
+ $Id$
*/
+// Some users are not using Installer, so we'll check some
+// critical PHP settings here. Only these, which doesn't provide
+// an error/warning in the logs later. See (#1486307).
+$crit_opts = array(
+ 'mbstring.func_overload' => 0,
+ 'suhosin.session.encrypt' => 0,
+ 'session.auto_start' => 0,
+ 'file_uploads' => 1,
+);
+foreach ($crit_opts as $optname => $optval) {
+ if ($optval != ini_get($optname)) {
+ die("ERROR: Wrong '$optname' option value. Read REQUIREMENTS section in INSTALL file or use Roundcube Installer, please!");
+ }
+}
// application constants
define('RCMAIL_VERSION', '0.3-trunk');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
+define('RCMAIL_START', microtime(true));
if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
@@ -34,7 +49,7 @@
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
- define('PATH_SEPARATOR', (eregi('win', PHP_OS) ? ';' : ':'));
+ define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');
}
// RC include folders MUST be included FIRST to avoid other
@@ -51,21 +66,10 @@
}
ini_set('error_reporting', E_ALL&~E_NOTICE);
-if (isset($_SERVER['HTTPS'])) {
- ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0);
-} else {
- ini_set('session.cookie_secure', 0);
-}
-ini_set('session.name', 'roundcube_sessid');
-ini_set('session.use_cookies', 1);
-ini_set('session.only_use_cookies', 1);
-set_magic_quotes_runtime(0);
// increase maximum execution time for php scripts
// (does not work in safe mode)
-if (!ini_get('safe_mode')) {
- set_time_limit(120);
-}
+@set_time_limit(120);
// set internal encoding for mbstring extension
if(extension_loaded('mbstring'))
@@ -78,26 +82,32 @@
* @todo Make Zend, PEAR etc play with this
* @todo Make our classes conform to a more straight forward CS.
*/
-function __autoload($classname)
+function rcube_autoload($classname)
{
$filename = preg_replace(
- array('/MDB2_(.+)/',
- '/Mail_(.+)/',
- '/^html_.+/',
- '/^utf8$/',
- '/html2text/'
- ),
- array('MDB2/\\1',
- 'Mail/\\1',
- 'html',
- 'utf8.class',
- 'lib/html2text' // see #1485505
- ),
+ array(
+ '/MDB2_(.+)/',
+ '/Mail_(.+)/',
+ '/Net_(.+)/',
+ '/^html_.+/',
+ '/^utf8$/',
+ '/html2text/'
+ ),
+ array(
+ 'MDB2/\\1',
+ 'Mail/\\1',
+ 'Net/\\1',
+ 'html',
+ 'utf8.class',
+ 'lib/html2text' // see #1485505
+ ),
$classname
);
include $filename. '.php';
}
+spl_autoload_register('rcube_autoload');
+
/**
* Local callback function for PEAR errors
*/
--
Gitblit v1.9.1