diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:15:28 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-05-03 00:15:28 +0200 |
| commit | 1399d60954b484ac5ee0c9aca09b9a6221c04de0 (patch) | |
| tree | a4cf519cf6c6de5b39e576c54916949274df043b /phpBB/phpbb | |
| parent | 936518d201c5523ee71c5ee46f4415aa4bb9f4cf (diff) | |
| parent | 257ff46659cb2f35514b21a5345dd68b666e6994 (diff) | |
| download | forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.gz forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.bz2 forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.tar.xz forums-1399d60954b484ac5ee0c9aca09b9a6221c04de0.zip | |
Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeus
* github-vse/ticket/10521:
[ticket/10521] Allow language switching by URL parameter
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/session.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index f530d30f1f..c9e04e1401 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1045,8 +1045,9 @@ class session * @param string $name Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then. * @param string $cookiedata The data to hold within the cookie * @param int $cookietime The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set. + * @param int $httponly Use HttpOnly. Defaults to true. Use false to make cookie accessible by client-side scripts. */ - function set_cookie($name, $cookiedata, $cookietime) + function set_cookie($name, $cookiedata, $cookietime, $httponly = true) { global $config; @@ -1054,7 +1055,7 @@ class session $expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime); $domain = (!$config['cookie_domain'] || $config['cookie_domain'] == 'localhost' || $config['cookie_domain'] == '127.0.0.1') ? '' : '; domain=' . $config['cookie_domain']; - header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . '; HttpOnly', false); + header('Set-Cookie: ' . $name_data . (($cookietime) ? '; expires=' . $expire : '') . '; path=' . $config['cookie_path'] . $domain . ((!$config['cookie_secure']) ? '' : '; secure') . ';' . (($httponly) ? ' HttpOnly' : ''), false); } /** diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 2f186593ec..f8e473dcad 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -80,10 +80,18 @@ class user extends \phpbb\session } else { - $change_lang = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); - if ($change_lang) + $lang_override = $request->variable('language', ''); + if ($lang_override) { - $use_lang = basename($change_lang); + $this->set_cookie('lang', $lang_override, 0, false); + } + else + { + $lang_override = $request->variable($config['cookie_name'] . '_lang', '', true, \phpbb\request\request_interface::COOKIE); + } + if ($lang_override) + { + $use_lang = basename($lang_override); $user_lang_name = (file_exists($this->lang_path . $use_lang . "/common.$phpEx")) ? $use_lang : basename($config['default_lang']); $this->data['user_lang'] = $user_lang_name; } |