From 0b6d022e6fa9dc08ddbc8ba420cdd58a690cf852 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 4 Jun 2012 16:05:57 +0200
Subject: Fix magic_quotes_sybase handling (#1488506) Improved handling of
 critical PHP settings - try to set them to required value before die()

---
 CHANGELOG                  |  1 +
 INSTALL                    |  1 +
 installer/check.php        |  2 ++
 program/include/iniset.php | 24 ++++++++++++------------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4a275beb3..6f6ee8824 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix errors with enabled PHP magic_quotes_sybase option (#1488506)
 - Fix SQL query for contacts listing on MS SQL Server (#1488505)
 - Update to TinyMCE 3.5.2
 - Fix window.resize handler on IE8 and Opera (#1488453)
diff --git a/INSTALL b/INSTALL
index d175d6fc3..32638352a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,6 +31,7 @@ REQUIREMENTS
    - suhosin.session.encrypt disabled
    - mbstring.func_overload disabled
    - magic_quotes_runtime disabled
+   - magic_quotes_sybase disabled
 * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker
 * A MySQL (4.0.8 or newer), PostgreSQL, MSSQL database engine
   or the SQLite extension for PHP
diff --git a/installer/check.php b/installer/check.php
index 0ce428a7a..e5f30261c 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -40,6 +40,8 @@ $ini_checks = array(
     'zend.ze1_compatibility_mode'   => 0,
     'mbstring.func_overload'        => 0,
     'suhosin.session.encrypt'       => 0,
+    'magic_quotes_runtime'          => 0,
+    'magic_quotes_sybase'           => 0,
 );
 
 $optional_checks = array(
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 2961beed6..a2f43b380 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -20,18 +20,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!");
     }
 }
@@ -59,8 +61,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);
-- 
cgit v1.2.3