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 | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 5dacf85..2600a39 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,7 +5,7 @@
| program/include/iniset.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008, RoundCube Dev, - Switzerland |
+ | Copyright (C) 2008-2009, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -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');
@@ -30,9 +30,11 @@
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
}
+define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+
// 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
@@ -48,33 +50,56 @@
die('Fatal error: ini_set/set_include_path does not work.');
}
+ini_set('error_reporting', E_ALL&~E_NOTICE);
+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.gc_maxlifetime', 21600);
-ini_set('session.gc_divisor', 500);
-ini_set('error_reporting', E_ALL&~E_NOTICE);
-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'))
+ mb_internal_encoding(RCMAIL_CHARSET);
+
/**
* Use PHP5 autoload for dynamic class loading
*
* @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$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ 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
@@ -95,4 +120,3 @@
// set PEAR error handling (will also load the PEAR main class)
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
-
--
Gitblit v1.9.1