aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/session.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2014-05-02 14:22:59 -0700
committerMatt Friedman <maf675@gmail.com>2014-05-02 14:22:59 -0700
commit257ff46659cb2f35514b21a5345dd68b666e6994 (patch)
tree7da6323f8fd091e9c04f108cb490fa6ac4def0f4 /phpBB/phpbb/session.php
parent603c3b4629228e529aa0393ecb9e4ff6e012c74a (diff)
downloadforums-257ff46659cb2f35514b21a5345dd68b666e6994.tar
forums-257ff46659cb2f35514b21a5345dd68b666e6994.tar.gz
forums-257ff46659cb2f35514b21a5345dd68b666e6994.tar.bz2
forums-257ff46659cb2f35514b21a5345dd68b666e6994.tar.xz
forums-257ff46659cb2f35514b21a5345dd68b666e6994.zip
[ticket/10521] Allow language switching by URL parameter
PHPBB3-10521
Diffstat (limited to 'phpBB/phpbb/session.php')
-rw-r--r--phpBB/phpbb/session.php5
1 files changed, 3 insertions, 2 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);
}
/**