Readme.md

readme.md

@@ -0,0 +1,20 @@
+#MyHyvesbook+
+## Samenstelling van Groep
+- Lars van Hijfte (11291680)
+- Hendrik Huang (11342374)
+- Marijn Jansen (11166932)
+- Kevin Nobel (11319801)
+- Joey Lai (11057122)
+
+## URL naar website
+[MyHyvesbook+](https://myhyvesbookplus.nl/)
+
+## Inloggegevens
+Username `NakijkAdmin`
+Password `HgzCVGHh7fdR`
+
+## Site draaiend krijgen op een server
+De map `public` moet de `root`-folder zijn van de website.
+Een map daarboven moeten de `queries` en `views` geplaatst worden.
+De gegevens om met de database te verbinden staan in `/var/mysql_config.xml`.
+De map `uploads` (en alles daarin) in de `public`-folder is eigendom van `www-data` zodat de server hier naar kan schrijven.

website/public/API/searchPageNumber.php

@@ -6,11 +6,11 @@ require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/user.php");
 require_once ("../../queries/group_page.php");
-require_once ("../../queries/friendship.php");
-require_once ("../../queries/group_member.php");
 
 if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {$user_perpage = $group_perpage = 20;
+    getRoleByID($_SESSION["userID"]) != 'banned') {
+
+    $user_perpage = $group_perpage = 20;
 
     $user_currentpage = $group_currentpage = 1;
     if (isset($_POST['user-pageselect'])) {
@@ -28,20 +28,14 @@ if (isset($_SESSION["userID"]) &&
         $search = test_input($_POST['search']);
     }
 
+    $user_count = countSomeUsers($search)->fetchColumn();
+    $group_count = countSomeGroups($search)->fetchColumn();
+
     $filter = "all";
     if (isset($_POST['filter'])) {
         $filter = test_input($_POST['filter']);
     }
 
-    if ($filter == "all") {
-        $user_count = countSomeUsers($search)->fetchColumn();
-        $group_count = countSomeGroups($search)->fetchColumn();
-    } else {
-        $user_count = countSomeFriends($search);
-        $group_count = countSomeOwnGroups($search);
-    }
-
-
     $option = "user";
     if (isset($_POST['option'])) {
         $option = test_input($_POST['option']);

website/queries/friendship.php

@@ -276,34 +276,3 @@ function searchSomeFriends($n, $m, $search) {
     $stmt->execute();
     return json_encode($stmt->fetchAll());
 }
-
-function countSomeFriends($search) {
-    $stmt = prepareQuery("
-    SELECT
-            COUNT(*)
-        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`
-    ");
-
-    $search = "%$search%";
-    $stmt->bindParam(':keyword', $search);
-    $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT);
-    $stmt->execute();
-    return $stmt->fetchColumn();
-}

website/queries/group_member.php

@@ -55,29 +55,6 @@ function searchSomeOwnGroups($n, $m, $search) {
     return json_encode($stmt->fetchAll());
 }
 
-function countSomeOwnGroups($search) {
-    $stmt = prepareQuery("
-    SELECT
-        COUNT(*)
-    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
-    ");
-
-    $search = "%$search%";
-    $stmt->bindParam(':keyword', $search);
-    $stmt->bindParam(':userID', $_SESSION["userID"], PDO::PARAM_INT);
-    $stmt->execute();
-
-    return $stmt->fetchColumn();
-}
-
 function addMember($groupID, $userID, $role) {
     $stmt = prepareQuery("
     INSERT INTO

website/views/search-view.php

@@ -48,12 +48,7 @@ $group_n = ($group_currentpage - 1) * $group_perpage;
             <label for="filter">
                 Filter:
             </label>
-            <select name="filter"
+            <select name="filter" id="search-filter">
-                    id="search-filter"
-                    onchange="$('#user-pagenumber, #group-pagenumber').prop('value', 1);
-                           searchUsers();
-                           searchGroups();
-                           pageNumber();">
                 <option value="personal"
                     <?php if ($filter == "personal") echo "selected";?>>
                     Persoonlijk</option>