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:08:10 +0200 |
| commit | 39b905b7a8abafe57f5429952db390a97ffa047f (patch) | |
| tree | 6dbfb024d6441f873e4736c3d3cdc7d430c027eb /program/include | |
| parent | 976ba376a94db6ac0891bc02437cea9f9cc08093 (diff) | |
Canonize boolean ini_get() results (#1489189)
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 3 | ||||
| -rw-r--r-- | program/include/rcmail_output_html.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index eff0425c8..a0027ec54 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1760,7 +1760,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 29a86b9f7..656da6bc9 100644 --- a/program/include/rcmail_output_html.php +++ b/program/include/rcmail_output_html.php @@ -72,7 +72,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'); |