Merge branch 'master' into marijn-nietslecht

website/public/API/edit_friendship.php

@@ -1,31 +0,0 @@
-<?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/getPosts.php

@@ -0,0 +1,24 @@
+<?php
+
+if(empty($_POST["usr"])) {
+    header('HTTP/1.1 500 Non enough arguments');
+}
+
+require_once ("../../queries/user.php");
+require_once ("../../queries/nicetime.php");
+
+$posts = selectAllUserPosts($_POST["usr"]);
+
+if(!$posts) {
+    header('HTTP/1.1 500 Query failed');
+}
+
+$results = $posts->fetchAll(PDO::FETCH_ASSOC);
+
+for($i = 0; $i < sizeof($results); $i++) {
+    $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
+}
+
+//$results[0]["niceTime"] = nicetime($results[0]["creationdate"]);
+
+echo json_encode($results);

website/public/API/postComment.php

@@ -0,0 +1,18 @@
+<?php
+
+session_start();
+
+require("../../queries/post.php");
+require("../../queries/connect.php");
+require("../../queries/checkInput.php");
+if (empty($_POST['newcomment-content'])) {
+    echo 0;
+} else {
+    if(makeComment($_POST['postID'],
+        $_SESSION['userID'],
+        test_input($_POST['newcomment-content']))) {
+        echo 1;
+    } else {
+        echo 0;
+    }
+}

website/public/API/postPost.php

@@ -0,0 +1,17 @@
+<?php
+
+session_start();
+
+require("../../queries/post.php");
+require("../../queries/connect.php");
+require("../../queries/checkInput.php");
+
+if (empty($_POST['newpost-title'])) {
+} else {
+    makePost($_SESSION['userID'],
+             null,
+             test_input($_POST['newpost-title']),
+             test_input($_POST['newpost-content']));
+}
+
+header("Location: ../profile.php");

website/public/API/searchGroups.php

@@ -0,0 +1,28 @@
+<?php
+
+
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/group_member.php");
+require_once ("../../queries/group_page.php");
+
+$n = 0;
+if (isset($_POST["n"])) {
+    $n = (int) test_input($_POST["n"]);
+}
+$m = 20;
+if (isset($_POST["m"])) {
+    $m = (int) test_input($_POST["m"]);
+}
+$search = "";
+if (isset($_POST["search"])) {
+    $search = test_input($_POST["search"]);
+}
+
+if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
+    echo searchSomeOwnGroups($n, $m, $search);
+} else {
+    echo searchSomeGroups($n, $m, $search);
+}

website/public/API/searchUsers.php

@@ -0,0 +1,27 @@
+<?php
+
+session_start();
+
+require_once ("../../queries/connect.php");
+require_once ("../../queries/checkInput.php");
+require_once ("../../queries/friendship.php");
+require_once ("../../queries/user.php");
+
+$n = 0;
+if (isset($_POST["n"])) {
+    $n = (int) test_input($_POST["n"]);
+}
+$m = 20;
+if (isset($_POST["m"])) {
+    $m = (int) test_input($_POST["m"]);
+}
+$search = "";
+if (isset($_POST["search"])) {
+    $search = test_input($_POST["search"]);
+}
+
+if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
+    echo searchSomeFriends($n, $m, $search);
+} else {
+    echo searchSomeUsers($n, $m, $search);
+}