From 977757b2d33c1b9eb2cfb173ee7b25f3d5c46331 Mon Sep 17 00:00:00 2001
From: "K. Nobel" <kevlebon@gmailcom>
Date: Wed, 25 Jan 2017 15:42:28 +0100
Subject: [PATCH] Made small improvements to friendship buttons and
 corresponding API files.

---
 website/public/API/editFriendship.php      |  1 -
 website/public/API/getFriendshipStatus.php |  1 -
 website/public/js/friendButtons.js         | 27 ++++++++++++++++++
 website/public/profile.php                 | 32 +---------------------
 4 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 website/public/js/friendButtons.js

diff --git a/website/public/API/editFriendship.php b/website/public/API/editFriendship.php
index 721bf90..0518733 100644
--- a/website/public/API/editFriendship.php
+++ b/website/public/API/editFriendship.php
@@ -2,7 +2,6 @@
 
 session_start();
 
-require_once ("../../queries/connect.php");
 require_once ("../../queries/friendship.php");
 
 if(empty($_POST["usr"]) OR empty($_POST["action"]) OR !in_array($_POST["action"], array("request", "accept", "delete"))) {
diff --git a/website/public/API/getFriendshipStatus.php b/website/public/API/getFriendshipStatus.php
index a893331..01bd6c4 100644
--- a/website/public/API/getFriendshipStatus.php
+++ b/website/public/API/getFriendshipStatus.php
@@ -9,7 +9,6 @@
 
 session_start();
 
-require_once ("../../queries/connect.php");
 require_once ("../../queries/friendship.php");
 
 if(empty($_POST["usr"])) {
diff --git a/website/public/js/friendButtons.js b/website/public/js/friendButtons.js
new file mode 100644
index 0000000..94d6093
--- /dev/null
+++ b/website/public/js/friendButtons.js
@@ -0,0 +1,27 @@
+function placeFriendButtons() {
+    $.post("API/getFriendshipStatus.php", { usr: userID })
+        .done(function(data) {
+            friendshipStatus = data;
+            $buttonContainer = $("div.friend-button-container");
+            $buttonContainer.children().remove();
+            if (friendshipStatus == -1) {
+                return;
+            } else if(friendshipStatus == 0) {
+                $buttonContainer.append($("<button class=\"green friend-button\" value=\"request\"><i class=\"fa fa-handshake-o\"></i> Bevriend</button>"));
+            } else if(friendshipStatus == 1) {
+                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Verwijder</button>"));
+            } else if(friendshipStatus == 2) {
+                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Trek verzoek in</button>"));
+            } else if(friendshipStatus == 3) {
+                $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Weiger</button>"));
+                $buttonContainer.append($("<button class=\"green friend-button\" value=\"accept\"><i class=\"fa fa-check\"></i> Accepteer</button>"));
+            }
+
+            $buttonContainer.children().click(function() {
+                $.post("API/editFriendship.php", { usr: userID, action: this.value })
+                    .done(function() {
+                        placeFriendButtons();
+                    });
+            });
+        });
+}
\ No newline at end of file
diff --git a/website/public/profile.php b/website/public/profile.php
index aeea68b..6e188c4 100644
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -44,42 +44,12 @@ include("../views/profile.php");
 include("../views/footer.php");
 ?>
 
-<script>
-
-</script>
+<script src="js/friendButtons.js"></script>
 <script>
     $(document).ready(function() {
         userID = <?= $userID ?>;
         placeFriendButtons();
     });
-
-    function placeFriendButtons() {
-        $.post("API/getFriendshipStatus.php", { usr: userID })
-            .done(function(data) {
-                friendshipStatus = data;
-                $buttonContainer = $("div.friend-button-container");
-                $buttonContainer.children().remove();
-                if (friendshipStatus == -1) {
-                    return;
-                } else if(friendshipStatus == 0) {
-                    $buttonContainer.append($("<button class=\"green friend-button\" value=\"request\"><i class=\"fa fa-handshake-o\"></i> Bevriend</button>"));
-                } else if(friendshipStatus == 1) {
-                    $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Verwijder</button>"));
-                } else if(friendshipStatus == 2) {
-                    $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Trek verzoek in</button>"));
-                } else if(friendshipStatus == 3) {
-                    $buttonContainer.append($("<button class=\"red friend-button\" value=\"delete\"><i class=\"fa fa-times\"></i> Weiger</button>"));
-                    $buttonContainer.append($("<button class=\"green friend-button\" value=\"accept\"><i class=\"fa fa-check\"></i> Accepteer</button>"));
-                }
-
-                $buttonContainer.children().click(function() {
-                    $.post("API/editFriendship.php", { usr: userID, action: this.value })
-                        .done(function() {
-                            placeFriendButtons();
-                        });
-                });
-            });
-    }
 </script>
 </body>
 </html>