Make tags belong to the canvas, not the user

canvas/js/canvas.js

@@ -493,7 +493,7 @@ $(document).ready(function() {
             url: "php/get-tags.php",
             dataType: "JSON",
             data: {
-                "username": username
+                "canvas_id": canvasId
             },
             timeout: 5000,
             success: function(returnData) {
@@ -572,7 +572,7 @@ $(document).ready(function() {
         Should this still become an issue later on, try increasing the amount of milliseconds.
          */
         window.setTimeout(function() {
-            // For every added item
+            // For every added item            
             $("li.added_item .expandable").each(function() {            
                 // Declarations
                 // var instanceCounter;
@@ -627,15 +627,13 @@ $(document).ready(function() {
     
     // Get the tags from the database
     function getTags() {
-        // Declarations
-        
         // AJAX
         $.ajax({
             type: "POST",
             url: "php/get-tags.php",
             dataType: "JSON",
             data: {
-                "username": username
+                "canvas_id": canvasId
             },
             timeout: 5000,
             success: function(returnData) {
@@ -684,7 +682,7 @@ $(document).ready(function() {
             dataType: "text",
             data: {
                 "tag": tagToAJAX,
-                "username": username
+                "canvas_id": canvasId
             },
             timeout: 5000,
             success: function(returnData) {
@@ -750,7 +748,7 @@ $(document).ready(function() {
             dataType: "text",
             data: {
                 "tag": tagToAJAX,
-                "username": username
+                "canvas_id": canvasId
             },
             timeout: 5000,
             success: function(returnData) {
@@ -782,7 +780,7 @@ $(document).ready(function() {
             dataType: "JSON",
             data: {
                 "tag": tagToAJAX,
-                "username": username
+                "canvas_id": canvasId
             },
             timeout: 5000,
             success: function(returnData) {
@@ -896,7 +894,7 @@ $(document).ready(function() {
                 data: {
                     "tag": tagToAJAX,
                     "description": description,
-                    "username": username
+                    "canvas_id": canvasId
                 },
                 url: "php/save-tag.php",
                 success: function() {
@@ -935,7 +933,7 @@ $(document).ready(function() {
             type: "post",
             data: {
                 "tag": tagToAJAX,
-                "username": username
+                "canvas_id": canvasId
             },
             url: "php/delete-tag.php",
             success: function() {

canvas/php/delete-tag.php

@@ -7,10 +7,10 @@
         
         // Incoming data
         $tag = $_POST["tag"];
-        $username = $_POST["username"];
+        $canvasId = $_POST["canvas_id"];
         
         // Declare query
-        $query = "DELETE FROM tags WHERE tag = '" . $tag . "' AND username = '" . $username . "';";
+        $query = "DELETE FROM tags WHERE tag = '" . $tag . "' AND canvas_id = '" . $canvasId . "';";
         
         // Run query
         db_query_no_return($database, $query);

canvas/php/get-similar-tags.php

@@ -7,10 +7,10 @@
         
         // Incoming data
         $currentTag = $_POST["tag"];
-        $username = $_POST["username"];
+        $canvasId = $_POST["canvas_id"];
         
         // Declare query
-        $query = "SELECT tag, description, username FROM tags WHERE NOT username='" . $username . "' ORDER BY tag;";
+        $query = "SELECT tag, description, canvas_id FROM tags WHERE NOT canvas_id='" . $canvasId . "' ORDER BY tag;";
         
         // Run query
         $recordSet = db_query_return($database, $query);
@@ -28,7 +28,7 @@
             if($percentage > 75) {
                 $tags[$index]["tag"] = $record["tag"];
                 $tags[$index]["description"] = $record["description"];
-                $tags[$index]["username"] = $record["username"];
+                $tags[$index]["canvas_id"] = $record["canvas_id"];
                 $tags[$index]["percentage"] = $percentage;
                 $index++;
             }

canvas/php/get-tags.php

@@ -6,10 +6,10 @@
         $database = db_connect();
         
         // Incoming data
-        $username = $_POST["username"];
+        $canvasId = $_POST["canvas_id"];
         
         // Declare query
-        $query = "SELECT tag FROM tags WHERE username = '" . $username . "' ORDER BY tag;";
+        $query = "SELECT tag FROM tags WHERE canvas_id = '" . $canvasId . "' ORDER BY tag;";
         
         // Run query
         $recordSet = db_query_return($database, $query);

canvas/php/save-tag.php

@@ -8,10 +8,10 @@
         // Incoming data
         $tag = $_POST["tag"];
         $description = $_POST["description"];
-        $username = $_POST["username"];
+        $canvasId = $_POST["canvas_id"];
         
         // Check if the tag already exists
-        $query = "SELECT tag FROM tags WHERE tag = '" . $tag . "' AND username = '" . $username . "';";
+        $query = "SELECT tag FROM tags WHERE tag = '" . $tag . "' AND canvas_id = '" . $canvasId . "';";
         
         $recordSet = db_query_return($database, $query);
         
@@ -22,12 +22,12 @@
         // If the tag already exists in the database
         if($tagCheck == $tag) {
             // Update description
-            $query = "UPDATE tags SET description='" . $description . "' WHERE tag='" . $tag . "' AND username='" . $username . "';";
+            $query = "UPDATE tags SET description='" . $description . "' WHERE tag='" . $tag . "' AND canvas_id='" . $canvasId . "';";
         }
         // Else if the tag is new
         else {
             // Add new tag
-            $query = "INSERT INTO tags (tag, description, username) VALUES ('" . $tag . "', '" . $description . "', '" . $username . "');";
+            $query = "INSERT INTO tags (tag, description, canvas_id) VALUES ('" . $tag . "', '" . $description . "', '" . $canvasId . "');";
         }
         
         // Insert new or update old description