From 8fb8df075f002583a17729d24eadaba9fcc82ef0 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 11:31:15 +0100
Subject: [PATCH 1/6] Added comments

---
 website/public/API/edit_friendship.php |  31 -------
 website/public/js/header.js            |  32 +++-----
 website/public/js/menu.js              | 109 +++++++++++--------------
 website/public/js/notifications.js     |  43 ----------
 website/views/notification-center.php  |   2 +-
 5 files changed, 61 insertions(+), 156 deletions(-)
 delete mode 100644 website/public/API/edit_friendship.php
 delete mode 100644 website/public/js/notifications.js

diff --git a/website/public/API/edit_friendship.php b/website/public/API/edit_friendship.php
deleted file mode 100644
index 52aacf5..0000000
--- a/website/public/API/edit_friendship.php
+++ /dev/null
@@ -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");
\ No newline at end of file
diff --git a/website/public/js/header.js b/website/public/js/header.js
index 8d91d95..1e00057 100644
--- a/website/public/js/header.js
+++ b/website/public/js/header.js
@@ -1,25 +1,19 @@
 $(document).ready(function() {
+
+    // Toggle menu
     $("#own-profile-picture").click(function() {
-        if($("#notification-center").css('right') == "-256px") {
-            $(".content").animate({
-                marginRight: "256px"
-            }, 500);
-            $(".chat-right").animate({
-                width: $(".chat-right").width() - 266
-            }, 500);
-            $("#notification-center").animate({
-                right: "0px"
-            }, 500);
+        if ($("#notification-center").css('right') == "-256px") {
+            // Make the menu visible and move the content to the left.
+            $("#chat-history").width("calc(100% - 587px)");
+            $(".modal").width("calc(100% - 512px)");
+            $(".content").css("margin-right", "256px");
+            $("#notification-center").css("right", "0px");
         } else {
-            $(".chat-right").animate({
-                width: $(".chat-right").width() + 266
-            }, 500);
-            $(".content").animate({
-                marginRight: "0px"
-            }, 500);
-            $("#notification-center").animate({
-                right: "-256px"
-            }, 500);
+            // Make the menu invisible and move the content to the right.
+            $("#chat-history").width("calc(100% - 331px)");
+            $(".modal").width("calc(100% - 256px)");
+            $(".content").css("margin-right", "0px");
+            $("#notification-center").css("right", "-256px");
         }
     });
 });
diff --git a/website/public/js/menu.js b/website/public/js/menu.js
index 8329cde..d15d678 100644
--- a/website/public/js/menu.js
+++ b/website/public/js/menu.js
@@ -1,49 +1,28 @@
+var menuFriendsData;
+var menuGroupsData;
+var notificationMessagesData;
+var notificationRequestsData;
+
 
 $(document).ready(function() {
-    // Show more friends/users
-
-    // Show more friends
-    // $("#more-friends-click").click(function() {
-    //     // Show only friends
-    //     $("#groups-menu-section").slideUp();
-    //     $("#friends-menu-section li").show();
-    //
-    //     // Change buttons
-    //     $("#more-friends-click").hide();
-    //     $("#menu-back").show();
-    // });
-    //
-    // // Show more groups
-    // $("#more-groups-click").click(function() {
-    //     // Show only groups
-    //     $("#friends-menu-section").slideUp();
-    //     $("#groups-menu-section li").show();
-    //
-    //     // Change buttons
-    //     $("#more-groups-click").hide();
-    //     $("#menu-back").show();
-    // });
-
-    // // Go back
-    // $("#menu-back").click(function() {
-    //     // Show overview of friends and groups
-    //     $("#friends-menu-section").slideDown();
-    //     $("#groups-menu-section").slideDown();
-    //     $(".extra-menu-items").hide();
-    //
-    //     // Change buttons
-    //     $("#menu-back").hide();
-    //     $("#more-groups-click").show();
-    //     $("#more-friends-click").show();
-    // });
-
     loadMenuFriends(5);
     loadNotificationFriends();
     loadUnreadMessages();
     loadMenuGroups();
+    setInterval(updateMenus, 3000);
 });
 
 
+// Update the menu  and notification items.
+function updateMenus() {
+    loadMenuFriends(5);
+    loadNotificationFriends();
+    loadUnreadMessages();
+    loadMenuGroups();
+}
+
+
+// Get, every 3 seconds, the friends and insert them in the menu.
 function loadMenuFriends(limit) {
     $.post(
         "API/loadFriends.php",
@@ -51,16 +30,18 @@ function loadMenuFriends(limit) {
             limit: 5
         }
     ).done(function(data) {
-        if (showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) {
-            $("#friends-menu-section").show();
-        } else {
-            $("#friends-menu-section").hide();
+        if (menuFriendsData != data) {
+            menuFriendsData = data;
+            if (showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) {
+                $("#friends-menu-section").show();
+            } else {
+                $("#friends-menu-section").hide();
+            }
         }
     });
-
-    setTimeout(loadMenuFriends, 3000, limit);
 }
 
+// Get, every 3 seconds, the groups and insert them in the menu.
 function loadMenuGroups() {
     $.post(
         "API/loadGroups.php",
@@ -68,41 +49,45 @@ function loadMenuGroups() {
             limit: 5
         }
     ).done(function(data) {
-        if (showGroups(data, "#menu-groups-list")) {
-            $("#groups-menu-section").show();
-        } else {
-            $("#groups-menu-section").hide();
+        if (menuGroupsData != data) {
+            menuGroupsData = data;
+            if (showGroups(data, "#menu-groups-list")) {
+                $("#groups-menu-section").show();
+            } else {
+                $("#groups-menu-section").hide();
+            }
         }
     });
-
-    setTimeout(loadMenuGroups, 3000);
 }
 
+// Get, every 3 seconds, the friends requests and insert them in the notification center.
 function loadNotificationFriends() {
     $.post(
         "API/loadFriendRequest.php"
     ).done(function(data) {
-        if (showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) {
-            $("#friend-request-section").show();
-        } else {
-            $("#friend-request-section").hide();
+        if (notificationRequestsData != data) {
+            notificationRequestsData = data;
+            if (showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) {
+                $("#friend-request-section").show();
+            } else {
+                $("#friend-request-section").hide();
+            }
         }
     });
-
-    setTimeout(loadNotificationFriends, 3000);
 }
 
+// Get, every 3 seconds, the unread messages and insert them in the notification center.
 function loadUnreadMessages() {
     $.post(
         "API/loadChatNotifications.php"
     ).done(function(data) {
-        if (showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) {
-            console.log(data);
-            $("#unread-messages-section").show();
-        } else {
-            $("#unread-messages-section").hide();
+        if (notificationMessagesData != data) {
+            notificationMessagesData = data;
+            if (showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) {
+                $("#unread-messages-section").show();
+            } else {
+                $("#unread-messages-section").hide();
+            }
         }
     });
-
-    setTimeout(loadUnreadMessages, 3000);
 }
\ No newline at end of file
diff --git a/website/public/js/notifications.js b/website/public/js/notifications.js
deleted file mode 100644
index d78d167..0000000
--- a/website/public/js/notifications.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// function showChatNotifications(notifications) {
-//     $("#unreadChatlist").html("");
-//     for (i in notifications) {
-//         $("#unreadChatlist").append(" \
-//             <li class='friend-item'> \
-//                 <form action='chat.php' method='get'> \
-//                     <button type='submit' \
-//                             name='chatID' \
-//                             value='"+ notifications[i].userID +"'> \
-//                         <div class='friend'> \
-//                             <img alt='PF' class='profile-picture' src='"+ notifications[i].profilepicture +"'/> \
-//                             <div class='friend-name'> \
-//                                 "+ notifications[i].name +"<br/> \
-//                                 <span style='color: #666'>"+ notifications[i].content +"</span> \
-//                             </div> \
-//                         </div> \
-//                     </button> \
-//                 </form> \
-//             </li> \
-//         ");
-//     }
-// }
-//
-// function loadNotifications() {
-//     $.post(
-//         "API/loadChatNotifications.php"
-//     ).done(function(data) {
-//         if (data && data != "[]") {
-//             $("#unread-messages-section").show();
-//             showChatNotifications(JSON.parse(data));
-//         } else {
-//             $("#unread-messages-section").hide();
-//         }
-//     });
-//
-//     setTimeout(loadNotifications, 10000);
-// }
-// $(document).ready(function() {
-//     loadNotifications();
-// });
-
-
-
diff --git a/website/views/notification-center.php b/website/views/notification-center.php
index 8c01217..ee5622e 100644
--- a/website/views/notification-center.php
+++ b/website/views/notification-center.php
@@ -7,7 +7,7 @@
     </section>
     <section id="friend-request-section">
         <h4>
-            Vriendchapsverzoeken
+            Verzoeken
         </h4>
         <ul class="nav-list" id="friend-requests-list">
 

From 328f0665f3832ef180d3399d6fb6153545d6c6bd Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 26 Jan 2017 11:35:18 +0100
Subject: [PATCH 2/6] add basic post functionality

---
 website/public/API/postComment.php | 16 ++++++++++++++++
 website/public/API/postPost.php    | 17 +++++++++++++++++
 website/queries/post.php           |  2 +-
 website/views/post-view.php        |  5 +++--
 website/views/profile.php          |  6 +++---
 5 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 website/public/API/postComment.php
 create mode 100644 website/public/API/postPost.php

diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php
new file mode 100644
index 0000000..c5b30cc
--- /dev/null
+++ b/website/public/API/postComment.php
@@ -0,0 +1,16 @@
+<?php
+
+session_start();
+
+require("../../queries/post.php");
+require("../../queries/connect.php");
+require("../../queries/checkInput.php");
+
+if (empty($_POST['newcomment-content'])) {
+} else {
+    makeComment($_POST['postID'],
+        $_SESSION['userID'],
+        test_input($_POST['newcomment-content']));
+}
+
+header("Location: ../profile.php");
\ No newline at end of file
diff --git a/website/public/API/postPost.php b/website/public/API/postPost.php
new file mode 100644
index 0000000..b52e96b
--- /dev/null
+++ b/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");
\ No newline at end of file
diff --git a/website/queries/post.php b/website/queries/post.php
index 0183a5d..5940267 100644
--- a/website/queries/post.php
+++ b/website/queries/post.php
@@ -76,7 +76,7 @@ function makePost($userID, $groupID, $title, $content) {
 }
 
 function makeComment($postID, $userID, $content) {
-    $stmt = $_GLOBAL["db"]->prepare("
+    $stmt = $GLOBALS["db"]->prepare("
         INSERT INTO
             `comment` (
                 `postID`, 
diff --git a/website/views/post-view.php b/website/views/post-view.php
index 044c23e..0f091a6 100644
--- a/website/views/post-view.php
+++ b/website/views/post-view.php
@@ -21,8 +21,9 @@ echo("
 
 <div class='post-comments'>
     <div class="commentfield">
-        <form name="newcomment" method="post">
-            <textarea placeholder="Laat een reactie achter..."></textarea> <br>
+        <form action="API/postComment.php" name="newcomment" method="post">
+            <input type="hidden" name="postID" value="<?= $postID ?>">
+            <textarea name="newcomment-content" Laat een reactie achter..."></textarea> <br>
             <input type="submit" value="Reageer!">
         </form>
     </div>
diff --git a/website/views/profile.php b/website/views/profile.php
index 19b9eae..404d957 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -58,9 +58,9 @@
             if ($_SESSION["userID"] === $userID) {
          ?>
                 <div class="post platform">
-                    <form>
-                        <input type="text" class="newpost" placeholder="Titel">
-                        <textarea class="newpost" placeholder="Schrijf een berichtje..."></textarea>
+                    <form action="API/postPost.php" method="post">
+                        <input type="text" name="newpost-title" class="newpost" placeholder="Titel">
+                        <textarea class="newpost" name="newpost-content" placeholder="Schrijf een berichtje..."></textarea>
                         <input type="submit" value="Plaats!">
                     </form>
                 </div>

From 7b7f0b2c6492070f88ac5e1df49902ef70ac2cef Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 11:48:06 +0100
Subject: [PATCH 3/6] Added menu button

---
 website/public/js/header.js      | 2 +-
 website/public/styles/header.css | 6 +++++-
 website/public/styles/menu.css   | 6 +-----
 website/views/header.php         | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/website/public/js/header.js b/website/public/js/header.js
index 1e00057..9889bdb 100644
--- a/website/public/js/header.js
+++ b/website/public/js/header.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {
 
     // Toggle menu
-    $("#own-profile-picture").click(function() {
+    $("#own-profile-picture, #open-notifications").click(function() {
         if ($("#notification-center").css('right') == "-256px") {
             // Make the menu visible and move the content to the left.
             $("#chat-history").width("calc(100% - 587px)");
diff --git a/website/public/styles/header.css b/website/public/styles/header.css
index 0b70455..70e8c80 100644
--- a/website/public/styles/header.css
+++ b/website/public/styles/header.css
@@ -43,6 +43,10 @@ header div {
     width: 64px;
 }
 
-#own-profile-picture {
+#own-profile-picture, #open-notifications {
     cursor: pointer;
 }
+
+#open-notifications {
+    padding: 5px 20px 5px 0px;
+}
\ No newline at end of file
diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css
index 204acd0..7e16443 100644
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -66,13 +66,9 @@
 }
 
 .notification-options {
-    display: none;
-    width: 100%;
-}
-
-.notification-options form {
     width: 100%;
     text-align: center;
+    display: none;
 }
 
 .notification-options button {
diff --git a/website/views/header.php b/website/views/header.php
index 5349a72..8d1a466 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -27,6 +27,7 @@ $userinfo = getHeaderInfo();
             <?=$userinfo["fname"]?>
         </div>
         <img id="own-profile-picture" class="profile-picture" src="<?=$userinfo["profilepicture"]?>"/>
+        <i id="open-notifications" class="fa fa-bars"></i>
     </div>
 </header>
 <?php include("notification-center.php"); ?>

From 91aca6baa740f48958435a3f12ee608cbd8d4e14 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Thu, 26 Jan 2017 12:21:01 +0100
Subject: [PATCH 4/6] change comments to use ajax

---
 website/public/API/postComment.php | 14 ++++++++------
 website/public/js/post.js          | 18 ++++++++++++++++++
 website/public/js/profile.js       |  8 --------
 website/public/profile.php         |  2 +-
 website/views/post-view.php        |  6 +++---
 5 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 website/public/js/post.js

diff --git a/website/public/API/postComment.php b/website/public/API/postComment.php
index c5b30cc..b840e0b 100644
--- a/website/public/API/postComment.php
+++ b/website/public/API/postComment.php
@@ -5,12 +5,14 @@ session_start();
 require("../../queries/post.php");
 require("../../queries/connect.php");
 require("../../queries/checkInput.php");
-
 if (empty($_POST['newcomment-content'])) {
+    echo 0;
 } else {
-    makeComment($_POST['postID'],
+    if(makeComment($_POST['postID'],
         $_SESSION['userID'],
-        test_input($_POST['newcomment-content']));
-}
-
-header("Location: ../profile.php");
\ No newline at end of file
+        test_input($_POST['newcomment-content']))) {
+        echo 1;
+    } else {
+        echo 0;
+    }
+}
\ No newline at end of file
diff --git a/website/public/js/post.js b/website/public/js/post.js
new file mode 100644
index 0000000..62ace68
--- /dev/null
+++ b/website/public/js/post.js
@@ -0,0 +1,18 @@
+function postComment() {
+    $.post(
+        "API/postComment.php",
+        $("#newcommentform").serialize()
+    );
+
+    $("#newcomment").val("");
+
+    //reload post
+    $.get(
+        "API/loadPost.php",
+        $("#newcommentform").serialize()
+    ).done(function (data) {
+        $('#modal-response').html(data);
+    });
+}
+
+
diff --git a/website/public/js/profile.js b/website/public/js/profile.js
index 2a47dce..e69de29 100644
--- a/website/public/js/profile.js
+++ b/website/public/js/profile.js
@@ -1,8 +0,0 @@
-function loadPost(postID) {
-    $.get(
-        "API/loadPost.php",
-        $(postID).serialize()
-    ).done(function (data) {
-        $('#modal-response').innerHTML= JSON.parse(data);
-    });
-}
\ No newline at end of file
diff --git a/website/public/profile.php b/website/public/profile.php
index d2d3c3f..c8f27c4 100644
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -3,7 +3,7 @@
 <head>
     <?php include("../views/head.php"); ?>
     <script src="js/masonry.js"></script>
-<!--    <script src="js/profile.js"></script>-->
+    <script src="js/post.js"></script>
     <style>
         @import url("styles/profile.css");
         @import url("styles/post-popup.css");
diff --git a/website/views/post-view.php b/website/views/post-view.php
index 0f091a6..61e0e05 100644
--- a/website/views/post-view.php
+++ b/website/views/post-view.php
@@ -21,9 +21,9 @@ echo("
 
 <div class='post-comments'>
     <div class="commentfield">
-        <form action="API/postComment.php" name="newcomment" method="post">
-            <input type="hidden" name="postID" value="<?= $postID ?>">
-            <textarea name="newcomment-content" Laat een reactie achter..."></textarea> <br>
+        <form id="newcommentform" action="javascript:postComment();">
+            <input type="hidden" id="newcomment-textarea" name="postID" value="<?= $postID ?>">
+            <textarea id="newcomment" name="newcomment-content" placeholder="Laat een reactie achter..."></textarea> <br>
             <input type="submit" value="Reageer!">
         </form>
     </div>

From 33a640329bde6628bd1630d7218084f94d522b86 Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 13:53:59 +0100
Subject: [PATCH 5/6] Filter on search page

It also works with jquery now
---
 website/public/API/searchGroups.php |  28 +++++++
 website/public/API/searchUsers.php  |  27 +++++++
 website/public/bits/friend-item.php |  42 ++++------
 website/public/bits/group-item.php  |  14 ----
 website/public/styles/main.css      |  14 ++--
 website/public/styles/menu.css      |  19 +++--
 website/queries/friendship.php      |  45 ++++++++++-
 website/queries/group_member.php    |  27 +++++++
 website/queries/group_page.php      |   2 +-
 website/queries/private_message.php |   2 +-
 website/queries/user.php            |  13 ++--
 website/views/header.php            |   1 -
 website/views/menu.php              |  30 ++++---
 website/views/search-view.php       | 117 +++++++++++++++-------------
 14 files changed, 248 insertions(+), 133 deletions(-)
 create mode 100644 website/public/API/searchGroups.php
 create mode 100644 website/public/API/searchUsers.php

diff --git a/website/public/API/searchGroups.php b/website/public/API/searchGroups.php
new file mode 100644
index 0000000..8568b29
--- /dev/null
+++ b/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);
+}
diff --git a/website/public/API/searchUsers.php b/website/public/API/searchUsers.php
new file mode 100644
index 0000000..15b03ed
--- /dev/null
+++ b/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);
+}
diff --git a/website/public/bits/friend-item.php b/website/public/bits/friend-item.php
index 26b97a3..8fdcd16 100644
--- a/website/public/bits/friend-item.php
+++ b/website/public/bits/friend-item.php
@@ -4,12 +4,6 @@ session_start();
 
 include_once ("../../queries/friendship.php");
 
-if (isset($_POST["limit"])) {
-    $limit = $_POST["limit"];
-} else {
-    $limit = 5;
-}
-
 if (isset($_POST["action"])) {
     $action = $_POST["action"];
 } else {
@@ -26,11 +20,6 @@ $friends = json_decode($_POST["friends"]);
 
 foreach($friends as $i => $friend) {
     $friendshipStatus = getFriendshipStatus($friend->userID);
-
-    if ($limit != 0 && $i >= $limit)
-        $extra = "extra-friend-item";
-    else
-        $extra = "";
     ?>
     <li class='friend-item <?= $extra ?>'>
         <form action='<?= $action ?>' method='<?= $actionType ?>'>
@@ -60,15 +49,13 @@ foreach($friends as $i => $friend) {
         </form>
         <?php
         if ($friendshipStatus > 1) {
+            if ($friendshipStatus == 2) {
+                $denyName = "Annuleer";
+            } else {
+                $denyName = "Weiger";
+            }
             ?>
-            <div class='notification-options'>
-                <input type='hidden' name='userID' value='' />
-                <button name='delete'
-                        onclick="editFriendship('<?= $friend->userID ?>', 'delete')"
-                        class='deny-notification'
-                        value='1'>
-                    <i class='fa fa-times'></i>
-                </button>
+                <div class='notification-options'>
             <?php
             if ($friendshipStatus == 3) {
                 ?>
@@ -76,11 +63,19 @@ foreach($friends as $i => $friend) {
                         onclick="editFriendship('<?= $friend->userID ?>', 'accept')"
                         class='accept-notification'
                         value='1'>
-                    <i class='fa fa-check'></i>
+                    <i class='fa fa-check'></i>Accepteer
                 </button>
                 <?php
             }
+
             ?>
+                <input type='hidden' name='userID' value='' />
+                <button name='delete'
+                        onclick="editFriendship('<?= $friend->userID ?>', 'delete')"
+                        class='deny-notification'
+                        value='1'>
+                    <i class='fa fa-times'></i> <?= $denyName ?>
+                </button>
             </div>
             <?php
         }
@@ -89,13 +84,6 @@ foreach($friends as $i => $friend) {
     <?php
 }
 
-if (sizeof($friends) > $limit) {
-    ?>
-    <li class='more-item'>
-        Meer vrienden...
-    </li>
-    <?php
-}
 
 ?>
 
diff --git a/website/public/bits/group-item.php b/website/public/bits/group-item.php
index 0a5831c..92eccfc 100644
--- a/website/public/bits/group-item.php
+++ b/website/public/bits/group-item.php
@@ -22,17 +22,3 @@ foreach($groups as $i => $group) {
     </li>
     <?php
 }
-    ?>
-    <li>
-        <form action="search.php" method="get">
-            <input type="hidden"
-                   name="search"
-                   value="" />
-            <input type="hidden"
-                   name="filter"
-                   value="groups" />
-            <button type="submit">
-                Alle groepen...
-            </button>
-        </form>
-    </li>
diff --git a/website/public/styles/main.css b/website/public/styles/main.css
index b8f39ee..abda8be 100644
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -252,16 +252,20 @@ div[data-title]:hover:after {
     font-family: Arial, sans-serif;
 }
 
-.friend {
-
-}
-
-
 .friend-item, .group-item {
     cursor: pointer;
     transition-duration: 250ms;
 }
 
+.friend-item button, .group-item button {
+    background: none;
+    color: inherit;
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    text-align: left;
+}
+
 .friend-item:hover, .group-item:hover {
     background: #FBC02D;
     box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css
index 7e16443..303b9bc 100644
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -34,15 +34,6 @@
     cursor: pointer;
 }
 
-.menu button {
-    background: none;
-    color: inherit;
-    width: 100%;
-    height: 100%;
-    padding: 0;
-    text-align: left;
-}
-
 #notification-center {
     left: auto;
     width: 236px;
@@ -67,7 +58,6 @@
 
 .notification-options {
     width: 100%;
-    text-align: center;
     display: none;
 }
 
@@ -87,4 +77,13 @@
 
 .friend-item:hover .notification-options {
     display: inline-block;
+}
+
+.menu button {
+    background: none;
+    color: inherit;
+    width: 100%;
+    height: 100%;
+    padding: 0;
+    text-align: left;
 }
\ No newline at end of file
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index 57dacd8..a1a23d8 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -94,7 +94,7 @@ function selectAllFriendRequests() {
             `friendship`.`user2ID` = `user`.`userID` OR 
             `friendship`.`user2ID` = :userID AND
             `friendship`.`user1ID` = `user`.`userID`) AND
-            `user`.`role` != 5 AND
+            `user`.`role` != 'banned' AND
             `friendship`.`status` = 'requested'
     ");
 
@@ -217,4 +217,47 @@ function setLastVisited($friend) {
     $stmt->execute();
 
     return $stmt;
+}
+
+function searchSomeFriends($n, $m, $search) {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+            `userID`,
+            `username`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            IFNULL(
+                `profilepicture`,
+                '../img/avatar-standard.png'
+            ) AS profilepicture,
+            `onlinestatus`,
+            `role`
+        FROM
+            `user`
+        INNER JOIN
+            `friendship`
+        WHERE
+            ((`friendship`.`user1ID` = :userID AND
+            `friendship`.`user2ID` = `user`.`userID` OR 
+            `friendship`.`user2ID` = :userID AND
+            `friendship`.`user1ID` = `user`.`userID`) AND
+            `user`.`role` != 'banned' AND
+            `friendship`.`status` = 'confirmed') AND
+            (`username` LIKE :keyword OR
+             `fname` LIKE :keyword OR
+             `lname` LIKE :keyword)
+    ORDER BY
+      `fname`,
+      `lname`,
+      `username`
+    LIMIT
+      :n, :m
+    ");
+
+    $search = "%$search%";
+    $stmt->bindParam(':keyword', $search);
+    $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT);
+    $stmt->bindParam(':n', $n, PDO::PARAM_INT);
+    $stmt->bindParam(':m', $m, PDO::PARAM_INT);
+    $stmt->execute();
+    return json_encode($stmt->fetchAll());
 }
\ No newline at end of file
diff --git a/website/queries/group_member.php b/website/queries/group_member.php
index a188494..cba339f 100644
--- a/website/queries/group_member.php
+++ b/website/queries/group_member.php
@@ -27,3 +27,30 @@ function selectLimitedGroupsFromUser($userID, $limit) {
     return json_encode($stmt->fetchAll());
 }
 
+function searchSomeOwnGroups($n, $m, $search) {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+        `group_page`.`name`,
+        `group_page`.`picture`
+    FROM
+        `group_page`
+    INNER JOIN
+        `group_member`
+    WHERE
+        `group_member`.`userID` = :userID AND
+        `group_member`.`groupID` = `group_page`.`groupID` AND
+        `group_page`.`status` != 'hidden' AND
+        `name` LIKE :keyword
+    LIMIT
+      :n, :m 
+    ");
+
+    $search = "%$search%";
+    $stmt->bindParam(':keyword', $search);
+    $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT);
+    $stmt->bindParam(':n', $n, PDO::PARAM_INT);
+    $stmt->bindParam(':m', $m, PDO::PARAM_INT);
+    $stmt->execute();
+
+    return json_encode($stmt->fetchAll());
+}
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index 9a3461d..f3de045 100644
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -192,7 +192,7 @@ function searchSomeGroups($n, $m, $search) {
     $stmt->bindParam(':n', $n, PDO::PARAM_INT);
     $stmt->bindParam(':m', $m, PDO::PARAM_INT);
     $stmt->execute();
-    return $stmt;
+    return json_encode($stmt->fetchAll());
 }
 
 function countSomeGroups($search) {
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index e708541..fecea2b 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -83,7 +83,7 @@ function selectAllUnreadChat() {
       `user`.`userID`,
       IFNULL(
           `profilepicture`,
-          '../img/notbad.jpg'
+          '../img/avatar-standard.png'
       ) AS profilepicture,
       LEFT(`private_message`.`content`, 15) as `content`
     FROM
diff --git a/website/queries/user.php b/website/queries/user.php
index be06197..6c4834d 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -316,17 +316,16 @@ function selectRandomNotFriendUser($userID) {
     return $stmt->fetch();
 }
 
-function searchSomeUsers($n, $m, $search)
-{
+function searchSomeUsers($n, $m, $search) {
     $stmt = $GLOBALS["db"]->prepare("
     SELECT
+        `userID`,
         `username`,
         IFNULL(
             `profilepicture`,
-            '../img/notbad.jpg'
+            '../img/avatar-standard.png'
         ) AS profilepicture,
-        `fname`,
-        `lname`
+        LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`
     FROM
       `user`
     WHERE
@@ -345,8 +344,10 @@ function searchSomeUsers($n, $m, $search)
     $stmt->bindParam(':keyword', $search);
     $stmt->bindParam(':n', $n, PDO::PARAM_INT);
     $stmt->bindParam(':m', $m, PDO::PARAM_INT);
+
     $stmt->execute();
-    return $stmt;
+
+    return json_encode($stmt->fetchAll());
 }
 
 function countSomeUsers($search) {
diff --git a/website/views/header.php b/website/views/header.php
index 8d1a466..9d2aa56 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -12,7 +12,6 @@ $userinfo = getHeaderInfo();
             <input name="search"
                    type="text"
                    placeholder="Zoek naar wat je wil"
-                   required
             />
             <button type="submit">
                 <i class="fa fa-search"></i>
diff --git a/website/views/menu.php b/website/views/menu.php
index 4d15d94..ac06c12 100644
--- a/website/views/menu.php
+++ b/website/views/menu.php
@@ -1,25 +1,33 @@
 <nav class="menu">
     <section id="friends-menu-section">
         <h4>
-            Vrienden
+            Top vrienden
         </h4>
         <ul id="menu-friends-list" class="nav-list">
         </ul>
-        <h4><form action="search.php">
-            <input type="hidden"
-                   value="friends"
-                   name="filter" />
-            <button value=""
-                    name="search">
-                Alle vrienden...
-            </button>
-        </form></h4>
     </section>
     <section id="groups-menu-section">
         <h4>
-            Groepen
+            Top groepen
         </h4>
         <ul id="menu-groups-list" class="nav-list">
         </ul>
     </section>
+    <section>
+        <ul class="nav-list">
+            <li>
+                <form action="search.php" method="get">
+                    <input type="hidden"
+                           name="search"
+                           value="" />
+                    <input type="hidden"
+                           name="filter"
+                           value="personal" />
+                    <button type="submit">
+                        Klik voor al je groepen en vrienden...
+                    </button>
+                </form>
+            </li>
+        </ul>
+    </section>
 </nav>
\ No newline at end of file
diff --git a/website/views/search-view.php b/website/views/search-view.php
index 83d5bc0..8d1f0ac 100644
--- a/website/views/search-view.php
+++ b/website/views/search-view.php
@@ -5,11 +5,11 @@ $user_perpage = $group_perpage = 20;
 $user_currentpage = $group_currentpage = 1;
 
 if (isset($_GET['user-pageselect'])) {
-    $user_currentpage = $_GET['user-pageselect'];
+    $user_currentpage = test_input($_GET['user-pageselect']);
 }
 
 if (isset($_GET['group-pageselect'])) {
-    $group_currentpage = $_GET['group-pageselect'];
+    $group_currentpage = test_input($_GET['group-pageselect']);
 }
 
 if (isset($_GET['search'])) {
@@ -17,7 +17,7 @@ if (isset($_GET['search'])) {
 }
 
 if (isset($_GET['filter'])) {
-    $filter = $_GET['filter'];
+    $filter = test_input($_GET['filter']);
 }
 
 $user_n = ($user_currentpage - 1) * $user_perpage;
@@ -45,18 +45,12 @@ $group_count = countSomeGroups($search)->fetchColumn();
                 Filter:
             </label>
             <select name="filter">
+                <option value="personal"
+                    <?php if ($filter == "personal") echo "selected";?>>
+                    Persoonlijk</option>
                 <option value="all"
                     <?php if ($filter == "all") echo "selected";?>>
                     Alles</option>
-                <option value="users"
-                    <?php if ($filter == "users") echo "selected";?>>
-                    Gebruikers</option>
-                <option value="groups"
-                    <?php if ($filter == "groups") echo "selected";?>>
-                    Groepen</option>
-                <option value="friends"
-                    <?php if ($filter == "friends") echo "selected";?>>
-                    Vrienden</option>
             </select>
             <input onclick="document.getElementById('user-pageselect').value = 1;
                             document.getElementById('group-pageselect').value = 1"
@@ -84,31 +78,25 @@ $group_count = countSomeGroups($search)->fetchColumn();
             ?>
         </select>
 
-        <ul class='nav-list'>
-
-        <?php
-        $q = searchSomeUsers($user_n, $user_perpage, $search);
-
-        while ($user = $q->fetch(PDO::FETCH_ASSOC)) {
-            $username = $user['username'];
-            $profilepic = $user['profilepicture'];
-            $fname = $user['fname'];
-            $lname = $user['lname'];
-
-            echo("
-                <a href='https://myhyvesbookplus.nl/profile?username=$username'>
-                    <li class='search-item'>
-                        <div class='friend'>
-                            <img class='profile-picture' 
-                                 src='$profilepic'>
-                            $fname $lname ($username)
-                        </div>
-                    </li>
-                </a>
-            ");
-        }
-        ?>
+        <ul id='search-users-list' class='nav-list'>
 
+            <script>
+            $(document).ready(function(){
+                $.post(
+                    "API/searchUsers.php",
+                    {
+                        n: "<?= $user_n ?>",
+                        m: "<?= $user_perpage ?>",
+                        search: "<?= $search ?>",
+                        filter: "<?= $filter ?>"
+                    }
+                ).done(function(data) {
+                    if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
+                        $("#search-friends-output").append("Niemand gevonden");
+                    }
+                });
+            });
+            </script>
         </ul>
     </div>
 
@@ -131,27 +119,44 @@ $group_count = countSomeGroups($search)->fetchColumn();
             ?>
         </select>
 
-        <ul class="nav-list">
-
+        <ul id="search-groups-list" class="nav-list">
+            <script>
+                $(document).ready(function(){
+                    $.post(
+                        "API/searchGroups.php",
+                        {
+                            n: "<?= $group_n ?>",
+                            m: "<?= $group_perpage ?>",
+                            search: "<?= $search ?>",
+                            filter: "<?= $filter ?>"
+                        }
+                    ).done(function(data) {
+                        console.log(data);
+                        if (!showGroups(data, "#search-groups-list")) {
+                            $("#search-groups-list").append("Geen groepen gevonden");
+                        }
+                    });
+                });
+            </script>
         <?php
-        $q = searchSomeGroups($group_n, $user_perpage, $search);
-
-        while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
-            $groupname = $group['name'];
-            $grouppic = $group['picture'];
-
-            echo("
-            <a href='https://myhyvesbookplus.nl/group?groupName=$groupname'>
-                <li class='search-item'>
-                    <div class='group'>
-                        <img class='group-picture' 
-                             src='$grouppic'>
-                        $groupname
-                    </div>
-                </li>
-            </a>
-            ");
-        }
+//        $q = searchSomeGroups($group_n, $user_perpage, $search);
+//
+//        while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
+//            $groupname = $group['name'];
+//            $grouppic = $group['picture'];
+//
+//            echo("
+//            <a href='https://myhyvesbookplus.nl/group?groupName=$groupname'>
+//                <li class='search-item'>
+//                    <div class='group'>
+//                        <img class='group-picture'
+//                             src='$grouppic'>
+//                        $groupname
+//                    </div>
+//                </li>
+//            </a>
+//            ");
+//        }
         ?>
         </ul>
     </div>

From feb64002f54e0789c8ba29c7e181f20f7dd9dfac Mon Sep 17 00:00:00 2001
From: Lars van Hijfte <larsvanhijfte@hotmail.com>
Date: Thu, 26 Jan 2017 14:12:04 +0100
Subject: [PATCH 6/6] Live search

---
 website/public/js/search.js   | 33 +++++++++++++++++++++
 website/public/search.php     |  2 ++
 website/views/search-view.php | 56 +++++------------------------------
 3 files changed, 42 insertions(+), 49 deletions(-)
 create mode 100644 website/public/js/search.js

diff --git a/website/public/js/search.js b/website/public/js/search.js
new file mode 100644
index 0000000..b3c322a
--- /dev/null
+++ b/website/public/js/search.js
@@ -0,0 +1,33 @@
+function searchUsers(n, m) {
+    $.post(
+        "API/searchUsers.php",
+        {
+            n: n,
+            m: m,
+            search: $("#search-input").val(),
+            filter: $("#search-filter").val()
+        }
+    ).done(function(data) {
+        console.log(data);
+        if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
+            $("#search-users-list").text("Niemand gevonden");
+        }
+    });
+}
+
+function searchGroups(n, m) {
+    $.post(
+        "API/searchGroups.php",
+        {
+            n: n,
+            m: m,
+            search: $("#search-input").val(),
+            filter: $("#search-filter").val()
+        }
+    ).done(function(data) {
+        console.log(data);
+        if (!showGroups(data, "#search-groups-list")) {
+            $("#search-groups-list").text("Geen groepen gevonden");
+        }
+    });
+}
\ No newline at end of file
diff --git a/website/public/search.php b/website/public/search.php
index 6cfadd8..fbb0bc2 100644
--- a/website/public/search.php
+++ b/website/public/search.php
@@ -9,6 +9,8 @@
     <style>
         @import url("styles/search.css");
     </style>
+
+    <script src="js/search.js"></script>
 </head>
 <body>
 <?php
diff --git a/website/views/search-view.php b/website/views/search-view.php
index 8d1f0ac..392ea45 100644
--- a/website/views/search-view.php
+++ b/website/views/search-view.php
@@ -37,14 +37,18 @@ $group_count = countSomeGroups($search)->fetchColumn();
                 Zoek:
             </label>
             <input type="text"
+                   id="search-input"
                    name="search"
+                   onkeyup="
+                           searchUsers(<?= $user_n ?>, <?= $user_perpage ?>);
+                           searchGroups(<?= $group_n ?>, <?= $group_perpage ?>);"
                    placeholder="Zoek"
                    value=<?php echo "$search";?>
             >
             <label for="filter">
                 Filter:
             </label>
-            <select name="filter">
+            <select name="filter" id="search-filter">
                 <option value="personal"
                     <?php if ($filter == "personal") echo "selected";?>>
                     Persoonlijk</option>
@@ -79,22 +83,9 @@ $group_count = countSomeGroups($search)->fetchColumn();
         </select>
 
         <ul id='search-users-list' class='nav-list'>
-
             <script>
             $(document).ready(function(){
-                $.post(
-                    "API/searchUsers.php",
-                    {
-                        n: "<?= $user_n ?>",
-                        m: "<?= $user_perpage ?>",
-                        search: "<?= $search ?>",
-                        filter: "<?= $filter ?>"
-                    }
-                ).done(function(data) {
-                    if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
-                        $("#search-friends-output").append("Niemand gevonden");
-                    }
-                });
+                searchUsers(<?= $user_n ?>, <?= $user_perpage ?>);
             });
             </script>
         </ul>
@@ -122,42 +113,9 @@ $group_count = countSomeGroups($search)->fetchColumn();
         <ul id="search-groups-list" class="nav-list">
             <script>
                 $(document).ready(function(){
-                    $.post(
-                        "API/searchGroups.php",
-                        {
-                            n: "<?= $group_n ?>",
-                            m: "<?= $group_perpage ?>",
-                            search: "<?= $search ?>",
-                            filter: "<?= $filter ?>"
-                        }
-                    ).done(function(data) {
-                        console.log(data);
-                        if (!showGroups(data, "#search-groups-list")) {
-                            $("#search-groups-list").append("Geen groepen gevonden");
-                        }
-                    });
+                    searchGroups(<?= $group_n ?>, <?= $group_perpage ?>);
                 });
             </script>
-        <?php
-//        $q = searchSomeGroups($group_n, $user_perpage, $search);
-//
-//        while ($group = $q->fetch(PDO::FETCH_ASSOC)) {
-//            $groupname = $group['name'];
-//            $grouppic = $group['picture'];
-//
-//            echo("
-//            <a href='https://myhyvesbookplus.nl/group?groupName=$groupname'>
-//                <li class='search-item'>
-//                    <div class='group'>
-//                        <img class='group-picture'
-//                             src='$grouppic'>
-//                        $groupname
-//                    </div>
-//                </li>
-//            </a>
-//            ");
-//        }
-        ?>
         </ul>
     </div>
 </div>