From d91ab76f52f59d264301e18c28a0d3bae996fab8 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 27 Aug 2013 01:18:10 -0700
Subject: Fix CodeSniffer violations

Fix violations for the following sniff
DokuWiki.Functions.OpeningFunctionBrace

Also removed an extraneous semicolon.
---
 lib/exe/js.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/exe/js.php')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 4b4b598de..76238a81b 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -194,8 +194,7 @@ function js_pluginscripts(){
  *
  * @author Gabriel Birke <birke@d-scribe.de>
  */
-function js_pluginstrings()
-{
+function js_pluginstrings() {
     global $conf;
     $pluginstrings = array();
     $plugins = plugin_list();
-- 
cgit v1.2.3


From 75e4dd8a2ec6c181e99877919b5a2b529407752a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 8 Oct 2013 00:06:46 +0200
Subject: Use in cookie a correct path, added DOKU_COOKIEPATH to js constants
 Fixes FS#2837

---
 lib/exe/js.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/exe/js.php')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index 76238a81b..fc7a869c2 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -89,6 +89,7 @@ function js_out(){
     // 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']) . "';";
     // FIXME: Move those to JSINFO
     print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
     print "var DOKU_UHC    = ".((int) useHeading('content')).";";
-- 
cgit v1.2.3


From df5d307ea8bac1f5030d42af363ae9f7469a63f2 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 10 Oct 2013 15:53:03 +0200
Subject: add cookie secure parameter to cookies set by javascript

---
 lib/exe/js.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/exe/js.php')

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)) {
-- 
cgit v1.2.3