From b96be346de62308321d1191c393c569bfa56094f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 20 Jun 2013 15:08:10 +0200 Subject: Canonize boolean ini_get() results (#1489189) Conflicts: CHANGELOG program/lib/Roundcube/rcube.php --- program/include/rcmail.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'program/include/rcmail.php') diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 19a89b84c..675a2c057 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1054,7 +1054,7 @@ class rcmail extends rcube $subject = str_replace("\r\n", $delim, $subject); } - if (ini_get('safe_mode')) + if (filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN)) $sent = mail($to, $subject, $msg_body, $header_str); else $sent = mail($to, $subject, $msg_body, $header_str, "-f$from"); @@ -1934,7 +1934,8 @@ class rcmail extends rcube public function upload_init() { // Enable upload progress bar - if (($seconds = $this->config->get('upload_progress')) && ini_get('apc.rfc1867')) { + $rfc1867 = filter_var(ini_get('apc.rfc1867'), FILTER_VALIDATE_BOOLEAN); + if ($rfc1867 && ($seconds = $this->config->get('upload_progress'))) { if ($field_name = ini_get('apc.rfc1867_name')) { $this->output->set_env('upload_progress_name', $field_name); $this->output->set_env('upload_progress_time', (int) $seconds); -- cgit v1.2.3