diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 14:17:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-18 14:17:39 +0000 |
| commit | 2fc6d5147afc6c6c3827d698a71dcb210524d51e (patch) | |
| tree | fca654d38b28072dce3d17128f7fe4762e251176 /phpBB | |
| parent | e2736dea20d623f0484a017c0504c4d8f822c908 (diff) | |
| download | forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.gz forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.bz2 forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.tar.xz forums-2fc6d5147afc6c6c3827d698a71dcb210524d51e.zip | |
Set secure cookie for style switcher if required. (Bug #19625)
git-svn-id: file:///svn/phpbb/trunk@8875 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 6 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/styleswitcher.js | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3e4ce3474a..8fef702ab1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3597,8 +3597,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.' . PHP_EXT . "?sid=$user->session_id&id=" . $user->theme['style_id'] . '&lang=' . $user->data['user_lang'], //PHPBB_ROOT_PATH . "store/{$user->theme['theme_id']}_{$user->theme['imageset_id']}_{$user->lang_name}.css" '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'); diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index dba717a0ba..c929f2c128 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -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(); diff --git a/phpBB/styles/prosilver/template/styleswitcher.js b/phpBB/styles/prosilver/template/styleswitcher.js index c68215d13f..203d8e4c21 100644 --- a/phpBB/styles/prosilver/template/styleswitcher.js +++ b/phpBB/styles/prosilver/template/styleswitcher.js @@ -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) |