From cd96fd6727c5347bef4c242a79224fe8e18ff6cf Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 01 Apr 2010 10:42:56 -0400
Subject: [PATCH] - Add some critical PHP settings check to prevent bugs like this (#1486307)
---
program/include/iniset.php | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 2cdc88f..5f7c59d 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -20,11 +20,26 @@
*/
+// 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-$Rev$');
+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']).'/');
@@ -51,23 +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.use_only_cookies', 1);
-if (function_exists('set_magic_quotes_runtime')) {
- 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'))
--
Gitblit v1.9.1