summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-06-04 16:05:57 +0200
committerAleksander Machniak <alec@alec.pl>2012-06-04 16:08:37 +0200
commit7a259c601b4c9c69615411b6da91ff25b79079e0 (patch)
treed9feab8caa20f703edb5c4114ff109a8824eac36 /program
parent9c8ff86ab00757e0c53a1a43858161330724553d (diff)
Fix magic_quotes_sybase handling (#1488506)
Improved handling of critical PHP settings - try to set them to required value before die()
Diffstat (limited to 'program')
-rw-r--r--program/include/iniset.php24
1 files changed, 12 insertions, 12 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php
index a54cf45a7..b5edeeb18 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -23,18 +23,20 @@
*/
-// 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,
+$config = array(
+ 'error_reporting' => E_ALL &~ (E_NOTICE | E_STRICT),
+ // 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).
+ 'mbstring.func_overload' => 0,
'suhosin.session.encrypt' => 0,
- 'session.auto_start' => 0,
- 'file_uploads' => 1,
- 'magic_quotes_runtime' => 0,
+ 'session.auto_start' => 0,
+ 'file_uploads' => 1,
+ 'magic_quotes_runtime' => 0,
+ 'magic_quotes_sybase' => 0, // #1488506
);
-foreach ($crit_opts as $optname => $optval) {
- if ($optval != ini_get($optname)) {
+foreach ($config as $optname => $optval) {
+ if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
die("ERROR: Wrong '$optname' option value. Read REQUIREMENTS section in INSTALL file or use Roundcube Installer, please!");
}
}
@@ -68,8 +70,6 @@ if (set_include_path($include_path) === false) {
die("Fatal error: ini_set/set_include_path does not work.");
}
-ini_set('error_reporting', E_ALL &~ (E_NOTICE | E_STRICT));
-
// increase maximum execution time for php scripts
// (does not work in safe mode)
@set_time_limit(120);