From 4c53e789151786c1e3db6d5e5e5a0df56e2a50fd Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 6 Sep 2015 10:15:33 +0200 Subject: [PATCH] Fix printing required ini options values in error message --- program/lib/Roundcube/bootstrap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 2e5d9e678..c17327458 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -45,8 +45,10 @@ if (php_sapi_name() != 'cli') { foreach ($config as $optname => $optval) { $ini_optval = filter_var(ini_get($optname), is_bool($optval) ? FILTER_VALIDATE_BOOLEAN : FILTER_VALIDATE_INT); if ($optval != $ini_optval && @ini_set($optname, $optval) === false) { - $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n" + $optval = !is_bool($optval) ? $optval : ($optval ? 'On' : 'Off'); + $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n" . "Check your PHP configuration (including php_admin_flag)."; + if (defined('STDERR')) fwrite(STDERR, $error); else echo $error; exit(1); }