mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-24 12:03:21 +01:00
Set secure cookie for style switcher if required. (Bug #19625)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8874 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
615188cd06
commit
cd1aad4779
@ -115,6 +115,7 @@
|
||||
<li>[Fix] Use correct port delimiter for MSSQL connections in windows. (Bug #16615)</li>
|
||||
<li>[Fix] Do not allow setting forums parent to the forum itself. (Bug #18855)</li>
|
||||
<li>[Fix] Display assigned rank/avatar for guests. (Bug #19155)</li>
|
||||
<li>[Fix] Set secure cookie for style switcher if required. (Bug #19625)</li>
|
||||
|
||||
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
|
||||
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
|
||||
|
@ -3717,8 +3717,10 @@ function page_header($page_title = '', $display_online_list = true)
|
||||
'T_STYLESHEET_LINK' => (!$user->theme['theme_storedb']) ? "{$phpbb_root_path}styles/" . $user->theme['theme_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$user->session_id&id=" . $user->theme['style_id'] . '&lang=' . $user->data['user_lang'],
|
||||
'T_STYLESHEET_NAME' => $user->theme['theme_name'],
|
||||
|
||||
'SITE_LOGO_IMG' => $user->img('site_logo'))
|
||||
);
|
||||
'SITE_LOGO_IMG' => $user->img('site_logo'),
|
||||
|
||||
'A_COOKIE_SETTINGS' => addslashes('; path=' . $config['cookie_path'] . ((!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']) . ((!$config['cookie_secure']) ? '' : '; secure')),
|
||||
));
|
||||
|
||||
// application/xhtml+xml not used because of IE
|
||||
header('Content-type: text/html; charset=UTF-8');
|
||||
|
@ -32,6 +32,7 @@
|
||||
var per_page = '{PER_PAGE}';
|
||||
var base_url = '{A_BASE_URL}';
|
||||
var style_cookie = 'phpBBstyle';
|
||||
var style_cookie_settings = '{A_COOKIE_SETTINGS}';
|
||||
var onload_functions = new Array();
|
||||
var onunload_functions = new Array();
|
||||
|
||||
|
@ -112,7 +112,7 @@ function createCookie(name, value, days)
|
||||
expires = '';
|
||||
}
|
||||
|
||||
document.cookie = name + '=' + value + expires + '; path=/';
|
||||
document.cookie = name + '=' + value + expires + style_cookie_settings;
|
||||
}
|
||||
|
||||
function readCookie(name)
|
||||
|
Loading…
x
Reference in New Issue
Block a user