diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-08-18 22:25:17 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-08-18 22:26:30 +0200 |
| commit | f84460c710f528724fac68278361af7fe18e458c (patch) | |
| tree | a6d8558e8372d4174712cfdd842ff5ae2c17230d /phpBB/install | |
| parent | a48889fed83b007202e76ddf1ba5436eca310df0 (diff) | |
| download | forums-f84460c710f528724fac68278361af7fe18e458c.tar forums-f84460c710f528724fac68278361af7fe18e458c.tar.gz forums-f84460c710f528724fac68278361af7fe18e458c.tar.bz2 forums-f84460c710f528724fac68278361af7fe18e458c.tar.xz forums-f84460c710f528724fac68278361af7fe18e458c.zip | |
[feature/request-class] Make use of the is_secure() method
PHPBB3-9716
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/index.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9928638fc4..3c1ce359ca 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -433,7 +433,7 @@ class module // HTTP_HOST is having the correct browser url in most cases... $server_name = strtolower($request->header('Host', $request->server('SERVER_NAME'))); $server_port = $request->server('SERVER_PORT', 0); - $secure = ($request->server('HTTPS') == 'on') ? 1 : 0; + $secure = $request->is_secure() ? 1 : 0; $script_name = $request->server('PHP_SELF'); if (!$script_name) diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index af3d414071..9be5466ef3 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1028,8 +1028,8 @@ class install_install extends module $data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true; $data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : $server_name; $data['server_port'] = ($data['server_port'] !== '') ? $data['server_port'] : $request->server('SERVER_PORT', 0); - $data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->server('HTTPS') == 'on' ? 'https://' : 'http://'); - $data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ($request->server('HTTPS') == 'on' ? true : false); + $data['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->is_secure() ? 'https://' : 'http://'); + $data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : $request->is_secure(); if ($data['script_path'] === '') { |