diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-10 15:53:03 +0200 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2013-10-10 15:53:03 +0200 |
| commit | df5d307ea8bac1f5030d42af363ae9f7469a63f2 (patch) | |
| tree | 13dccf2f697b039ec10afac084e9ee212b844b23 /lib | |
| parent | 75e4dd8a2ec6c181e99877919b5a2b529407752a (diff) | |
| download | rpg-df5d307ea8bac1f5030d42af363ae9f7469a63f2.tar.gz rpg-df5d307ea8bac1f5030d42af363ae9f7469a63f2.tar.bz2 | |
add cookie secure parameter to cookies set by javascript
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/exe/js.php | 8 | ||||
| -rw-r--r-- | lib/scripts/cookie.js | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index fc7a869c2..040b8874d 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -86,16 +86,20 @@ function js_out(){ // start output buffering and build the script ob_start(); + $json = new JSON(); // add some global variables print "var DOKU_BASE = '".DOKU_BASE."';"; print "var DOKU_TPL = '".tpl_basedir()."';"; - print "var DOKU_COOKIEPATH = '" . (empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']) . "';"; + print "var DOKU_COOKIE_PARAM = " . $json->encode( + array( + 'path' => empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'], + 'secure' => $conf['securecookie'] && is_ssl() + )).";"; // FIXME: Move those to JSINFO print "var DOKU_UHN = ".((int) useHeading('navigation')).";"; print "var DOKU_UHC = ".((int) useHeading('content')).";"; // load JS specific translations - $json = new JSON(); $lang['js']['plugins'] = js_pluginstrings(); $templatestrings = js_templatestrings(); if(!empty($templatestrings)) { diff --git a/lib/scripts/cookie.js b/lib/scripts/cookie.js index 4cb527f26..8417d2064 100644 --- a/lib/scripts/cookie.js +++ b/lib/scripts/cookie.js @@ -30,7 +30,7 @@ var DokuCookie = { text.push(encodeURIComponent(key)+'#'+encodeURIComponent(val)); } }); - jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIEPATH}); + jQuery.cookie(this.name, text.join('#'), {expires: 365, path: DOKU_COOKIE_PARAM.path, secure: DOKU_COOKIE_PARAM.secure}); }, /** |