Merge branch 'master' into hendrik-post

website/public/API/edit_friendship.php

@@ -0,0 +1,31 @@
+<?php
+session_start();
+
+require("../../queries/friendship.php");
+require("../../queries/user.php");
+
+if(empty($_POST["userID"]) OR empty($_POST["delete"]) AND empty($_POST["accept"]) AND empty($_POST["request"])) {
+    echo "Not enough arguments.";
+    return;
+}
+
+$friendship_status = getFriendshipStatus($_POST["userID"]);
+echo "\nfriendshipstatus: $friendship_status";
+echo "You: " . $_SESSION["userID"];
+echo "other user: " . $_POST["userID"];
+
+
+if(!empty($_POST["request"]) AND $friendship_status == 0) {
+    echo "request";
+    requestFriendship($_POST["userID"]);
+} else if(!empty($_POST["delete"]) AND in_array($friendship_status, array(1, 2, 3))) {
+    echo "delete";
+    removeFriendship($_POST["userID"]);
+} else if (!empty($_POST["accept"]) AND $friendship_status == 3) {
+    echo "accept";
+    acceptFriendship($_POST["userID"]);
+}
+
+$username = getUsername($_POST["userID"]);
+
+header("Location: ../profile.php?username=$username");

website/public/API/loadChatNotifications.php

@@ -3,6 +3,6 @@
 session_start();
 
 require_once ("../../queries/connect.php");
-require_once ("../../queries/friendship.php");
+require_once ("../../queries/private_message.php");
 
 echo selectAllUnreadChat();

website/public/API/loadMessages.php

@@ -5,9 +5,12 @@ session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
+require_once("../../queries/friendship.php");
 
 if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
     echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
+    setLastVisited(test_input($_POST["destination"]));
 } else {
     echo getOldChatMessages(test_input($_POST["destination"]));
+    setLastVisited(test_input($_POST["destination"]));
 }