diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-20 15:08:10 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-20 15:12:20 +0200 |
| commit | b96be346de62308321d1191c393c569bfa56094f (patch) | |
| tree | d82e31308b4402993ad7779389b1b7c716692b30 /program/include | |
| parent | 2bc814eed5a5fd6cc90bd8b4b487e07a3ffbbe3b (diff) | |
Canonize boolean ini_get() results (#1489189)
Conflicts:
CHANGELOG
program/lib/Roundcube/rcube.php
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 5 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 2 |
2 files changed, 4 insertions, 3 deletions
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); diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php index e96726236..577a2c848 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -71,7 +71,7 @@ class rcmail_output_html extends rcmail_output // add cookie info $this->set_env('cookie_domain', ini_get('session.cookie_domain')); $this->set_env('cookie_path', ini_get('session.cookie_path')); - $this->set_env('cookie_secure', ini_get('session.cookie_secure')); + $this->set_env('cookie_secure', filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN)); // load the correct skin (in case user-defined) $skin = $this->config->get('skin'); |