From 6d479a622bfb779e07e7ac7bd12154ec951982e5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 22 Sep 2009 03:50:32 -0400
Subject: [PATCH] - remove set_magic_quotes_runtime() call, use set_time_limit() with @ (#1486149)
---
program/include/iniset.php | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 4cdf173..1332c8d 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -16,13 +16,13 @@
| Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: cache.inc 88 2005-12-03 16:54:12Z roundcube $
+ $Id$
*/
// application constants
-define('RCMAIL_VERSION', '0.2-trunk');
+define('RCMAIL_VERSION', '0.3-trunk');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
@@ -34,7 +34,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
@@ -58,14 +58,11 @@
}
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
-ini_set('session.only_use_cookies', 1);
-set_magic_quotes_runtime(0);
+ini_set('session.use_only_cookies', 1);
// 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 +75,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_once $filename. '.php';
+ include $filename. '.php';
}
+spl_autoload_register('rcube_autoload');
+
/**
* Local callback function for PEAR errors
*/
--
Gitblit v1.9.1