makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/request-class] Make use of the is_secure() method

Browse source 
PHPBB3-9716
This commit is contained in:
Igor Wiedler 2011-08-18 22:25:17 +02:00
parent a48889fed8
commit f84460c710
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php
View file

@ -42,7 +42,7 @@ class phpbb_recaptcha extends phpbb_default_captcha
function phpbb_recaptcha() function phpbb_recaptcha()
{ {
global $request; global $request;
$this->recaptcha_server = $request->server('HTTPS') == 'on' ? $this->recaptcha_server_secure : $this->recaptcha_server; $this->recaptcha_server = $request->is_secure() ? $this->recaptcha_server_secure : $this->recaptcha_server;
} }
function init($type) function init($type)

2
phpBB/includes/functions.php
View file

@ -2069,7 +2069,7 @@ function generate_board_url($without_script_path = false)
else else
{ {
// Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection // Do not rely on cookie_secure, users seem to think that it means a secured cookie instead of an encrypted connection
$cookie_secure = $request->server('HTTPS') == 'on' ? 1 : 0; $cookie_secure = $request->is_secure() ? 1 : 0;
$url = (($cookie_secure) ? 'https://' : 'http://') . $server_name; $url = (($cookie_secure) ? 'https://' : 'http://') . $server_name;
$script_path = $user->page['root_script_path']; $script_path = $user->page['root_script_path'];

2
phpBB/install/index.php
View file

@ -433,7 +433,7 @@ class module
// HTTP_HOST is having the correct browser url in most cases... // HTTP_HOST is having the correct browser url in most cases...
$server_name = strtolower($request->header('Host', $request->server('SERVER_NAME'))); $server_name = strtolower($request->header('Host', $request->server('SERVER_NAME')));
$server_port = $request->server('SERVER_PORT', 0); $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'); $script_name = $request->server('PHP_SELF');
if (!$script_name) if (!$script_name)

4
phpBB/install/install_install.php
View file

@ -1028,8 +1028,8 @@ class install_install extends module
$data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true; $data['email_enable'] = ($data['email_enable'] !== '') ? $data['email_enable'] : true;
$data['server_name'] = ($data['server_name'] !== '') ? $data['server_name'] : $server_name; $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_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['server_protocol'] = ($data['server_protocol'] !== '') ? $data['server_protocol'] : ($request->is_secure() ? 'https://' : 'http://');
$data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : ($request->server('HTTPS') == 'on' ? true : false); $data['cookie_secure'] = ($data['cookie_secure'] !== '') ? $data['cookie_secure'] : $request->is_secure();
if ($data['script_path'] === '') if ($data['script_path'] === '')
{ {