Changeset 7a259c6 in github

Timestamp:

Jun 4, 2012 10:08:37 AM (12 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

release-0.8

Children:

0e58211

Parents:

9c8ff86

git-author:

Aleksander Machniak <alec@…> (06/04/12 10:05:57)

git-committer:

Aleksander Machniak <alec@…> (06/04/12 10:08:37)

Message:

Fix magic_quotes_sybase handling (#1488506)
Improved handling of critical PHP settings - try to set them to required value before die()

Files:

• CHANGELOG (modified) (1 diff)
• INSTALL (modified) (1 diff)
• installer/check.php (modified) (1 diff)
• program/include/iniset.php (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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

INSTALL

@@ -32 +32 @@
    - 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

installer/check.php

@@ -41 +41 @@
     'mbstring.func_overload'        => 0,
     'suhosin.session.encrypt'       => 0,
+    'magic_quotes_runtime'          => 0,
+    'magic_quotes_sybase'           => 0,
 );
 

program/include/iniset.php

@@ -24 +24 @@
 */
 
-// 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 +70 @@
     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