From fd9cca2f2b8d2ca0d7d4e8a283e78ed63953c02e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 13 Jan 2010 03:51:10 -0500
Subject: [PATCH] - fix for jQuery-1.4rc1: remove comment from ajax response
---
program/include/iniset.php | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 8905161..2600a39 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -16,7 +16,7 @@
| Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
- $Id: cache.inc 88 2005-12-03 16:54:12Z roundcube $
+ $Id$
*/
@@ -51,21 +51,18 @@
}
ini_set('error_reporting', E_ALL&~E_NOTICE);
-if (isset($_SERVER['HTTPS'])) {
- ini_set('session.cookie_secure', ($_SERVER['HTTPS'] && ($_SERVER['HTTPS'] != 'off'))?1:0);
+if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
+ ini_set('session.cookie_secure', 1);
} else {
ini_set('session.cookie_secure', 0);
}
ini_set('session.name', 'roundcube_sessid');
ini_set('session.use_cookies', 1);
ini_set('session.use_only_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,28 +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_(.+)/',
- '/Net_(.+)/',
- '/^html_.+/',
- '/^utf8$/',
- '/html2text/'
- ),
- array('MDB2/\\1',
- 'Mail/\\1',
- 'Net/\\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