From e86a21bd83a0ae6cadfe9c919582951f306d3b64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 06 Jan 2012 05:55:07 -0500
Subject: [PATCH] - Fix typo in timezone handling, more exception catching
---
program/include/iniset.php | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index a4f87e9..ac5c5a1 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -4,8 +4,8 @@
+-----------------------------------------------------------------------+
| program/include/iniset.php |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008-2009, RoundCube Dev, - Switzerland |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2008-2011, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -28,6 +28,7 @@
'suhosin.session.encrypt' => 0,
'session.auto_start' => 0,
'file_uploads' => 1,
+ 'magic_quotes_runtime' => 0,
);
foreach ($crit_opts as $optname => $optval) {
if ($optval != ini_get($optname)) {
@@ -36,7 +37,7 @@
}
// application constants
-define('RCMAIL_VERSION', '0.4-trunk');
+define('RCMAIL_VERSION', '0.8-svn');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
define('RCMAIL_START', microtime(true));
@@ -57,10 +58,7 @@
// RC include folders MUST be included FIRST to avoid other
// possible not compatible libraries (i.e PEAR) to be included
// instead the ones provided by RC
-$include_path = INSTALL_PATH . PATH_SEPARATOR;
-$include_path.= INSTALL_PATH . 'program' . PATH_SEPARATOR;
-$include_path.= INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
-$include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
+$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path.= ini_get('include_path');
if (set_include_path($include_path) === false) {
@@ -74,9 +72,10 @@
@set_time_limit(120);
// set internal encoding for mbstring extension
-if(extension_loaded('mbstring'))
+if (extension_loaded('mbstring')) {
mb_internal_encoding(RCMAIL_CHARSET);
-
+ @mb_regex_encoding(RCMAIL_CHARSET);
+}
/**
* Use PHP5 autoload for dynamic class loading
@@ -91,6 +90,7 @@
'/MDB2_(.+)/',
'/Mail_(.+)/',
'/Net_(.+)/',
+ '/Auth_(.+)/',
'/^html_.+/',
'/^utf8$/',
),
@@ -98,12 +98,20 @@
'MDB2/\\1',
'Mail/\\1',
'Net/\\1',
+ 'Auth/\\1',
'html',
'utf8.class',
),
$classname
);
- include $filename. '.php';
+
+ if ($fp = @fopen("$filename.php", 'r', true)) {
+ fclose($fp);
+ include_once("$filename.php");
+ return true;
+ }
+
+ return false;
}
spl_autoload_register('rcube_autoload');
@@ -123,5 +131,5 @@
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
// include global functions
-require_once 'include/main.inc';
-require_once 'include/rcube_shared.inc';
+require_once INSTALL_PATH . 'program/include/main.inc';
+require_once INSTALL_PATH . 'program/include/rcube_shared.inc';
--
Gitblit v1.9.1