Fix #83 by setting the cookie for the root path, it was previously

setting the cookies for every sub folder, I am amazed how this worked until now
supertuxkart · Oct 30, 2017 · 14ce82b · 14ce82b
1 parent 69bd03b
commit 14ce82b
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 8 deletions.
diff --git a/assets/js/addon.js b/assets/js/addon.js
@@ -174,7 +174,7 @@
             EMPTY_FUNCTION, "GET");
     });
 
-    // addon proprieties changed
+    // addon properties changed
     addonFormSubmit("#addon-edit-props", function(data) {
         jsonCallback(data, function() {
             // update view

diff --git a/assets/js/util.js b/assets/js/util.js
@@ -233,18 +233,23 @@ function getByID(id) {
 /**
  * Parse a json string
  *
- * @param {string} raw_string the json string
+ * @param {string|object} raw_string_or_object the json string
  *
  * @return {object} the parsed json data, or empty object if there was an error, and message written to the console
  */
-function parseJSON(raw_string) {
+function parseJSON(raw_string_or_object) {
+    // already an object return
+    if (_.isObject(raw_string_or_object)) {
+        return raw_string_or_object;
+    }
+
     var jData = {}; // silently fail on the client side
 
     try {
-        jData = JSON.parse(raw_string);
+        jData = JSON.parse(raw_string_or_object);
     } catch (e) {
         console.error("Parson JSON error: ", e);
-        console.error("Raw string: ", raw_string);
+        console.error("Raw string: ", raw_string_or_object);
     }
 
     return jData;

diff --git a/include/Addon.class.php b/include/Addon.class.php
@@ -1665,7 +1665,7 @@ public static function search($search_query, $type, array $search_flags)
                 if ($e->getCode() == ErrorType::ADDON_REVISION_MISSING)
                 {
                     // ignore corrupt addon
-                    Debug::addMessage("No revision for addon = " . $addon['name']);
+                    Debug::addMessage("No revision for addon = " . $addon['id']);
                 }
                 else
                 {

diff --git a/include/Session.class.php b/include/Session.class.php
@@ -187,7 +187,7 @@ public static function start($name = "STK_SESSID", $lifetime_sec = 21600)
         {
             // apparently session_set_cookie_params does not work, see first comment on this page
             // https://secure.php.net/manual/ro/function.session-set-cookie-params.php
-            setcookie(session_name(), session_id(), time() + $lifetime_sec);
+            setcookie(session_name(), session_id(), time() + $lifetime_sec, "/");
         }
         else
         {

diff --git a/json/addons.php b/json/addons.php
@@ -20,13 +20,14 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (empty($_POST["action"]))
 {
     exit_json_error("action param is not defined or is empty");
 }
 if (!User::isLoggedIn())
 {
-    exit_json_error("You are not logged in");
+    exit_json_error("You are not logged in.");
 }
 
 

diff --git a/json/bugs.php b/json/bugs.php
@@ -19,6 +19,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (empty($_POST["action"]))
 {
     exit_json_error("action param is not defined or is empty");

diff --git a/json/image_list.php b/json/image_list.php
@@ -26,6 +26,7 @@
 
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 // Quit if no ID was passed
 if (!isset($_GET['id']))
 {

diff --git a/json/license.php b/json/license.php
@@ -26,6 +26,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 // Quit if no ID was passed
 if (!isset($_GET['id']))
 {

diff --git a/json/manage.php b/json/manage.php
@@ -19,6 +19,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (!isset($_POST["action"]) || empty($_POST["action"]))
 {
     exit_json_error("action param is not defined or is empty");

diff --git a/json/rating.php b/json/rating.php
@@ -20,6 +20,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (empty($_GET['addon-id']))
 {
     exit_json_error('No addon id provided');

diff --git a/json/search.php b/json/search.php
@@ -20,6 +20,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (empty($_GET["data-type"]))
 {
     exit_json_error("data-type param is not defined or is empty");

diff --git a/json/users.php b/json/users.php
@@ -19,6 +19,7 @@
  */
 require_once(dirname(__DIR__) . DIRECTORY_SEPARATOR . "config.php");
 
+header("Content-Type: application/json");
 if (!isset($_POST["action"]))
 {
     exit_json_error("action param is not defined or is empty");