End of day

website/public/API/adminChangeUser.php

@@ -3,29 +3,18 @@ session_start();
 
 require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
-require_once ("../../queries/group_page.php");
 require_once ("../../queries/user.php");
+require_once ("../../queries/group_page.php");
 
-if (isset($_SESSION["userID"]) &&
+if (isset($_POST["actions"]) && isset($_POST["userID"])) {
-    (getRoleByID($_SESSION["userID"]) == 'admin' ||
+    changeUserStatusByID($_POST["userID"], $_POST["actions"]);
-     getRoleByID($_SESSION["userID"]) == 'owner')) {
+} else if (isset($_POST["actions"]) && isset($_POST["groupID"])) {
-    $userinfo = getRoleByID($_SESSION['userID']);
+    changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
+} else if (isset($_POST["batchactions"]) && isset($_POST["checkbox-user"])) {
+    changeMultipleUserStatusByID($_POST["checkbox-user"], $_POST["batchactions"]);
+} else if (isset($_POST["groupbatchactions"]) && isset($_POST["checkbox-group"])) {
+    changeMultipleGroupStatusByID($_POST["checkbox-group"], $_POST["groupbatchactions"]);
+}
 
-    if (isset($_POST["actions"]) && isset($_POST["userID"])) {
+//header("location: ../admin.php");
-        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
+print_r($_POST);
-    } else if (isset($_POST["actions"]) && isset($_POST["groupID"])) {
-        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
-    } else if (isset($_POST["batchactions"]) && isset($_POST["checkbox-user"])) {
-        if ($userinfo == 'owner') {
-            changeMultipleUserStatusByID($_POST["checkbox-user"], $_POST["batchactions"]);
-        } else {
-            changeMultipleUserStatusByIDAdmin($_POST["checkbox-user"], $_POST["batchactions"]);
-        }
-    } else if (isset($_POST["groupbatchactions"]) && isset($_POST["checkbox-group"])) {
-        changeMultipleGroupStatusByID($_POST["checkbox-group"], $_POST["groupbatchactions"]);
-    } else if (isset($_POST['bancommentuserID']) && isset($_POST['bancommenttext'])) {
-        editBanCommentByID($_POST['bancommentuserID'], $_POST['bancommenttext']);
-    }
-} else {
-    header('HTTP/1.0 403 Forbidden');
-}

website/public/API/adminPageNumber.php

@@ -5,40 +5,24 @@ session_start();
 require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/user.php");
-require_once ("../../queries/group_page.php");
 
-if (isset($_SESSION["userID"]) &&
+$search = "";
-    (getRoleByID($_SESSION["userID"]) == 'admin' ||
+if (isset($_POST["search"])) {
-     getRoleByID($_SESSION["userID"]) == 'owner')) {
+    $search = test_input($_POST["search"]);
-    $search = "";
+}
-    if (isset($_POST["search"])) {
-        $search = test_input($_POST["search"]);
-    }
 
-    $pagetype = "user";
+$pagetype = "user";
-    if (isset($_POST['pagetype'])) {
+if (isset($_POST['pagetype'])) {
-        $pagetype = test_input($_POST['pagetype']);
+    $pagetype = test_input($_POST['pagetype']);
-    }
+}
 
-    $status = array();
+$status = array();
-    if (isset($_POST['status'])) {
+if (isset($_POST['status'])) {
-        $status = $_POST["status"];
+    $status = $_POST["status"];
-    }
+}
-
-    $groupstatus = array();
-    if (isset($_POST['groupstatus'])) {
-        $groupstatus = $_POST["groupstatus"];
-    }
-
-    $entries = 20;
-    $currentpage = 1;
-    if (isset($_POST['currentpage'])) {
-        $currentpage = (int) test_input($_POST["currentpage"]);
-    }
-
-    $offset = (int) $currentpage * $entries - $entries;
 
+if ($pagetype == "user") {
     include ("../../views/adminpanel-page.php");
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo "Pagenumber failed!";
-}
+}

website/public/API/adminSearchUsers.php

@@ -7,44 +7,38 @@ require_once ("../../queries/checkInput.php");
 require_once ("../../queries/user.php");
 require_once ("../../queries/group_page.php");
 
-if (isset($_SESSION["userID"]) &&
+$offset = 0;
-    (getRoleByID($_SESSION["userID"]) == 'admin' ||
+if (isset($_POST["n"])) {
-     getRoleByID($_SESSION["userID"]) == 'owner')) {
+    $offset = (int) test_input($_POST["n"]);
-    $offset = 0;
+}
-    $entries = 20;
+$entries = 20;
-    if (isset($_POST["currentpage"])) {
+if (isset($_POST["m"])) {
-        $offset = (int)test_input($_POST["currentpage"]) * $entries - $entries;
+    $entries = (int) test_input($_POST["m"]);
-    }
+}
+$search = "";
+if (isset($_POST["search"])) {
+    $search = test_input($_POST["search"]);
+}
 
-    $search = "";
+$pagetype = "user";
-    if (isset($_POST["search"])) {
+if (isset($_POST['pagetype'])) {
-        $search = test_input($_POST["search"]);
+    $pagetype = test_input($_POST['pagetype']);
-    }
+}
 
-    $pagetype = "user";
+$status = array();
-    if (isset($_POST['pagetype'])) {
+if (isset($_POST['status'])) {
-        $pagetype = test_input($_POST['pagetype']);
+    $status = $_POST["status"];
-    }
+}
 
-    $status = array();
+$groupstatus = array();
-    if (isset($_POST['status'])) {
+if (isset($_POST['groupstatus'])) {
-        $status = $_POST["status"];
+    $groupstatus = $_POST["groupstatus"];
-    }
+}
 
-    $groupstatus = array();
+if ($pagetype == "user") {
-    if (isset($_POST['groupstatus'])) {
+    include ("../../views/adminpanel-table.php");
-        $groupstatus = $_POST["groupstatus"];
+} else if ($pagetype == "group") {
-    }
+    include ("../../views/adminpanel-grouptable.php");
-
-    $userinfo = getRoleByID($_SESSION['userID']);
-
-    if ($pagetype == "user") {
-        include("../../views/adminpanel-table.php");
-    } else if ($pagetype == "group") {
-        include("../../views/adminpanel-grouptable.php");
-    } else {
-        echo "Search failed!";
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo "Search failed!";
-}
+}

website/public/API/deletePost.php

@@ -1,20 +0,0 @@
-<?php
-session_start();
-
-require_once "../../queries/post.php";
-require_once "../../queries/user.php";
-if (!isset($_SESSION["userID"])) {
-    echo "logged out";
-} else if (getRoleByID($_SESSION["userID"]) != 'frozen' and
-           getRoleByID($_SESSION["userID"]) != 'banned') {
-
-    if (empty($_POST["postID"]) or empty($_SESSION["userID"])) {
-        header('HTTP/1.1 500 Non enough arguments');
-    }
-
-    deletePost($_POST["postID"], $_SESSION["userID"]);
-    return;
-
-} else {
-    echo "frozen";
-}

website/public/API/editFriendship.php

@@ -3,32 +3,25 @@
 session_start();
 
 require_once ("../../queries/friendship.php");
-require_once("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+if(empty($_POST["usr"]) OR empty($_POST["action"]) OR !in_array($_POST["action"], array("request", "accept", "delete"))) {
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    header('HTTP/1.1 500 Non enough arguments');
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+}
-    if (empty($_POST["usr"]) OR empty($_POST["action"]) OR !in_array($_POST["action"], array("request", "accept", "delete"))) {
+
-        header('HTTP/1.1 500 Non enough arguments');
+$friendship_status = getFriendshipStatus($_POST["usr"]);
+
+if($_POST["action"] == "request" AND $friendship_status == 0) {
+    if (!requestFriendship($_POST["usr"])) {
+        header('HTTP/1.1 500 Query (request) failed');
     }
-
+} else if($_POST["action"] == "delete" AND in_array($friendship_status, array(1, 2, 3))) {
-    $friendship_status = getFriendshipStatus($_POST["usr"]);
+    if (!removeFriendship($_POST["usr"])) {
-
+        header('HTTP/1.1 500 Query (delete) failed');
-    if ($_POST["action"] == "request" AND $friendship_status == 0) {
+    }
-        if (!requestFriendship($_POST["usr"])) {
+} else if ($_POST["action"] == "accept" AND $friendship_status == 3) {
-            header('HTTP/1.1 500 Query (request) failed');
+    if (!acceptFriendship($_POST["usr"])) {
-        }
+        header('HTTP/1.1 500 Query (accept) failed');
-    } else if ($_POST["action"] == "delete" AND in_array($friendship_status, array(1, 2, 3))) {
-        if (!removeFriendship($_POST["usr"])) {
-            header('HTTP/1.1 500 Query (delete) failed');
-        }
-    } else if ($_POST["action"] == "accept" AND $friendship_status == 3) {
-        if (!acceptFriendship($_POST["usr"])) {
-            header('HTTP/1.1 500 Query (accept) failed');
-        }
-    } else {
-        header('HTTP/1.1 500 Not the right friendship status');
     }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    header('HTTP/1.1 500 Not the right friendship status');
 }

website/public/API/editMembership.php

@@ -1,40 +0,0 @@
-<?php
-
-session_start();
-
-if(empty($_POST["grp"]) or empty($_POST["role"])) {
-    header('HTTP/1.1 500 Non enough arguments');
-}
-
-if(in_array($_POST["role"], array('request', 'member', 'banned', 'mod', 'admin'))) {
-    header('HTTP/1.1 500 Wrong argument given for role');
-}
-
-require_once ("../../queries/group_member.php");
-require_once ("../../queries/group_page.php");
-require_once ("../../queries/group_member.php");
-
-$currentRole = selectGroupRole($_POST["grp"]);
-$groupStatus = selectGroupStatus($_POST["grp"]);
-echo "role: $currentRole status: $groupStatus ";
-
-if($_POST["role"] == 'request' and $currentRole == 'none') {
-    if($groupStatus = 'public') {
-        // Add member to public group
-        addMember($_POST["grp"], $_SESSION["userID"], 'member');
-        echo "ADDED";
-    } else if($groupStatus = 'membersonly') {
-        // Send request to members only group
-        addMember($_POST["grp"], $_SESSION["userID"], 'request');
-    } else {
-        // Can't invite yourself to hidden groups
-        header('HTTP/1.1 500 This group is hidden');
-    }
-    header('HTTP/1.1 200');
-} else if($_POST["role"] == 'none' and $currentRole != 'none') {
-    // Remove yourself from a group
-    deleteMember($_POST["grp"], $_SESSION["userID"]);
-} else {
-    echo "failure";
-    header('HTTP/1.1 500 Wrong argument given for role');
-}

website/public/API/getFriendshipStatus.php

@@ -10,21 +10,15 @@
 session_start();
 
 require_once ("../../queries/friendship.php");
-require_once("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+if(empty($_POST["usr"])) {
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+    header('HTTP/1.1 500 Non enough arguments');
-    if (empty($_POST["usr"])) {
+}
-        header('HTTP/1.1 500 Non enough arguments');
-    }
 
-    $friendship_status = getFriendshipStatus($_POST["usr"]);
+$friendship_status = getFriendshipStatus($_POST["usr"]);
 
-    if ($friendship_status == -2) {
+if($friendship_status == -2) {
-        header('HTTP/1.1 500 Query failed');
+    header('HTTP/1.1 500 Query failed');
-    }
+}
 
-    echo $friendship_status;
+echo $friendship_status;
-} else {
-    header('HTTP/1.0 403 Forbidden');
-}

website/public/API/getGrouprole.php

@@ -1,12 +0,0 @@
-<?php
-
-session_start();
-
-if(empty($_POST["grp"])) {
-    header('HTTP/1.1 500 Non enough arguments');
-}
-
-require_once("../../queries/group_page.php");
-
-echo selectGroupRole($_POST["grp"]);
-

website/public/API/getPosts.php

@@ -1,37 +1,26 @@
 <?php
 
-if(!isset($_POST["offset"]) or !isset($_POST["limit"])) {
+if(empty($_POST["usr"]) and empty($_POST["grp"])) {
-    header('HTTP/1.1 500 Not enough arguments');
+    header('HTTP/1.1 500 Non enough arguments');
 }
-if(!isset($_POST["usr"]) and !isset($_POST["grp"])) {
-    header('HTTP/1.1 500 Not enough arguments');
-}
-
-session_start();
 
 require_once ("../../queries/post.php");
 require_once ("../../queries/nicetime.php");
-require_once("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+if(empty($_POST["usr"])) {
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+    $posts = selectAllPosts(0, $_POST["grp"]);
-    if(empty($_POST["usr"])) {
-        $posts = selectSomePosts(0, $_POST["grp"], $_POST["offset"], $_POST["limit"]);
-    } else {
-        $posts = selectSomePosts($_POST["usr"], 0, $_POST["offset"], $_POST["limit"]);
-    }
-
-    if(!$posts) {
-        echo false;
-    } else {
-        $results = $posts->fetchAll(PDO::FETCH_ASSOC);
-
-        for($i = 0; $i < sizeof($results); $i++) {
-            $results[$i]["nicetime"] = nicetime($results[$i]["creationdate"]);
-        }
-
-        echo json_encode($results);
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    $posts = selectAllPosts($_POST["usr"], 0);
 }
+
+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"]);
+}
+
+echo json_encode($results);

website/public/API/loadChatNotifications.php

@@ -4,12 +4,5 @@ session_start();
 
 require_once ("../../queries/connect.php");
 require_once ("../../queries/private_message.php");
-require_once("../../queries/user.php");
 
-// Check if the user is allowed to load them.
+echo selectAllUnreadChat();
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
-    echo selectAllUnreadChat();
-} else {
-    header('HTTP/1.0 403 Forbidden');
-}

website/public/API/loadFriendRequest.php

@@ -4,13 +4,5 @@ session_start();
 
 require_once ("../../queries/connect.php");
 require_once ("../../queries/friendship.php");
-require_once ("../../queries/user.php");
 
-// Check if the user is allowed to load them.
+echo selectAllFriendRequests();
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'frozen' &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
-    echo selectAllFriendRequests();
-} else {
-    header('HTTP/1.0 403 Forbidden');
-}

website/public/API/loadFriends.php

@@ -5,24 +5,12 @@ session_start();
 require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/friendship.php");
-require_once("../../queries/user.php");
 
-// Check if the user is allowed to load them.
+if (isset($_POST["limit"])) {
-if (isset($_SESSION["userID"]) &&
+    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_POST["limit"]));
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+} else if (isset($_GET["limit"])) {
-    if (isset($_SESSION["userID"])) {
+    echo selectLimitedFriends($_SESSION["userID"], (int) test_input($_GET["limit"]));
-        // Echo the limited or unlimited users.
-        if (isset($_POST["limit"])) {
-            echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_POST["limit"]));
-        } else if (isset($_GET["limit"])) {
-            echo selectLimitedFriends($_SESSION["userID"], (int)test_input($_GET["limit"]));
-        } else {
-            echo selectFriends($_SESSION["userID"]);
-        }
-    } else {
-        echo "[]";
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo selectFriends($_SESSION["userID"]);
 }
 

website/public/API/loadGroups.php

@@ -6,17 +6,9 @@ require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/group_member.php");
 
-require_once("../../queries/user.php");
+if (isset($_POST["limit"])) {
-
+    echo selectLimitedGroupsFromUser($_SESSION["userID"], (int) test_input($_POST["limit"]));
-// Check if the user is allowed to load them.
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
-    // Echo the limited or unlimited groups.
-    if (isset($_POST["limit"])) {
-        echo selectLimitedGroupsFromUser($_SESSION["userID"], (int)test_input($_POST["limit"]));
-    } else {
-        echo selectAllGroupsFromUser($_SESSION["userID"]);
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo selectAllGroupsFromUser($_SESSION["userID"]);
 }
+

website/public/API/loadMessages.php

@@ -6,19 +6,11 @@ require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/friendship.php");
-require_once("../../queries/user.php");
 
-// Check if the user is allowed to get the messages.
+if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
-if (isset($_SESSION["userID"]) &&
+    setLastVisited(test_input($_POST["destination"]));
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+    echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
-    // Check if the users wants new messages or old ones, and give the right one back.
-    if (isset($_POST["lastID"]) && $_POST["lastID"] != "") {
-        setLastVisited(test_input($_POST["destination"]));
-        echo getNewChatMessages(test_input($_POST["lastID"]), test_input($_POST["destination"]));
-    } else {
-        setLastVisited(test_input($_POST["destination"]));
-        echo getOldChatMessages(test_input($_POST["destination"]));
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    setLastVisited(test_input($_POST["destination"]));
+    echo getOldChatMessages(test_input($_POST["destination"]));
 }

website/public/API/loadPost.php

@@ -1,21 +1,12 @@
 <?php
 
-session_start();
-
 require_once("../../queries/connect.php");
 require_once("../../queries/post.php");
 require_once("../../queries/checkInput.php");
 require_once("../../queries/nicetime.php");
 
-require_once("../../queries/user.php");
+if(isset($_GET['postID'])) {
-
+    include("../../views/post-view.php");
-if (isset($_SESSION["userID"]) &&
-    getRoleByID($_SESSION["userID"]) != 'banned') {
-    if (isset($_GET['postID'])) {
-        include("../../views/post-view.php");
-    } else {
-        echo "Kan de post niet laden";
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo "Failed to load";
 }

website/public/API/nietSlecht.php

@@ -0,0 +1,41 @@
+<?php
+
+session_start();
+require_once ("../queries/connect.php");
+require_once ("../queries/checkInput.php");
+
+function getNietSlechtCountForPost(int $postID) : int {
+    $stmt = prepareQuery("
+    SELECT 
+        `userID`
+    FROM 
+        `niet_slecht`
+    WHERE
+        `postID` = :postID
+    ");
+    $stmt->bindParam(":postID", $postID);
+    $stmt->execute();
+    return $stmt->rowCount();
+}
+
+function getNietSlechtUsersForPost(int $postID) {
+    $stmt = prepareQuery("
+    SELECT
+      `fname`,
+      `lname`,
+      CONCAT(`user`.`fname`, ' ', `user`.`lname`) as `fullname`
+    FROM
+      `user`
+    INNER JOIN
+      `niet_slecht`
+    WHERE
+      `user`.`userID` = `niet_slecht`.`userID` AND
+        `niet_slecht`.`postID` = :postID
+    ");
+    $stmt->bindParam(":postID", $postID);
+    $stmt->execute();
+    $rows = $stmt->fetchAll();
+    foreach ($rows as $row) {
+        print($row["fullname"]);
+    }
+}

website/public/API/postComment.php

@@ -2,36 +2,28 @@
 
 session_start();
 
-require_once("../../queries/post.php");
+require("../../queries/post.php");
 require_once("../../queries/connect.php");
-require_once("../../queries/checkInput.php");
+require("../../queries/checkInput.php");
-require_once("../../queries/user.php");
+print_r($_POST);
-
+if ($_POST['button'] == 'reaction') {
-if (!isset($_SESSION["userID"])) {
+    if (empty($_POST['newcomment-content'])) {
-    echo "logged out";
+        echo 0;
-} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    } else {
-           getRoleByID($_SESSION["userID"]) != 'banned') {
+        if (makeComment($_POST['postID'],
-    if ($_POST['button'] == 'reaction') {
+            $_SESSION['userID'],
-        if (empty($_POST['newcomment-content'])) {
+            test_input($_POST['newcomment-content']))) {
-            echo 0;
-        } else {
-            if (makeComment($_POST['postID'],
-                $_SESSION['userID'],
-                test_input($_POST['newcomment-content']))) {
-                echo 1;
-            } else {
-                echo 0;
-            }
-        }
-    } else if ($_POST['button'] == 'nietslecht') {
-        if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
             echo 1;
         } else {
             echo 0;
         }
+    }
+} else if ($_POST['button'] == 'nietslecht') {
+    if (makeNietSlecht($_POST["postID"], $_SESSION["userID"])) {
+        echo 1;
     } else {
         echo 0;
     }
 } else {
-    echo "frozen";
+    echo 0;
 }

website/public/API/postPost.php

@@ -6,47 +6,34 @@ require_once("../../queries/post.php");
 require_once("../../queries/group_page.php");
 require_once("../../queries/connect.php");
 require_once("../../queries/checkInput.php");
-require_once("../../queries/user.php");
+require_once("../../queries/picture.php");
 
-if (!isset($_SESSION["userID"])) {
+if (empty($_POST["title"]) or
-    echo "logged out";
+    empty($_POST["content"]) or
-} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+    empty($_SESSION["userID"])) {
-           getRoleByID($_SESSION["userID"]) != 'banned') {
+    header('HTTP/1.1 500 Non enough arguments');
+}
 
-    if (empty($_SESSION["userID"])) {
+if (empty($_POST["group"])) {
-        header('HTTP/1.1 500 Non enough arguments');
+    // User Post
-    }
+    makePost(
-
+        $_SESSION["userID"],
-    if (empty(test_input($_POST["title"])) or
+        test_input($_POST["title"]),
-        empty(test_input($_POST["content"]))
+        test_input($_POST["content"])
-    ) {
+        );
-        echo "empty";
-    } else {
-        if (empty($_POST["group"])) {
-            // User Post
-            makePost(
-                $_SESSION["userID"],
-                null,
-                test_input($_POST["title"]),
-                test_input($_POST["content"])
-            );
-        } else {
-            // Group Post
-
-            // Check if the user is an admin or mod of the group.
-            if (!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
-                header('HTTP/1.1 500 Non enough rights');
-                return;
-            }
-
-            makePost(
-                $_SESSION["userID"],
-                $_POST["group"],
-                test_input($_POST["title"]),
-                test_input($_POST["content"])
-            );
-        }
-    }
 } else {
-    echo "frozen";
+    // Group Post
-}
+
+    // Check if the user is an admin or mod of the group.
+    if(!in_array(selectGroupRole($_POST["group"]), array('mod', 'admin'))) {
+        header('HTTP/1.1 500 Non enough rights');
+        return;
+    }
+
+    makePost(
+        $_SESSION["userID"],
+        test_input($_POST["title"]),
+        test_input($_POST["content"]),
+        $_POST["group"]
+    );
+}

website/public/API/searchGroups.php

@@ -7,29 +7,22 @@ require_once ("../../queries/connect.php");
 require_once ("../../queries/checkInput.php");
 require_once ("../../queries/group_member.php");
 require_once ("../../queries/group_page.php");
-require_once ("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+$n = 0;
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+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"]);
+}
 
-    $n = 0;
+if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
-    if (isset($_POST["n"])) {
+    echo searchSomeOwnGroups($n, $m, $search);
-        $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);
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo searchSomeGroups($n, $m, $search);
-}
+}

website/public/API/searchPageNumber.php

@@ -1,53 +0,0 @@
-<?php
-
-session_start();
-
-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;
-
-    $user_currentpage = $group_currentpage = 1;
-    if (isset($_POST['user-pageselect'])) {
-        $user_currentpage = test_input($_POST['user-pageselect']);
-    }
-    if (isset($_POST['group-pageselect'])) {
-        $group_currentpage = test_input($_POST['group-pageselect']);
-    }
-
-    $user_n = $user_currentpage * $user_perpage - $user_perpage;
-    $group_n = $group_currentpage * $group_perpage - $group_perpage;
-
-    $search = "";
-    if (isset($_POST['search'])) {
-        $search = test_input($_POST['search']);
-    }
-
-    $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']);
-    }
-
-    include ("../../views/searchPageNumber.php");
-} else {
-    header('HTTP/1.0 403 Forbidden');
-}

website/public/API/searchUsers.php

@@ -7,29 +7,21 @@ require_once ("../../queries/checkInput.php");
 require_once ("../../queries/friendship.php");
 require_once ("../../queries/user.php");
 
-if (isset($_SESSION["userID"]) &&
+$n = 0;
-    getRoleByID($_SESSION["userID"]) != 'banned') {
+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"]);
+}
 
-    $n = 0;
+if (isset($_POST["filter"]) && $_POST["filter"] == "personal") {
-    $m = 20;
+    echo searchSomeFriends($n, $m, $search);
-
-    $page = 1;
-    if (isset($_POST["user-pageselect"])) {
-        $page = (int)test_input($_POST['user-pageselect']);
-    }
-
-    $n = ($page - 1) * $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);
-    }
 } else {
-    header('HTTP/1.0 403 Forbidden');
+    echo searchSomeUsers($n, $m, $search);
-}
+}

website/public/API/sendMessage.php

@@ -4,26 +4,14 @@ session_start();
 require_once("../../queries/connect.php");
 require_once("../../queries/private_message.php");
 require_once("../../queries/checkInput.php");
-require_once("../../queries/user.php");
 
-// Check if the user is allowed to send a message.
+if (!empty(test_input($_POST["destination"])) &&
-if (!isset($_SESSION["userID"])) {
+    !empty(test_input($_POST["content"]))) {
-    echo "logged out";
+    if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
-} else if (getRoleByID($_SESSION["userID"]) != 'frozen' &&
+        echo 1;
-           getRoleByID($_SESSION["userID"]) != 'banned') {
-    if (!empty(test_input($_POST["destination"])) &&
-        !empty(test_input($_POST["content"]))
-    ) {
-        // Send the message.
-        // Returns false when it didn't succeed sending the message.
-        if (sendMessage(test_input($_POST["destination"]), test_input($_POST["content"]))) {
-            echo 1;
-        } else {
-            echo 0;
-        }
     } else {
         echo 0;
     }
 } else {
-    echo "frozen";
+    echo 0;
 }

website/public/admin.php

@@ -8,7 +8,7 @@
     <style>
         @import url("styles/adminpanel.css");
     </style>
-<script src="js/admin.js" charset="utf-8"></script>
+    <script src="js/admin.js" charset="utf-8"></script>
 </head>
 <body>
 <?php
@@ -19,9 +19,9 @@
 include_once ("../queries/user.php");
 
 // auth
-$role = getRoleByID($_SESSION['userID']);
+$userinfo = getRoleByID($_SESSION['userID'])->fetch(PDO::FETCH_ASSOC);
 
-if ($role != 'admin' AND $role != 'owner') {
+if ($userinfo['role'] != 'admin' AND $userinfo['role'] != 'owner') {
     header("location:profile.php");
 }
 

website/public/bits/friend-item.php

@@ -4,7 +4,6 @@ session_start();
 
 include_once ("../../queries/friendship.php");
 
-// Initialize variables to given or default values.
 if (isset($_POST["action"])) {
     $action = $_POST["action"];
 } else {
@@ -19,8 +18,6 @@ if (isset($_POST["actionType"])) {
 
 $friends = json_decode($_POST["friends"]);
 
-
-// Foreach friend, return them as list item.
 foreach($friends as $i => $friend) {
     $friendshipStatus = getFriendshipStatus($friend->userID);
     ?>
@@ -36,12 +33,12 @@ foreach($friends as $i => $friend) {
                     }
                     ?>'>
                 <div class='friend'>
-                    <img alt='PF' class='profile-picture <?= $friend->onlinestatus ?>' src='<?= $friend->profilepicture ?>'/>
+                    <img alt='PF' class='profile-picture' src='<?= $friend->profilepicture ?>'/>
                     <div class='friend-name'>
                         <?= $friend->fullname ?><br/>
                         <span style='color: #666'><?php
                             if (isset($friend->username)) {
-                                echo $friend->usernameshort;
+                                echo $friend->username;
                             } else if (isset($friend->content)) {
                                 echo $friend->content;
                             }
@@ -51,7 +48,6 @@ foreach($friends as $i => $friend) {
             </button>
         </form>
         <?php
-        // Add friendship options if possible.
         if ($friendshipStatus > 1) {
             if ($friendshipStatus == 2) {
                 $denyName = "Annuleer";

website/public/bits/group-item.php

@@ -6,7 +6,6 @@ include_once ("../../queries/group_member.php");
 
 $groups = json_decode($_POST["groups"]);
 
-// Add each group as list item.
 foreach($groups as $i => $group) {
     ?>
     <li class='group-item'>

website/public/bits/niet-slecht.php

@@ -1,8 +0,0 @@
-<?php
-if (isset($_GET["groupname"])) {
-    $url = "https://myhyvesbookplus.nl/~lars/group.php?groupname=" . $_GET["groupname"];
-} else {
-    $url = "https://myhyvesbookplus.nl/";
-}
-?>
-<a href="<?= $url ?>" target='_blank'><img style="width: 100%; height: auto;" src="../external/nietslecht_button.png" alt='\"Niet slecht\" ons op MyHyvesbook+' /></a>

website/public/browserconfig.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-	<browserconfig>
-		<msapplication>
-			<tile>
-				<square70x70logo src="tiny.png"/>
-				<square150x150logo src="square.jpg"/>
-				<wide310x150logo src="wide.jpg"/>
-				<square310x310logo src="large.jpg"/>
-				<TileColor>#000000</TileColor>
-			</tile>
-		</msapplication>
-	</browserconfig>

website/public/createGroup.php

@@ -1,36 +0,0 @@
-<?php
-require_once "../queries/createGroup.php";
-require_once "../queries/connect.php";
-require_once "../queries/alerts.php"?>
-<!DOCTYPE html>
-<html>
-<head>
-    <?php include("../views/head.php"); ?>
-    <style>
-        @import url("styles/settings.css");
-    </style>
-</head>
-<body>
-<?php
-/*
- * This view adds the main layout over the screen.
- * Header and menu.
- */
-include("../views/main.php");
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    try {
-        createGroup();
-    } catch (AlertMessage $e) {
-
-    }
-    $groupname = $_POST["groupName"];
-    header("location: group.php?groupname=$groupname");
-}
-/* Add your view files here. */
-include("../views/createGroup.php");
-
-/* This adds the footer. */
-include("../views/footer.php");
-?>
-</body>
-</html>

website/public/group.php

@@ -11,17 +11,15 @@
 <body>
 <?php
 
-include_once("../queries/group_page.php");
+include("../queries/group_page.php");
 
-if(isset($_SESSION["userID"]) and !$group = selectGroupByName($_GET["groupname"])) {
+$group = selectGroupByName($_GET["groupname"]);
-    header("HTTP/1.0 404 Not Found");
+$members = selectGroupMembers(2);
-    header("Location: error/404.php");
-    die();
-}
-
-
-$members = selectGroupMembers($group["groupID"]);
 
+?>
+<script>alert("<?= $members[0] ?>");</script>
+<script>alert("<?= $members[1] ?>");</script>
+<?php
 
 /*
  * This view adds the main layout over the screen.
@@ -42,15 +40,12 @@ if ($group["role"] == "mod" OR $group["role"] == "admin") {
 ?>
 
 <script src="js/masonry.js"></script>
-<script src="js/groupButtons.js"></script>
 <script src="js/post.js"></script>
 <script>
     $(document).ready(function() {
         userID = 0;
         groupID = <?= $group["groupID"] ?>;
 
-        placeGroupButtons();
-
         masonry(<?= $masonry_mode ?>);
     });
 </script>

website/public/groupAdmin.php

@@ -1,72 +0,0 @@
-<?php
-require_once "../queries/picture.php";
-require_once "../queries/groupAdmin.php";
-require_once "../queries/alerts.php";
-?>
-<!DOCTYPE html>
-<html>
-<head>
-    <?php include("../views/head.php"); ?>
-<style>
-    /*Insert own stylesheet here ;)*/
-    @import url("styles/settings.css");
-</style>
-</head>
-<body>
-<?php
-/*
- * This view adds the main layout over the screen.
- * Header and menu.
- */
-include("../views/main.php");
-$alertClass;
-$alertMessage;
-
-// Select which button has been pressed.
-if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    try {
-        switch ($_POST["form"]) {
-            case "group":
-                updateGroupSettings($_POST["groupID"]);
-                break;
-            case "picture":
-                if (checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) {
-                    updateAvatar($_POST["groupID"]);
-                }
-                break;
-            case "mod":
-                if (!array_key_exists("userID", $_POST)) {
-                    throw new AngryAlert("Geen gebruiker geselecteerd.");
-                }
-                upgradeUser($_POST["groupID"], $_POST["userID"], "mod");
-                break;
-            case "admin":
-                if (!array_key_exists("userID", $_POST)) {
-                    throw new AngryAlert("Geen gebruiker geselecteerd.");
-                }
-                upgradeUser($_POST["groupID"], $_POST["userID"], "admin");
-                break;
-            case "deadmin":
-                if (!array_key_exists("userID", $_POST)) {
-                    throw new AngryAlert("Geen gebruiker geselecteerd.");
-                }
-                upgradeUser($_POST["groupID"], $_POST["userID"], "member");
-                break;
-            case "delete":
-                deleteGroup();
-                break;
-        }
-    } catch (AlertMessage $w) {
-        $alertClass = $w->getClass();
-        $alertMessage = $w->getMessage();
-    }
-}
-
-/* Add your view files here. */
-include("../views/groupAdmin.php");
-
-/* This adds the footer. */
-include("../views/footer.php");
-?>
-</body>
-</html>

website/public/js/admin.js

@@ -1,51 +1,44 @@
 $(window).on("load", function () {
     changeFilter();
-    searchFromOne();
-
     $(".admin-searchinput").keyup(function(){
-        searchFromOne();
+        adminSearch();
     });
     // all inputs and labels directly under admin filter and groupfilter
-    $("#admin-filter, #admin-groupfilter > input, label").change(function(){
+    $("#admin-filter, #admin-groupfilter > input, label").click(function(){
-        searchFromOne();
+        adminSearch();
     });
     $("#pagetype").change(function(){
-        searchFromOne();
+        adminSearch();
     });
 
-    /* Update hidden input to be equal to submit pressed,
+    adminSearch();
-        because serialize doesn't take submit values. */
-    $('#admin-batchform > button').click(function () {
-        $('#batchinput').prop('value', $(this).prop('value'));
-    });
-
-    $('#admin-groupbatchform > button').click(function () {
-        $('#groupbatchinput').prop('value', $(this).prop('value'));
-    });
 });
 
-// Toggles all checkboxes based on one.
+function checkAll(allbox) {
-function checkAll() {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
-    $('.checkbox-list').each(function () {
+
-        $(this).prop('checked', $('#checkall').prop('checked'));
+    for (var i = 0; i < checkboxes.length; i++) {
-    });
+        if (checkboxes[i].type == 'checkbox') {
+            checkboxes[i].checked = allbox.checked;
+        }
+    }
 }
 
-// Simple function that checks if checkall should stay checked.
+function checkCheckAll(allbox) {
-function checkCheckAll() {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
     var checked = true;
 
-    $('.checkbox-list').each(function () {
+    for (var i = 0; i < checkboxes.length; i++) {
-        if ($(this).prop('checked') == false) {
+        if (checkboxes[i].type == 'checkbox') {
-            checked = false;
+            if (checkboxes[i].checked == false) {
-            return;
+                checked = false;
+                break;
+            }
         }
-    });
+    }
-
+    allbox.checked = checked;
-    $('#checkall').prop('checked', checked);
 }
 
-// Toggle of filter options.
 function changeFilter() {
     if ($('#pagetype').find(":selected").val() == "group") {
         document.getElementById('admin-filter').style.display = 'none';
@@ -62,34 +55,15 @@ function changeFilter() {
     }
 }
 
-// Sets the search page to one, relevant when changing filter or search.
-function searchFromOne() {
-    $('#currentpage').prop('value', 1);
-    adminSearch();
-}
-
-// AJAX live search.
 function adminSearch() {
     $.post(
         "API/adminSearchUsers.php",
         $("#admin-searchform").serialize()
     ).done(function (data) {
         $("#usertable").html(data);
-        updatePageN();
     })
 }
 
-// AJAX live update.
-function adminUpdate(form) {
-    $.post(
-        "API/adminChangeUser.php",
-        $(form).serialize()
-    ).done(function () {
-        adminSearch();
-    })
-}
-
-// AJAX pagenumber functionality.
 function updatePageN() {
     $.post(
         "API/adminPageNumber.php",
@@ -97,20 +71,4 @@ function updatePageN() {
     ).done(function (data) {
         $("#admin-pageinfo").html(data);
     })
-}
-
-// Intended for the edit button to show a form.
-function toggleBancomment(button) {
-    $(button).siblings("div").toggle();
-    $(button).toggle();
-}
-
-// AJAX value editing.
-function editComment(form) {
-    $.post(
-        "API/adminChangeUser.php",
-        $(form).serialize()
-    ).done(function (data) {
-        adminSearch();
-    });
 }

website/public/js/chat.js

@@ -9,25 +9,18 @@ $(document).ready(function() {
     $(".chat-field").hide();
 });
 
-// This function loads the new messages and runs the addMessages function to show them.
 function loadMessages() {
-    // If the function is not running elsewhere, run it here.
     if (!gettingMessages) {
         gettingMessages = true;
-        // Get the messages.
         $.post(
             "API/loadMessages.php",
             $("#lastIDForm").serialize()
         ).done(function (data) {
-            // Post the messages in the chat.
             if (data && data != "[]") {
                 messages = JSON.parse(data);
                 addMessages(messages);
                 $("#lastID").val(messages[messages.length - 1].messageID);
             }
-
-            loadUnreadMessages();
-
             gettingMessages = false;
         });
     } else {
@@ -35,47 +28,34 @@ function loadMessages() {
     }
 }
 
-// Send a message to a friend of the user.
+
 function sendMessage() {
     $.post(
         "API/sendMessage.php",
         $("#sendMessageForm").serialize()
-    ).done(function(response) {
+    );
-        if (response == "frozen") {
-            alert("Je account is bevroren, dus je kan niet chat berichten versturen. Contacteer een admin als je denkt dat dit onjuist is.");
-        } else if (response == "logged out") {
-            window.location.href = "login.php?url=" + window.location.pathname;
-        }
-        // Load messages if the message has been send, so it shows in the chat.
-        loadMessages();
-    });
 
     $("#newContent").val("");
-    $("#newContent").focus();
+    loadMessages();
 }
 
-// Add messages to the chat.
 function addMessages(messages) {
     var messagesText = "";
-
-    // Loop over all the messages.
     for(var i in messages) {
-        // Initialize message variables.
+        // Initialize message variables
-        var thisDate = new Date(messages[i].creationdate.replace(/ /,"T"));
+        var thisDate = new Date(messages[i].creationdate);
-        var thisTime = thisDate.getHours() + ":" + ('0' + thisDate.getMinutes()).slice(-2);
+        var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes();
         var type;
         thisDate.setHours(0,0,0,0);
 
-        // See where the message has been send from, so it shows on the right side.
         if (messages[i].destination == $(".destinationID").val()) {
             type = "chat-message-self";
         } else {
             type = "chat-message-other";
         }
-
-        // If it is the first message, open the message box and maybe add a year.
         if (i == 0) {
-            if (thisDate.getTime() > previousDate.getTime()) {
+            if (thisDate > previousDate) {
+                previousDate = thisDate;
                 messagesText += '\
                     <div class="day-message"> \
                         <div class="day-message-content">\
@@ -83,20 +63,14 @@ function addMessages(messages) {
                         </div> \
                     </div>';
             }
-            previousDate = thisDate;
-            previousTime = thisTime;
-            previousType = type;
             messagesText += '<div class="chat-message"><div class="' + type + '">';
-        // If it is not the first message, and has a different date/time/type then the previous message,
+        } else if (type != previousType || thisTime != previousTime || thisDate > previousDate) {
-        } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) {
-            // Close the previous message.
             messagesText += '<div class="chat-time">\
                     ' + thisTime + '\
                     </div></div></div>';
 
             previousTime = thisTime;
             previousType = type;
-            // If the date is different, add a new date.
             if (thisDate > previousDate) {
                 previousDate = thisDate;
                 messagesText += '\
@@ -107,11 +81,8 @@ function addMessages(messages) {
                     </div>';
             }
 
-            // Open the new message.
             messagesText += '<div class="chat-message"><div class="' + type + '">';
         }
-
-        // Add the content of the message in the new box.
         messagesText += fancyText(messages[i].content) + "<br />";
     }
 
@@ -120,14 +91,11 @@ function addMessages(messages) {
                     ' + thisTime + '\
                     </div></div></div>';
 
-    // Add all the new created messaged to the chat.
     $("#chat-history").append(messagesText);
 
-    // Scroll down, so the user can see the new messages.
     $("#chat-history").scrollTop($("#chat-history")[0].scrollHeight - $('#chat-history')[0].clientHeight);
 }
 
-// Switch to a different user.
 function switchUser(userID) {
     previousDate = new Date("1970-01-01 00:00:00");
     $(".chat-field").show();
@@ -138,7 +106,6 @@ function switchUser(userID) {
     $("#friend-item-" + userID).addClass("active-friend-chat");
 }
 
-// Insert a message in the chat, this is used when it is empty.
 function sayEmpty() {
     $("#chat-history").html("Probeer ook eens foto's en video's te sturen");
 }

website/public/js/dobPicker.js

@@ -0,0 +1,123 @@
+/**
+ * jQuery DOB Picker
+ * Website: https://github.com/tyea/dobpicker
+ * Version: 1.0
+ * Author: Tom Yeadon
+ * License: BSD 3-Clause
+ */
+
+jQuery.extend({
+
+	dobPicker: function(params) {
+
+		// set the defaults		
+		if (typeof(params.dayDefault)==='undefined') params.dayDefault = 'Day';
+		if (typeof(params.monthDefault)==='undefined') params.monthDefault = 'Month';
+		if (typeof(params.yearDefault)==='undefined') params.yearDefault = 'Year';
+		if (typeof(params.minimumAge)==='undefined') params.minimumAge = 12;
+		if (typeof(params.maximumAge)==='undefined') params.maximumAge = 80;
+
+		// set the default messages		
+		$(params.daySelector).append('<option value="">' + params.dayDefault + '</option>');
+		$(params.monthSelector).append('<option value="">' + params.monthDefault + '</option>');
+		$(params.yearSelector).append('<option value="">' + params.yearDefault + '</option>');
+
+		// populate the day select
+		for (i = 1; i <= 31; i++) {
+			if (i <= 9) {
+				var val = '0' + i;
+			} else {
+				var val = i;
+			}
+			$(params.daySelector).append('<option value="' + val + '">' + i + '</option>');
+		}
+
+		// populate the month select		
+		var months = [
+			"January",
+			"February",
+			"March",
+			"April",
+			"May",
+			"June",
+			"July",
+			"August",
+			"September",
+			"October",
+			"November",
+			"December"
+		];
+			
+		for (i = 1; i <= 12; i++) {
+			if (i <= 9) {
+				var val = '0' + i;
+			} else {
+				var val = i;
+			}
+			$(params.monthSelector).append('<option value="' + val + '">' + months[i - 1] + '</option>');
+		}
+
+		// populate the year select
+		var date = new Date();
+		var year = date.getFullYear();
+		var start = year - params.minimumAge;
+		var count = start - params.maximumAge;
+		
+		for (i = start; i >= count; i--) {
+			$(params.yearSelector).append('<option value="' + i + '">' + i + '</option>');
+		}
+		
+		// do the logic for the day select
+		$(params.daySelector).change(function() {
+			
+			$(params.monthSelector)[0].selectedIndex = 0;
+			$(params.yearSelector)[0].selectedIndex = 0;
+			$(params.yearSelector + ' option').removeAttr('disabled');
+			
+			if ($(params.daySelector).val() >= 1 && $(params.daySelector).val() <= 29) {
+			
+				$(params.monthSelector + ' option').removeAttr('disabled');
+				
+			} else if ($(params.daySelector).val() == 30) {
+			
+				$(params.monthSelector + ' option').removeAttr('disabled');
+				$(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled');
+				
+			} else if($(params.daySelector).val() == 31) {
+			
+				$(params.monthSelector + ' option').removeAttr('disabled');
+				$(params.monthSelector + ' option[value="02"]').attr('disabled', 'disabled');
+				$(params.monthSelector + ' option[value="04"]').attr('disabled', 'disabled');
+				$(params.monthSelector + ' option[value="06"]').attr('disabled', 'disabled');
+				$(params.monthSelector + ' option[value="09"]').attr('disabled', 'disabled');
+				$(params.monthSelector + ' option[value="11"]').attr('disabled', 'disabled');
+				
+			}
+			
+		});
+		
+		// do the logic for the month select
+		$(params.monthSelector).change(function() {
+			
+			$(params.yearSelector)[0].selectedIndex = 0;
+			$(params.yearSelector + ' option').removeAttr('disabled');
+			
+			if ($(params.daySelector).val() == 29 && $(params.monthSelector).val() == '02') {
+			
+				$(params.yearSelector + ' option').each(function(index) {
+					if (index !== 0) {
+						var year = $(this).attr('value');
+						var leap = !((year % 4) || (!(year % 100) && (year % 400)));
+						if (leap === false) {
+							$(this).attr('disabled', 'disabled');
+						}
+					}
+				});
+				
+			}
+			
+		});
+		
+	}
+	
+});

website/public/js/dobPicker.min.js

@@ -0,0 +1 @@
+jQuery.extend({dobPicker:function(a){for("undefined"==typeof a.dayDefault&&(a.dayDefault="Day"),"undefined"==typeof a.monthDefault&&(a.monthDefault="Month"),"undefined"==typeof a.yearDefault&&(a.yearDefault="Year"),"undefined"==typeof a.minimumAge&&(a.minimumAge=12),"undefined"==typeof a.maximumAge&&(a.maximumAge=80),$(a.daySelector).append('<option value="">'+a.dayDefault+"</option>"),$(a.monthSelector).append('<option value="">'+a.monthDefault+"</option>"),$(a.yearSelector).append('<option value="">'+a.yearDefault+"</option>"),i=1;i<=31;i++){if(i<=9)var b="0"+i;else var b=i;$(a.daySelector).append('<option value="'+b+'">'+i+"</option>")}var c=["January","February","March","April","May","June","July","August","September","October","November","December"];for(i=1;i<=12;i++){if(i<=9)var b="0"+i;else var b=i;$(a.monthSelector).append('<option value="'+b+'">'+c[i-1]+"</option>")}var d=new Date,e=d.getFullYear(),f=e-a.minimumAge,g=f-a.maximumAge;for(i=f;i>=g;i--)$(a.yearSelector).append('<option value="'+i+'">'+i+"</option>");$(a.daySelector).change(function(){$(a.monthSelector)[0].selectedIndex=0,$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),$(a.daySelector).val()>=1&&$(a.daySelector).val()<=29?$(a.monthSelector+" option").removeAttr("disabled"):30==$(a.daySelector).val()?($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled")):31==$(a.daySelector).val()&&($(a.monthSelector+" option").removeAttr("disabled"),$(a.monthSelector+' option[value="02"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="04"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="06"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="09"]').attr("disabled","disabled"),$(a.monthSelector+' option[value="11"]').attr("disabled","disabled"))}),$(a.monthSelector).change(function(){$(a.yearSelector)[0].selectedIndex=0,$(a.yearSelector+" option").removeAttr("disabled"),29==$(a.daySelector).val()&&"02"==$(a.monthSelector).val()&&$(a.yearSelector+" option").each(function(a){if(0!==a){var b=$(this).attr("value"),c=!(b%4||!(b%100)&&b%400);c===!1&&$(this).attr("disabled","disabled")}})})}});

website/public/js/friendButtons.js

@@ -1,8 +1,6 @@
-// Show the right friendship buttonsto the user.
 function placeFriendButtons() {
     $.post("API/getFriendshipStatus.php", { usr: userID })
         .done(function(data) {
-            //save the friendship status
             var friendshipStatus = data;
             var $buttonContainer = $("div.friend-button-container");
             $("#start-profile-chat").hide();
@@ -21,28 +19,25 @@ function placeFriendButtons() {
                     case "0":
                         value1 = "request";
                         class1 = "green";
-                        text1 = "Word vrienden";
+                        text1 = "Bevriend";
-                        icon1 = "fa-user-plus";
+                        icon1 = "fa-handshake-o";
                         break;
-                        // Users are friends.
                     case "1":
                         value1 = userID;
                         class1 = "green";
                         text1 = "Chat";
-                        icon1 = "fa-comment";
+                        icon1 = "fa-comment-o";
                         value2 = "delete";
                         class2 = "red";
-                        text2 = "Ontvriend";
+                        text2 = "Verwijder";
-                        icon2 = "fa-user-times";
+                        icon2 = "fa-times";
                         break;
-                        // This user sent request.
                     case "2":
                         value1 = "delete";
                         class1 = "red";
                         text1 = "Trek verzoek in";
-                        icon1 = "fa-times";
+                        icon1 = "fa-cross";
                         break;
-                        // Other user sent request.
                     case "3":
                         value1 = "accept";
                         class1 = "green";
@@ -55,20 +50,17 @@ function placeFriendButtons() {
                         break;
                 }
 
-                // Append buttons to the container.
                 $buttonContainer.append(
-                    "<div><button class='"+ class1 +" fancy-button friend-button' value='"+ value1 +"'>" +
+                    "<button class='"+ class1 +" friend-button' value='"+ value1 +"'>" +
-                    "<span>"+ text1 +"</span>" +
+                        "<i class='fa "+ icon1 +"'></i> " + text1 +
-                    "<i class='fa fa-fw "+ icon1 +"'></i> " +
+                    "</button>");
-                    "</button></div>");
                 $buttonContainer.append(
-                    "<div><button class='"+ class2 +" fancy-button friend-button' value='"+ value2 +"'>" +
+                    "<button class='"+ class2 +" friend-button' value='"+ value2 +"'>" +
-                    "<span>"+ text2 +"</span>" +
+                        "<i class='fa "+ icon2 +"'></i> " + text2 +
-                    "<i class='fa fa-fw "+ icon2 +"'></i> " +
+                    "</button>");
-                    "</button></div>");
 
-            // Gets triggered when a friend button is triggered.
+
-            $buttonContainer.find("button").click(function() {
+            $buttonContainer.children().click(function() {
                 if (isNaN(this.value))
                     editFriendship(userID, this.value);
                 else if (this.value != "")

website/public/js/groupButtons.js

@@ -1,51 +0,0 @@
-function placeGroupButtons() {
-    $.post("API/getGrouprole.php", { grp: groupID })
-        .done(function(data) {
-            var $buttonContainer = $("div.group-button-container");
-
-            // Append the right group button to the button container.
-            // When user is not a member
-            if(data == 'none') {
-                $buttonContainer.append(
-                    "<button class='green group-button fancy-button' value='request'>" +
-                    "<span>Treed toe</span><i class='fa fa-plus'></i>" +
-                    "</button>");
-
-                // when user sent a request to become a member.
-            } else if(data == 'request') {
-                $buttonContainer.append(
-                    "<button class='red group-button fancy-button' value='none'>" +
-                    "<span>Trek verzoek in</span><i class='fa fa-times'></i>" +
-                    "</button>");
-                // When user is a member of the group.
-            } else if (data == 'admin') {
-                $buttonContainer.append(
-                    "<button class='group-button fancy-button' value='admin'>" +
-                        "<span>Instellingen</span><i class='fa fa-cogs'></i>" +
-                        "</button>"
-                );
-
-            } else {
-                $buttonContainer.append(
-                    "<button class='red group-button fancy-button' value='none'>" +
-                    "<span>Verlaat groep</span><i class='fa fa-sign-out'></i>" +
-                    "</button>");
-            }
-
-            // Gets triggered when a group button is clicked.
-            $buttonContainer.children().click(function() {
-                if (this.value == 'admin') {
-                    window.location.href='groupAdmin.php?groupID=' + groupID;
-                } else {
-                    $.post("API/editMembership.php", {grp: groupID, role: this.value})
-                        .done(function () {
-                            $buttonContainer.children().remove();
-                            placeGroupButtons();
-                            updateMenus();
-                        }).fail(function () {
-                    });
-                }
-            });
-
-    });
-}

website/public/js/header.js

@@ -1,55 +1,40 @@
 $(document).ready(function() {
     // Toggle menu
     $("#own-profile-picture, #open-notifications").click(function() {
-        if ($("#notification-center").css('display') == "none") {
+            if ($("#notification-center").css('display') == "none") {
-            // Make the menu visible and move the content to the left.
+                // Make the menu visible and move the content to the left.
-            $(".modal").width("calc(100% - 512px)");
+                $(".modal").width("calc(100% - 512px)");
-            $(".content").css("margin-right", "256px");
+                $(".content").css("margin-right", "256px");
-            $("#notification-center").css("right", "0px");
+                $("#notification-center").css("right", "0px");
-            $("#notification-center").css("display", "block");
+                $("#notification-center").css("display", "block");
-            $("#contact-menu").css("display", "block");
+                $("#contact-menu").css("display", "block");
 
-            // Add cookie so the menu stays open on other pages
+                // Add cookie so the menu stays open on other pages
-            if (window.innerWidth > 1080) {
+                if (window.innerWidth > 1080) {
-                $("#chat-history").css("margin-right", "266px");
+                    $("#chat-history").width("calc(100% - 587px)");
-                $("#chat-history").css("width", "calc(100% - 512px - 75px)");
+                    document.cookie = "menu=open; path=/";
-                document.cookie = "menu=open; path=/";
+                } else {
+                    document.cookie = "menu=closed; path=/";
+                }
             } else {
+                $(".modal").width("calc(100% - 256px)");
+                $(".content").css("margin-right", "0px");
+                $("#notification-center").css("display", "none");
+
+                if (window.innerWidth > 1080) {
+                    $("#chat-history").width("calc(100% - 331px)");
+                } else {
+                    // Make the menu invisible and move the content to the right.
+                    $("#contact-menu").css("display", "none");
+                }
+
+                // Change menu cookie to close
                 document.cookie = "menu=closed; path=/";
-            }
-        } else {
-            $(".modal").width("calc(100% - 256px)");
-            $(".content").css("margin-right", "0px");
-            $("#notification-center").css("display", "none");
 
-            if (window.innerWidth > 1080) {
-                $("#chat-history").css("margin-right", "10px");
-                $("#chat-history").css("width", "calc(100% - 256px - 85px)");
-            } else {
-                // Make the menu invisible and move the content to the right.
-                $("#contact-menu").css("display", "none");
             }
-
-            // Change menu cookie to close
-            document.cookie = "menu=closed; path=/";
-        }
     });
 
     if (getCookie("menu") == "open") {
-        // Make the menu visible and move the content to the left.
+        $("#own-profile-picture").click();
-        $(".modal").width("calc(100% - 512px)");
-        $(".content").css("margin-right", "256px");
-        $("#notification-center").css("right", "0px");
-        $("#notification-center").css("display", "block");
-        $("#contact-menu").css("display", "block");
-
-        // Add cookie so the menu stays open on other pages
-        if (window.innerWidth > 1080) {
-            $("#chat-history").css("margin-right", "266px");
-            $("#chat-history").width("calc(100% - 587px)");
-            document.cookie = "menu=open; path=/";
-        } else {
-            document.cookie = "menu=closed; path=/";
-        }
     }
 });

website/public/js/loginRegisterModals.js

@@ -1,71 +0,0 @@
-
-// Get the modal
-var modal = document.getElementById('myModal');
-var registerModal = document.getElementById('registerModal');
-var facebookModal = document.getElementById("fbModal");
-
-// Get the button that opens the modal
-var registerBtn = document.getElementById("registerBtn");
-var btn = document.getElementById("myBtn");
-var fbBtn = document.getElementById("fbBtn");
-
-// Get the <span> element that closes the modal
-var span = document.getElementsByClassName("close")[0];
-var registerSpan = document.getElementsByClassName("close")[1];
-var facebookCLose = document.getElementsByClassName("close")[2];
-
-/**
- * When the user clicks the button, open the modal
- */
-btn.onclick = function () {
-    modal.style.display = "block";
-
-}
-registerBtn.onclick = function () {
-    registerModal.style.display = "block";
-}
-fbBtn.onclick = function () {
-    facebookModal.style.display = "block";
-}
-
-/**
- * WHen the user clicks on (X), close the modal
- */
-span.onclick = function () {
-    modal.style.display = "none";
-}
-registerSpan.onclick = function () {
-    registerModal.style.display = "none";
-}
-facebookCLose.onclick = function () {
-    facebookModal.style.display = "none";
-}
-
-/**
- * When the user clicks anywhere outside of the modal, close it
- */
-window.onclick = function (event) {
-    if (event.target == modal) {
-        modal.style.display = "none";
-    }
-    if (event.target == registerModal) {
-        registerModal.style.display = "none";
-    }
-    if (event.target == facebookModal) {
-        facebookModal.style.display = "none";
-    }
-}
-
-/**
- * When ESC is pressed, close modal
- */
-document.addEventListener('keyup', function(e) {
-    if (e.keyCode == 27) {
-        modal.style.display = "none";
-        registerModal.style.display = "none";
-
-    }
-});
-/**
- * Created by joey on 2-2-17.
- */

website/public/js/main.js

@@ -3,7 +3,8 @@ var months = ["januari", "februari", "maart", "april", "mei", "juni", "juli", "a
 
 function fancyText(text) {
     // Add links, images, gifs and (youtube) video's.
-    text = text.replace(/(https?:\/\/.[^ \n<>"]*)/ig, function(link) {
+    var regex = /(https?:\/\/.[^ ]*)/ig;
+    text = text.replace(regex, function(link) {
         // Add images
         if (link.match(/(https?:\/\/.[^ ]*\.(?:png|jpg|jpeg|gif))/ig)) {
             return "<img alt='" + link + "' src='" + link + "' />";
@@ -13,14 +14,14 @@ function fancyText(text) {
             return "<video width='100%'>" +
                         "<source src='"+ link +"' type='video/mp4'>" +
                         "<b>Je browser ondersteund geen video</b>" +
-                "</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
+                "</video><button class='gray' onclick='$(this).prev().get(0).play();'>Speel af</button>";
         }
         // Add ogg video's
         else if (link.match(/(https?:\/\/.[^ ]*\.(?:ogg))/ig)) {
             return "<video width='100%'>" +
                 "<source src='"+ link +"' type='video/ogg'>" +
                 "<b>Je browser ondersteund geen video</b>" +
-                "</video><button class='gray' onclick='$(this).prev().get(0).play();'><i class='fa fa-play'></i></button>";
+                "</video><button onclick='$(this).prev().get(0).play();'>Speel af</button>";
         }
         // Add youtube video's
         else if (link.match(/(https?:\/\/.(www.)?youtube|youtu.be)*watch/ig)) {
@@ -30,15 +31,13 @@ function fancyText(text) {
         }
         // Add links
         else {
-            return "<a href='" + link + "' target='_blank'>" + link + "</a>";
+            return "<a href='" + link + "'>" + link + "</a>";
         }
     });
 
     return text;
 }
 
-// This function gets the value of a cookie when given a key.
-// If it didn´t find any compatible cookie, it returns false.
 function getCookie(key) {
     cookies = document.cookie.split("; ");
     for (var i in cookies) {
@@ -50,17 +49,13 @@ function getCookie(key) {
     return false;
 }
 
-// Edit the friendship status of two users.
 function editFriendship(userID, value) {
     $.post("API/editFriendship.php", { usr: userID, action: value })
     .done(function() {
         placeFriendButtons();
-        updateMenus();
     });
 }
 
-// Show the given friends in the given list.
-// The friends are giving in JSON, and the list is giving with a hashtag.
 function showFriends(friends, list) {
     if(friends && friends != "[]") {
         $(list).load("bits/friend-item.php", {
@@ -73,8 +68,6 @@ function showFriends(friends, list) {
     }
 }
 
-// Show the given friends in the given list.
-// This function supports more options given as parameters. This adds extra functionality.
 function showFriendsPlus(friends, list, limit, action, actionType) {
     if(friends && friends != "[]") {
         $(list).load("bits/friend-item.php", {
@@ -90,7 +83,6 @@ function showFriendsPlus(friends, list, limit, action, actionType) {
     }
 }
 
-// Show the given groups in the given list.
 function showGroups(groups, list) {
     if(groups && groups != "[]") {
         $(list).load("bits/group-item.php", {

website/public/js/masonry.js

@@ -1,4 +1,3 @@
-// Vertical margin between two posts.
 margin = 20;
 
 // scrolling modal taken from http://stackoverflow.com/questions/10476632/how-to-scroll-the-page-when-a-modal-dialog-is-longer-than-the-screen
@@ -12,228 +11,136 @@ function scrollbarMargin(width, overflow) {
     });
 }
 
-// Get post from the server.
 function requestPost(postID) {
-    // Make the modal view visible.
     $(".modal").show();
 
-    // Send get request to the server to load the post.
     $.get("API/loadPost.php", { postID : postID }).done(function(data) {
         $('.modal-default').hide();
         var scrollBarWidth = window.innerWidth - document.body.offsetWidth;
         scrollbarMargin(scrollBarWidth, 'hidden');
         $('#modal-response').show();
-        $('#modal-response').html(fancyText(data));
+        $('#modal-response').html(data);
     });
 }
 
-// Create a new post.
 function postPost() {
     title = $("input.newpost[name='title']").val();
     content = $("textarea.newpost[name='content']").val();
 
-    // Masonrymode 2: when on group page and user is an admin.
     if (masonryMode == 2) {
-        // Create the new group post.
         $.post("API/postPost.php", { title: title,
                                      content : content,
                                      group : groupID })
             .done(function(data) {
-                if (data == "empty") {
+                masonry(masonryMode);
-                    $('#alertbox').show();
+                console.log(data);
-                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
-                    window.scrollTo(0,0);
-                } else if (data == "logged out") {
-                    window.location.href = "login.php?url=" + window.location.pathname;
-                } else if (data == "frozen") {
-                    alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is.");
-                } else {
-                    $('#alertbox').hide();
-                    masonry(masonryMode);
-                }
             });
     } else {
-        // Create the new user post.
         $.post("API/postPost.php", { title: title,
                                      content : content })
             .done(function(data) {
-                if (data == "empty") {
+                masonry(masonryMode);
-                    $('#alertbox').show();
+                console.log(data);
-                    $('#alerttext').html("Geen titel of inhoud; vul a.u.b. in.");
-                    window.scrollTo(0,0);
-                } else if (data == "logged out") {
-                    window.location.href = "login.php?url=" + window.location.pathname;
-                } else if (data == "frozen") {
-                    alert("Je account is bevroren, dus je kan geen posts plaatsen. Contacteer een admin als je denkt dat dit onjuist is.");
-                } else {
-                    $('#alertbox').hide();
-                    masonry(masonryMode);
-                }
             });
     }
 
 
 }
 
-var masonryMode = 0;
-var windowWidth;
-var columnCount;
-var columns;
-var postLimit;
-var postAmount = 0;
-var noposts = false;
-
-$(document).ready(function () {
-    // Initialise variables for masonry.
-    windowWidth = $(window).width();
-    columnCount = Math.floor($(".posts").width() / 250);
-    columns = new Array(columnCount);
-    postLimit = columnCount * 7;
-});
-
 $(window).on("load", function() {
-    $(".modal-close").click(function (){closeModal()});
+    $(".modal-close").click(function () {
-
+        $(".modal").hide();
-    // http://stackoverflow.com/questions/9439725/javascript-how-to-detect-if-browser-window-is-scrolled-to-bottom
+        scrollbarMargin(0, 'auto');
-    // Infinite scroll.
+        $('#modal-response').hide();
-    window.onscroll = function(ev) {
+        $('.modal-default').show();
-        if($(window).scrollTop() + $(window).height() == $(document).height() ) {
-            loadMorePosts(userID, groupID, postAmount, postLimit);
-        }
-    };
-
-    $(document).keyup(function(e) {
-        if (e.keyCode == 27) {
-            closeModal();
-        }
     });
-
-    $('.modal').click(function() {
-        closeModal();
-    });
-
-    $('.modal-content').click(function(event){
-        event.stopPropagation();
-    });
-
 });
 
-// Hide modal view from the screen.
+var masonryMode = 0;
-function closeModal() {
+var windowWidth = $(window).width();
-    $(".modal").hide();
-    scrollbarMargin(0, 'auto');
-    $('#modal-response').hide();
-    $('.modal-default').show();
-}
 
-// Will fire when user resizes the window.
 $(window).resize(function() {
     clearTimeout(window.resizedFinished);
     window.resizeFinished = setTimeout(function() {
-        // Check if the width of the screen changed.
         if ($(window).width() != windowWidth) {
-            // Save width.
             windowWidth = $(window).width();
-            // Check if there fit more or less columns in the new width.
+            masonry(masonryMode);
-            if (columnCount != Math.floor($(".posts").width() / 250)) {
-                columnCount = Math.floor($(".posts").width() / 250);
-                // Respawn the masonry grid.
-                masonry(masonryMode);
-            }
         }
     }, 250);
 });
 
-// Select the container for masonry.
 var $container = $(".posts");
 
-// Spawn the masonry grid.
 function masonry(mode) {
-    // save the masonry mode.
     masonryMode = mode;
     $container.children().remove();
+    columnCount = Math.floor($(".posts").width() / 250);
 
-    // reinit posts
+    /*
-    noposts = false;
+     * Initialise columns.
-    postAmount = 0;
+     */
-
+    var columns = new Array(columnCount);
-    // Initialise columns.
+    var $columns = new Array(columnCount);
     for (i = 0; i < columnCount; i++) {
-        $column = $("<div class=\"column\">");
+        $column = $("<div class='column'>");
         $column.width(100/columnCount + "%");
         $container.append($column);
         columns[i] = [0, $column];
     }
 
-    // Place the form for new posts.
     if(mode > 0) {
-        $postInput = $("<div class=\"post platform\">");
+        $postInput = $("<div class='post platform'>");
-        $form = $("<form class=\"newpost\" action=\"API/postPost.php\" method=\"post\" onsubmit=\"postPost(); return false;\">");
+        $form = $("<form class='newpost' action='API/postPost.php' method='post' onsubmit='postPost(); return false;'>");
         $postInput.append($form);
 
-        //Add extra input for group posts.
         if(mode == 2) {
-            $form.append($("<input class=\"newpost\" type=\"hidden\" name=\"group\" value=\"" + groupID + "\">"));
+            $form.append($("<input class='newpost' type='hidden' name='group' value='" + groupID + "'>"));
         }
 
-        $form.append($("<input class=\"newpost\" name=\"title\" placeholder=\"Titel\" type=\"text\">"));
+        $form.append($("<input class='newpost' name='title' placeholder='Titel' type='text'>"));
-        $form.append($("<textarea class=\"newpost\" name=\"content\" placeholder=\"Schrijf een berichtje...\" maxlength='1000'></textarea><span></span>"));
+        $form.append($("<textarea class='newpost' name='content' placeholder='Schrijf een berichtje...'>"));
-        $form.append($("<button type=\"submit\"><i class='fa fa-sticky-note-o'></i> Plaats!</button>"));
+        $form.append($("<label for='picture'>Voeg een foto toe</label><input class='newpost' name='picture' id='picture' type='file' accept='image/*' size='4000000'>"));
+        $form.append($("<input value='Plaats!' type='submit'>"));
         columns[0][1].append($postInput);
 
         columns[0][0] = $postInput.height() + margin;
     }
 
-    // Get the posts from the server.
+    /*
-    loadMorePosts(userID, groupID, 0, postLimit);
+     * Function will find the column with the shortest height.
-}
+     */
+    function getShortestColumn(columns) {
+        column = columns[0];
 
-// Find the column with the shortest hight.
+        for (i = 1; i < columnCount; i++) {
-function getShortestColumn(columns) {
+            if (column[0] > columns[i][0]) {
-    column = columns[0];
+                column = columns[i];
-
-    for (i = 1; i < columnCount; i++) {
-        if (column[0] > columns[i][0]) {
-            column = columns[i];
-        }
-    }
-    return column;
-}
-
-// Load certain range of posts.
-function loadMorePosts(uID, gID, offset, limit) {
-    if (noposts) {
-        return;
-    }
-
-    // Get a list of posts from the server.
-    $.post("API/getPosts.php", { usr : uID,
-                                 grp : gID,
-                                 offset : offset,
-                                 limit : limit})
-        .done(function(data) {
-            if (!data) {
-                // No posts were found, show noposts bar to user.
-                $('.noposts').show();
-                noposts = true;
-                return;
             }
+        }
+        return column;
+    }
 
-            posts = JSON.parse(data);
+    /*
+     * Get the posts from the server.
+     */
+    $.post("API/getPosts.php", { usr : userID, grp : groupID })
+           .done(function(data) {
+               posts = JSON.parse(data);
 
-             // Rearange the objects.
+               /*
-            $.each(posts, function() {
+                * Rearange the objects.
-                $post = $("<div class=\"post platform\" onclick=\"requestPost(\'"+this['postID']+"\')\">");
+                */
-                $post.append($("<h2>").html(this["title"]));
+               $.each(posts, function() {
-                $post.append($("<p>").html(fancyText(this["content"])));
+                   $post = $("<div class='post platform' onclick='requestPost(\'"+this['postID']+"\')'>");
-                $post.append($("<p class=\"subscript\">").text(this["nicetime"]));
+                   $post.append($("<h2>").html(this["title"]));
-                $post.append($("<p class=\"subscript\">").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"]));
+                   $post.append($("<p>").html(this["content"]));
+                   $post.append($("<p class='subscript'>").text(this["nicetime"]));
+                   $post.append($("<p class='subscript'>").text("comments: " + this["comments"] + ", niet slechts: " + this["niet_slechts"]));
 
-                shortestColumn = getShortestColumn(columns);
+                   shortestColumn = getShortestColumn(columns);
-                shortestColumn[1].append($post);
+                   shortestColumn[1].append($post);
-                shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
+                   shortestColumn[0] = shortestColumn[0] + $post.height() + margin;
-            });
+               });
-        });
+           });
+}
 
-    postAmount += limit;
-}

website/public/js/menu.js

@@ -2,125 +2,92 @@ var menuFriendsData;
 var menuGroupsData;
 var notificationMessagesData;
 var notificationRequestsData;
-var updatingMenus = 0;
 
-// On document load, load menus and loops loading menus every 10 seconds.
+
 $(document).ready(function() {
-    updateMenus();
+    loadMenuFriends(5);
-    setInterval(updateMenus, 10000);
+    loadNotificationFriends();
+    loadUnreadMessages();
+    loadMenuGroups();
+    setInterval(updateMenus, 3000);
 });
 
 
 // Update the menu  and notification items.
 function updateMenus() {
-    if (updatingMenus <= 0) {
+    loadMenuFriends(5);
-        loadMenuFriends(5);
+    loadNotificationFriends();
-        loadNotificationFriends();
+    loadUnreadMessages();
-        loadUnreadMessages();
+    loadMenuGroups();
-        loadMenuGroups();
-    }
 }
 
 
-// Get the friends and insert them in the menu.
+// Get, every 3 seconds, the friends and insert them in the menu.
 function loadMenuFriends(limit) {
-    updatingMenus ++;
     $.post(
         "API/loadFriends.php",
         {
             limit: 5
         }
     ).done(function(data) {
-        if (data == "" || data == "[]") {
-            $("#friends-menu-section").hide();
-        } else {
-            $("#friends-menu-section").show();
-        }
         if (menuFriendsData != data) {
             menuFriendsData = data;
-            if (!showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) {
+            if (showFriends(data, "#menu-friends-list", 5, "profile.php", "GET", limit)) {
+                $("#friends-menu-section").show();
+            } else {
                 $("#friends-menu-section").hide();
             }
         }
-    }).fail(function() {
-        $("#friends-menu-section").hide();
-    }).always(function() {
-        updatingMenus --;
     });
 }
 
-// Get the groups and insert them in the menu.
+// Get, every 3 seconds, the groups and insert them in the menu.
 function loadMenuGroups() {
-    updatingMenus ++;
     $.post(
         "API/loadGroups.php",
         {
             limit: 5
         }
     ).done(function(data) {
-
-        if (data == "" || data == "[]") {
-            $("#groups-menu-section").hide();
-        } else {
-            $("#groups-menu-section").show();
-        }
         if (menuGroupsData != data) {
             menuGroupsData = data;
-            if (!showGroups(data, "#menu-groups-list")) {
+            if (showGroups(data, "#menu-groups-list")) {
+                $("#groups-menu-section").show();
+            } else {
                 $("#groups-menu-section").hide();
             }
         }
-    }).fail(function() {
-        $("#groups-menu-section").hide();
-    }).always(function() {
-        updatingMenus --;
     });
 }
 
-// Get the friends requests and insert them in the notification center.
+// Get, every 3 seconds, the friends requests and insert them in the notification center.
 function loadNotificationFriends() {
-    updatingMenus ++;
     $.post(
         "API/loadFriendRequest.php"
     ).done(function(data) {
-        if (data == "" || data == "[]") {
-            $("#friend-request-section").hide();
-        } else {
-            $("#friend-request-section").show();
-        }
         if (notificationRequestsData != data) {
             notificationRequestsData = data;
-            if (!showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) {
+            if (showFriendsPlus(data, "#friend-requests-list", 5, "profile.php", "GET")) {
+                $("#friend-request-section").show();
+            } else {
                 $("#friend-request-section").hide();
             }
         }
-    }).fail(function() {
-        $("#friend-request-section").hide();
-    }).always(function() {
-        updatingMenus --;
     });
 }
 
-// Get the unread messages and insert them in the notification center.
+// Get, every 3 seconds, the unread messages and insert them in the notification center.
 function loadUnreadMessages() {
-    updatingMenus ++;
     $.post(
         "API/loadChatNotifications.php"
     ).done(function(data) {
-        if (data == "" || data == "[]") {
-            $("#unread-messages-section").hide();
-        } else {
-            $("#unread-messages-section").show();
-        }
         if (notificationMessagesData != data) {
             notificationMessagesData = data;
-            if (!showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) {
+            if (showFriendsPlus(data, "#unread-chat-list", 5, "chat.php", "GET")) {
+                $("#unread-messages-section").show();
+            } else {
                 $("#unread-messages-section").hide();
             }
         }
-    }).fail(function() {
-        $("#unread-messages-section").hide();
-    }).always(function() {
-        updatingMenus --;
     });
 }

website/public/js/post.js

@@ -1,16 +1,11 @@
-
 function postComment(buttonValue) {
     formData = $("#newcommentform").serializeArray();
     formData.push({name: "button", value: buttonValue});
     $.post(
         "API/postComment.php",
         formData
-    ).done(function (response) {
+    ).done(function(data) {
-        if (response == "frozen") {
+        console.log(data);
-            alert("Je account is bevroren, dus je kan geen comments plaatsen of \"niet slechten\". Contacteer een admin als je denkt dat dit onjuist is.");
-        } else if (response == "logged out") {
-            window.location.href = "login.php?url=" + window.location.pathname;
-        }
     });
 
     $("#newcomment").val("");
@@ -20,22 +15,6 @@ function postComment(buttonValue) {
         "API/loadPost.php",
         $("#newcommentform").serialize()
     ).done(function (data) {
-        $('#modal-response').html(fancyText(data));
+        $('#modal-response').html(data);
     });
-}
-
-function deletePost(postID) {
-    var formData = [{name: "postID", value: postID}];
-    $.post(
-        "API/deletePost.php",
-        formData
-    ).done(function (response) {
-        if (response == "frozen") {
-            alert("Je account is bevroren, dus je kan geen posts verwijderen. Contacteer een admin als je denkt dat dit onjuist is.");
-        } else if (response == "logged out") {
-            window.location.href = "login.php?url=" + window.location.pathname;
-        }
-    });
-    closeModal();
-    masonry(masonryMode);
 }

website/public/js/registerAndLogin.js

@@ -1,23 +1,15 @@
 function checkLoggedIn() {
-    if (confirm("U bent al ingelogd!\nWilt u uitloggen?\nKlik ok om uit te loggen.") == true) {
+    if (confirm("U bent al ingelogd!!\nWilt u uitloggen?\nKlik ok om uit te loggen.") == true) {
         window.location.href = "logout.php";
     } else {
         window.location.href = "profile.php";
     }
 }
 
-function emailAlert(){
-    alert("Bevestigingsemail is gestuurd!\n");
-}
-
 function bannedAlert(){
     alert("Uw account is geband!");
 }
 
-function frozenAlert(){
-    alert("Uw account is bevroren!\n");
-}
-
 function emailNotConfirmed(){
     alert("Uw account is nog niet bevestigd!\nEr is een nieuwe email gestuurd om uw account te bevestigen");
 }

website/public/js/search.js

@@ -1,12 +1,12 @@
-$(window).on('load', function () {
+function searchUsers(n, m) {
-    pageNumber();
-});
-
-// Search for the users and put them in the user list.
-function searchUsers() {
     $.post(
         "API/searchUsers.php",
-        $('#search-form').serialize()
+        {
+            n: n,
+            m: m,
+            search: $("#search-input").val(),
+            filter: $("#search-filter").val()
+        }
     ).done(function(data) {
         if (!showFriends(data, "#search-users-list", 0, "profile.php", "GET")) {
             $("#search-users-list").text("Niemand gevonden");
@@ -14,31 +14,18 @@ function searchUsers() {
     });
 }
 
-// Search for the groups and put them in the group list.
+function searchGroups(n, m) {
-function searchGroups() {
     $.post(
         "API/searchGroups.php",
-        $('#search-form').serialize()
+        {
+            n: n,
+            m: m,
+            search: $("#search-input").val(),
+            filter: $("#search-filter").val()
+        }
     ).done(function(data) {
         if (!showGroups(data, "#search-groups-list")) {
             $("#search-groups-list").text("Geen groepen gevonden");
         }
     });
-}
-
-// Get the page numbers and return them in the select.
-function pageNumber() {
-    var input = input2 = $('#search-form').serialize();
-    $.post(
-        "API/searchPageNumber.php",
-        input + "&option=user"
-    ).done(function (data) {
-        $('#user-pageselect').html(data);
-    });
-    $.post(
-        "API/searchPageNumber.php",
-        input2 + "&option=group"
-    ).done(function (data) {
-        $('#group-pageselect').html(data);
-    });
 }

website/public/login.php

@@ -8,17 +8,58 @@
     include_once("../queries/emailconfirm.php");
     include_once("../queries/requestpassword.php");
     include_once("../queries/register.php");
-    require_once("../queries/Facebook/autoload.php");
-
 ?>
 <body>
 <?php
+    session_start();
 
-include("../views/homeLoginRegister.php");
+    if(isset($_SESSION["userID"])){
+      echo "<script>
+                window.onload=checkLoggedIn();
+            </script>";
+    }
 
+    // define variables and set to empty values
+    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
+    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
+    $correct = true;
+    $day_date = "dag";
+    $month_date = "maand";
+    $year_date = "jaar";
+
+    // Define variables and set to empty values
+    $user = $psw = $remember ="";
+    $loginErr = $resetErr ="";
+
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+        switch ($_POST["submit"]) {
+            case "login":
+                try {
+                    $user = ($_POST["user"]);
+                    validateLogin($_POST["user"], $_POST["psw"]);
+                } catch(loginException $e) {
+                    $loginErr = $e->getMessage();
+                }
+                break;
+            case "reset":
+                try {
+                    resetEmail($_POST["forgotEmail"]);
+                    sendPasswordRecovery($_POST["forgotEmail"]);
+                } catch (emailException $e){
+                    $resetErr = $e->getMessage();
+                    echo "<script>
+                            window.onload = function() {
+                              $('#myModal').show();
+                            }
+                          </script>";
+                }
+                break;
+            case "register":
+                include("register.php");
+        }
+    }
 /* This view adds login view */
 include("../views/login-view.php");
 ?>
-<script src="js/loginRegisterModals.js"></script>;
 </body>
 </html>

website/public/manifest.json

@@ -1,44 +0,0 @@
-{
-  "name": "Web Application Manifest Sample",
-  "icons": [
-    {
-      "src": "launcher-icon-0-75x.png",
-      "sizes": "36x36",
-      "type": "image/png",
-      "density": "0.75"
-    },
-    {
-      "src": "launcher-icon-1x.png",
-      "sizes": "48x48",
-      "type": "image/png",
-      "density": "1.0"
-    },
-    {
-      "src": "launcher-icon-1-5x.png",
-      "sizes": "72x72",
-      "type": "image/png",
-      "density": "1.5"
-    },
-    {
-      "src": "launcher-icon-2x.png",
-      "sizes": "96x96",
-      "type": "image/png",
-      "density": "2.0"
-    },
-    {
-      "src": "launcher-icon-3x.png",
-      "sizes": "144x144",
-      "type": "image/png",
-      "density": "3.0"
-    },
-    {
-      "src": "launcher-icon-4x.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "density": "4.0"
-    }
-  ],
-  "start_url": "index.html",
-  "display": "standalone",
-  "orientation": "portrait"
-}

website/public/profile.php

@@ -13,11 +13,10 @@
 </head>
 <body>
 <?php
-include_once("../queries/user.php");
+include("../queries/user.php");
-include_once("../queries/friendship.php");
+include("../queries/friendship.php");
-include_once("../queries/nicetime.php");
+include("../queries/nicetime.php");
-include_once("../queries/post.php");
+include("../queries/post.php");
-include_once("../queries/calcAge.php");
 
 if(empty($_GET["username"])) {
     $userID = $_SESSION["userID"];
@@ -25,16 +24,9 @@ if(empty($_GET["username"])) {
     $userID = getUserID($_GET["username"]);
 }
 
-
+$user = selectUser($_SESSION["userID"], $userID);
-if (isset($_SESSION["userID"]) and !$user = selectUser($_SESSION["userID"], $userID)) {
-    header("HTTP/1.0 404 Not Found");
-    header("Location: error/404.php");
-    die();
-}
-
 $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);
-$showProfile = $user["showProfile"] || ($user["status"] == 'confirmed') || $_SESSION["userID"] == $userID;
 
 
 if ($userID == $_SESSION["userID"]) {

website/public/register(stash).php

@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html>
+<?php
+    include("../views/login_head.php");
+    require_once("../queries/connect.php");
+    include_once("../queries/register.php");
+    include_once("../queries/checkInput.php");
+    include_once("../queries/emailconfirm.php");
+?>
+<body>
+<?php
+    session_start();
+
+    if(isset($_SESSION["userID"])){
+        header("location: login.php");
+    }
+    // define variables and set to empty values
+    $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
+    $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $confirmEmailErr = $captchaErr = "";
+    $correct = true;
+    $day_date = "dag";
+    $month_date = "maand";
+    $year_date = "jaar";
+
+    // Trying to register an account
+    if ($_SERVER["REQUEST_METHOD"] == "POST") {
+        try {
+            $name = test_input(($_POST["name"]));
+            checkInputChoice($name, "lettersAndSpaces");
+        } catch(lettersAndSpacesException $e){
+            $correct = false;
+            $nameErr = $e->getMessage();
+        }
+
+        try {
+            $surname = test_input(($_POST["surname"]));
+            checkInputChoice($surname, "lettersAndSpaces");
+        }
+        catch(lettersAndSpacesException $e){
+            $correct = false;
+            $surnameErr = $e->getMessage();
+        }
+
+        try{
+            $day_date = test_input(($_POST["day_date"]));
+            $month_date = test_input(($_POST["month_date"]));
+            $year_date = test_input(($_POST["year_date"]));
+            $bday = $year_date . "-" . $month_date . "-" . $day_date;
+            checkInputChoice($bday, "bday");
+        } catch(bdayException $e){
+            $correct = false;
+            $bdayErr = $e->getMessage();
+        }
+
+        try{
+            $username = str_replace(' ', '', test_input(($_POST["username"])));
+            checkInputChoice($username, "username");
+        } catch(usernameException $e){
+            $correct = false;
+            $usernameErr = $e->getMessage();
+        }
+
+        try{
+            $password = str_replace(' ', '', test_input(($_POST["password"])));
+            checkInputChoice($password, "longerEight");
+            matchPassword();
+        } catch(passwordException $e){
+            $correct = false;
+            $passwordErr = $e->getMessage();
+        } catch(confirmPasswordException $e){
+            $correct = false;
+            $confirmPasswordErr = $e->getMessage();
+        }
+
+        try{
+            $location = test_input(($_POST["location"]));
+            checkInputChoice($location, "lettersAndSpaces");
+        } catch(lettersAndSpacesException $e){
+            $correct = false;
+            $locationErr = $e->getMessage();
+        }
+
+        try{
+            $email = test_input(($_POST["email"]));
+            checkInputChoice($email, "email");
+            $confirmEmail = test_input(($_POST["confirmEmail"]));
+            matchEmail();
+        } catch(emailException $e){
+            $correct = false;
+            $emailErr = $e->getMessage();
+        } catch(confirmEmailException $e){
+            $correct = false;
+            $confirmEmailErr = $e->getMessage();
+        }
+
+        try{
+            $captcha = $_POST['g-recaptcha-response'];
+            checkCaptcha($captcha);
+        } catch(captchaException $e){
+            $correct = false;
+            $captchaErr = $e->getMessage();
+        }
+
+        try {
+            getIp();
+            registerCheck($correct);
+            sendConfirmEmailUsername($username);
+        } catch(registerException $e){
+            $genericErr = $e->getMessage();
+        }
+    }
+/* This view adds register view */
+include("../views/register-view.php");
+?>
+</body>
+</html>

website/public/register.php

@@ -50,7 +50,7 @@
 
     try{
         $location = test_input(($_POST["location"]));
-        checkInputChoice($location, "");
+        checkInputChoice($location, "lettersAndSpaces");
     } catch(lettersAndSpacesException $e){
         $correct = false;
         $locationErr = $e->getMessage();
@@ -80,12 +80,12 @@
     try {
         getIp();
         registerCheck($correct);
-        sendConfirmEmail(getUserID()["userID"]);
+        sendConfirmEmailUsername($username);
     } catch(registerException $e){
         echo "<script>
-                window.onload = function() {
+                            window.onload = function() {
-                  $('#registerModal').show();
+                              $('#registerModal').show();
-                }
+                            }
-              </script>";
+                          </script>";
         $genericErr = $e->getMessage();
     }

website/public/settings.php

@@ -14,13 +14,11 @@
 <?php
 $alertClass;
 $alertMessage;
-
-// Select which button has been pressed.
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     try {
         switch ($_POST["form"]) {
             case "profile":
-                checkUpdateSettings();
+                updateSettings();
                 break;
             case "password":
                 changePassword();
@@ -31,6 +29,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
             case "picture":
                 updateAvatar();
                 break;
+
         }
     } catch (AlertMessage $w) {
         $alertClass = $w->getClass();

website/public/styles/adminpanel.css

@@ -1,13 +1,11 @@
+.admin-panel {
+    min-width: 800px;
+}
 
 .admin-panel input[type="radio"], input[type="checkbox"] {
     vertical-align: middle;
-    height: 14px;
+    height: auto;
-    width: 14px;
+    margin: 2px;
-    margin: 7px;
-}
-
-.table-checkbox {
-    width: 28px;
 }
 
 .admin-searchform {
@@ -36,33 +34,20 @@
     width: 100%;
 }
 
-.table-checkbox {width: 20px}
+.usertable .table-checkbox {width: 20px}
-.table-username {width: 150px}
+.usertable .table-username {width: 150px}
-.table-status {width: 100px}
+.usertable .table-status {width: 100px}
-.table-action {width: 200px}
+.usertable .table-action {width: 200px}
 
 .usertable th, td {
     border-bottom: 1px solid #ddd;
     padding: 3px;
-    word-wrap: break-word;
 }
 
-.usertable th, tr {
+.usertable tr {
     text-align: left;
 }
 
 .usertable tr:hover {
     background-color: #f5f5f5;
 }
-
-.bancomment {
-    width: 80%;
-}
-
-.bancommentedit {
-    display: none;
-}
-
-.bancommentform input[type="text"] {
-    width: 80%;
-}

website/public/styles/chat.css

@@ -22,7 +22,6 @@ body {
     height: calc(100% - 100px);
 
     display: inline-block;
-    float: left;
 
     overflow-y: auto;
 }
@@ -32,14 +31,12 @@ body {
     overflow-y: auto;
     overflow-x: hidden;
 
-    width: calc(100% - 256px - 85px);
+    width: calc(100% - 256px - 75px);
     height: calc(100% - 80px);
-    margin-right: 10px;
 
     padding: 10px;
 
     display: inline-block;
-    float: right;
 
     word-wrap: break-word;
 }

website/public/styles/header.css

@@ -49,7 +49,7 @@ header div {
 }
 
 #open-notifications {
-    padding: 20px 20px 20px 0px;
+    padding: 5px 20px 5px 0px;
 }
 
 @media only screen and (max-width: 1080px) {

website/public/styles/index.css

@@ -10,19 +10,6 @@ a.button {
 
 }
 
-a.fbButton {
-    background-color: #3B5998;
-    border-radius: 5px;
-    color: black;
-    cursor: pointer;
-    padding: 8px 20px;
-    font-family: Arial;
-    font-size: 22px;
-    color: white;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
-
-}
-
 /* Body */
 body {
     height: 100%;
@@ -41,7 +28,7 @@ body {
 form {
     /*background-color: #a87a87;*/
     border-radius: 12px;
-    height: 80%;
+    height: 85%;
     margin: auto;
     width: 600px;
     overflow-y: auto;
@@ -133,12 +120,6 @@ label {
     color: red;
 }
 
-.login_containerNoscript {
-    padding: 4px;
-    text-align: center;
-    color: red;
-}
-
 @keyframes animatezoom {
     from {transform: scale(0)}
     to {transform: scale(1)}
@@ -156,7 +137,7 @@ label {
     margin: 16px auto;
     overflow-y: auto;
     padding: 20px;
-    width: 650px;
+    width: 600px;
 }
 
 select{
@@ -173,7 +154,7 @@ ul {
     display: none; /* Hidden by default */
     position: fixed; /* Stay in place */
     z-index: 1; /* Sit on top */
-    padding-top: 75px; /* Location of the box */
+    padding-top: 30px; /* Location of the box */
     left: 0;
     top: 0;
     width: 100%; /* Full width */
@@ -198,6 +179,12 @@ ul {
     animation-duration: 0.4s
 }
 
+/* Add Animation */
+@-webkit-keyframes animatetop {
+    from {top:-300px; opacity:0}
+    to {top:0; opacity:1}
+}
+
 @keyframes animatetop {
     from {top:-300px; opacity:0}
     to {top:0; opacity:1}
@@ -229,7 +216,6 @@ ul {
 }
 
 .modal-footer {
-    padding: 2px 8px;
     background-color: #FBC02D;
     color: black;
 }

website/public/styles/main.css

@@ -92,14 +92,6 @@ p {
     border-radius: 50%;
 }
 
-.online {
-    border: #4CAF50 solid 3px;
-}
-
-.offline {
-    border: #666666 solid 3px;
-}
-
 .group-picture {
     border-radius: 5px;
 }
@@ -116,7 +108,7 @@ p {
 
 @media only screen and (max-width: 1400px) {
     .item-box {
-        width: calc(100% - 50px)!important;
+        width: calc(100% - 50px);
     }
 }
 
@@ -256,6 +248,8 @@ div[data-title]:hover:after {
     top: 150%;
     z-index: 200;
     white-space: nowrap;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
     border-radius: 3px;
     box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22);
     background-color: #333;
@@ -288,20 +282,25 @@ div[data-title]:hover:after {
     vertical-align: middle;
 }
 
+::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+}
+::-webkit-scrollbar-track {
+    background: none;
+}
+::-webkit-scrollbar-thumb {
+    -webkit-border-radius: 20px;
+    border-radius: 20px;
+    background: #4CAF50;
+}
+
 @media only screen and (max-width: 1080px) {
     body {
         font-size: 28px!important;
     }
-    button, input, select {
+    button {
         font-size: 28px;
-        height: 42px;
-    }
-    textarea {
-        font-size: 28px;
-    }
-    input[type="checkbox"], input[type="radio"] {
-        width: 28px;
-        height: 28px;
     }
 
 }

website/public/styles/post-popup.css

@@ -14,7 +14,7 @@
 
 /* Modal Content/Box */
 .modal-content {
-    margin: 50px auto;
+    margin: 5% auto;
     width: 70%; /* Could be more or less, depending on screen size */
     overflow-y: auto;
 }
@@ -48,10 +48,6 @@
     width: 90%;
 }
 
-.post-content a {
-    text-decoration: underline;
-}
-
 .commentfield {
     margin-bottom: 20px;
 }
@@ -87,9 +83,4 @@
     vertical-align: middle;
     height: 24px;
     width: 24px;
-}
-
-.deleteButton {
-    background-color: firebrick;
-    float: right;
 }

website/public/styles/profile.css

@@ -1,14 +1,5 @@
 /* New */
 
-.alertbox {
-    display: none;
-    background-color: firebrick;
-}
-
-.alerttext {
-    color: white;
-}
-
 .user-box {
     text-align: center;
 }
@@ -20,33 +11,21 @@
     display: inline-block;
 }
 
-.friend-button-container, .group-button-container {
+.friend-button-container {
     position: relative;
     float: right;
     width: 200px;
     display: inline-block;
 }
 
-.friend-button-container div, .status-buttons-container div {
+.friend-button-container button, .status-buttons-container button {
-    width: 200px;
-    display: inline-block;
-}
-
-.friend-button-container button, .status-buttons-container button, .group-button-container button {
     display: block;
-    float: right;
 
     margin: 7px 0;
+    width: 200px;
 
     font-size: 18px;
 }
-.status-buttons-container button {
-    float: left;
-}
-
-.group-button-container button {
-    float: right;
-}
 
 .empty-button {
     background: none;
@@ -66,36 +45,12 @@
 
 .main-picture {
     position: relative;
-    border-width: 5px;
+    border: #4CAF50 solid 5px;
 
     display: inline-block;
     width: 150px;
     height: 150px;
     margin-bottom: -45px;
-
-    object-fit: cover;
-    vertical-align: middle;
-}
-
-.group-picture {
-    border: none;
-}
-
-.fancy-button span {
-    display: none;
-}
-
-.fancy-button:hover {
-    text-align: right;
-}
-
-.fancy-button i {
-    display: inline-block;
-}
-
-.fancy-button:hover span {
-    display: inline-block;
-    margin-right: 5px;
 }
 
 /* Old */
@@ -121,10 +76,6 @@ div.posts div.post {
     word-wrap: break-word;
 }
 
-div.posts div.post a {
-    text-decoration: underline;
-}
-
 div.posts div.post:hover {
     box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
 }
@@ -143,7 +94,7 @@ div.posts .post form input, div.posts .post form textarea {
     width: calc(100% - 15px);
 }
 
-div.posts .post form input[type="submit"], .post button{
+div.posts .post form input[type="submit"] {
     width: 100%;
 }
 
@@ -158,11 +109,6 @@ div.posts .post form textarea.newpost {
     font-size: 0.8em;
 }
 
-.noposts {
-    display: none;
-    text-align: center;
-}
-
 @media only screen and (max-width: 1500px) {
     .post-box {
         width: calc(50% - 68px);
@@ -174,8 +120,4 @@ div.posts .post form textarea.newpost {
     .post-box {
         width: calc(100% - 65px);
     }
-    .modal {
-        left: 0!important;
-        width: 100%!important;
-    }
 }

website/public/styles/settings.css

@@ -32,11 +32,6 @@
     text-align: right;
 }
 
-.settings-password, .settings-email {
-    width: calc(50% - 60px);
-    display: inline-flex;
-}
-
 .settings-password label, .settings-email label {
     text-align: left;
 }

website/queries/Facebook/Authentication/AccessToken.php

@@ -1,160 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Authentication;
-
-/**
- * Class AccessToken
- *
- * @package Facebook
- */
-class AccessToken
-{
-    /**
-     * The access token value.
-     *
-     * @var string
-     */
-    protected $value = '';
-
-    /**
-     * Date when token expires.
-     *
-     * @var \DateTime|null
-     */
-    protected $expiresAt;
-
-    /**
-     * Create a new access token entity.
-     *
-     * @param string $accessToken
-     * @param int    $expiresAt
-     */
-    public function __construct($accessToken, $expiresAt = 0)
-    {
-        $this->value = $accessToken;
-        if ($expiresAt) {
-            $this->setExpiresAtFromTimeStamp($expiresAt);
-        }
-    }
-
-    /**
-     * Generate an app secret proof to sign a request to Graph.
-     *
-     * @param string $appSecret The app secret.
-     *
-     * @return string
-     */
-    public function getAppSecretProof($appSecret)
-    {
-        return hash_hmac('sha256', $this->value, $appSecret);
-    }
-
-    /**
-     * Getter for expiresAt.
-     *
-     * @return \DateTime|null
-     */
-    public function getExpiresAt()
-    {
-        return $this->expiresAt;
-    }
-
-    /**
-     * Determines whether or not this is an app access token.
-     *
-     * @return bool
-     */
-    public function isAppAccessToken()
-    {
-        return strpos($this->value, '|') !== false;
-    }
-
-    /**
-     * Determines whether or not this is a long-lived token.
-     *
-     * @return bool
-     */
-    public function isLongLived()
-    {
-        if ($this->expiresAt) {
-            return $this->expiresAt->getTimestamp() > time() + (60 * 60 * 2);
-        }
-
-        if ($this->isAppAccessToken()) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Checks the expiration of the access token.
-     *
-     * @return boolean|null
-     */
-    public function isExpired()
-    {
-        if ($this->getExpiresAt() instanceof \DateTime) {
-            return $this->getExpiresAt()->getTimestamp() < time();
-        }
-
-        if ($this->isAppAccessToken()) {
-            return false;
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the access token as a string.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Returns the access token as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getValue();
-    }
-
-    /**
-     * Setter for expires_at.
-     *
-     * @param int $timeStamp
-     */
-    protected function setExpiresAtFromTimeStamp($timeStamp)
-    {
-        $dt = new \DateTime();
-        $dt->setTimestamp($timeStamp);
-        $this->expiresAt = $dt;
-    }
-}

website/queries/Facebook/Authentication/AccessTokenMetadata.php

@@ -1,390 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Authentication;
-
-use Facebook\Exceptions\FacebookSDKException;
-
-/**
- * Class AccessTokenMetadata
- *
- * Represents metadata from an access token.
- *
- * @package Facebook
- * @see     https://developers.facebook.com/docs/graph-api/reference/debug_token
- */
-class AccessTokenMetadata
-{
-    /**
-     * The access token metadata.
-     *
-     * @var array
-     */
-    protected $metadata = [];
-
-    /**
-     * Properties that should be cast as DateTime objects.
-     *
-     * @var array
-     */
-    protected static $dateProperties = ['expires_at', 'issued_at'];
-
-    /**
-     * @param array $metadata
-     *
-     * @throws FacebookSDKException
-     */
-    public function __construct(array $metadata)
-    {
-        if (!isset($metadata['data'])) {
-            throw new FacebookSDKException('Unexpected debug token response data.', 401);
-        }
-
-        $this->metadata = $metadata['data'];
-
-        $this->castTimestampsToDateTime();
-    }
-
-    /**
-     * Returns a value from the metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getField($field, $default = null)
-    {
-        if (isset($this->metadata[$field])) {
-            return $this->metadata[$field];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns a value from the metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     *
-     * @deprecated 5.0.0 getProperty() has been renamed to getField()
-     * @todo v6: Remove this method
-     */
-    public function getProperty($field, $default = null)
-    {
-        return $this->getField($field, $default);
-    }
-
-    /**
-     * Returns a value from a child property in the metadata.
-     *
-     * @param string $parentField The parent property.
-     * @param string $field       The property to retrieve.
-     * @param mixed  $default     The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getChildProperty($parentField, $field, $default = null)
-    {
-        if (!isset($this->metadata[$parentField])) {
-            return $default;
-        }
-
-        if (!isset($this->metadata[$parentField][$field])) {
-            return $default;
-        }
-
-        return $this->metadata[$parentField][$field];
-    }
-
-    /**
-     * Returns a value from the error metadata.
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getErrorProperty($field, $default = null)
-    {
-        return $this->getChildProperty('error', $field, $default);
-    }
-
-    /**
-     * Returns a value from the "metadata" metadata. *Brain explodes*
-     *
-     * @param string $field   The property to retrieve.
-     * @param mixed  $default The default to return if the property doesn't exist.
-     *
-     * @return mixed
-     */
-    public function getMetadataProperty($field, $default = null)
-    {
-        return $this->getChildProperty('metadata', $field, $default);
-    }
-
-    /**
-     * The ID of the application this access token is for.
-     *
-     * @return string|null
-     */
-    public function getAppId()
-    {
-        return $this->getField('app_id');
-    }
-
-    /**
-     * Name of the application this access token is for.
-     *
-     * @return string|null
-     */
-    public function getApplication()
-    {
-        return $this->getField('application');
-    }
-
-    /**
-     * Any error that a request to the graph api
-     * would return due to the access token.
-     *
-     * @return bool|null
-     */
-    public function isError()
-    {
-        return $this->getField('error') !== null;
-    }
-
-    /**
-     * The error code for the error.
-     *
-     * @return int|null
-     */
-    public function getErrorCode()
-    {
-        return $this->getErrorProperty('code');
-    }
-
-    /**
-     * The error message for the error.
-     *
-     * @return string|null
-     */
-    public function getErrorMessage()
-    {
-        return $this->getErrorProperty('message');
-    }
-
-    /**
-     * The error subcode for the error.
-     *
-     * @return int|null
-     */
-    public function getErrorSubcode()
-    {
-        return $this->getErrorProperty('subcode');
-    }
-
-    /**
-     * DateTime when this access token expires.
-     *
-     * @return \DateTime|null
-     */
-    public function getExpiresAt()
-    {
-        return $this->getField('expires_at');
-    }
-
-    /**
-     * Whether the access token is still valid or not.
-     *
-     * @return boolean|null
-     */
-    public function getIsValid()
-    {
-        return $this->getField('is_valid');
-    }
-
-    /**
-     * DateTime when this access token was issued.
-     *
-     * Note that the issued_at field is not returned
-     * for short-lived access tokens.
-     *
-     * @see https://developers.facebook.com/docs/facebook-login/access-tokens#debug
-     *
-     * @return \DateTime|null
-     */
-    public function getIssuedAt()
-    {
-        return $this->getField('issued_at');
-    }
-
-    /**
-     * General metadata associated with the access token.
-     * Can contain data like 'sso', 'auth_type', 'auth_nonce'.
-     *
-     * @return array|null
-     */
-    public function getMetadata()
-    {
-        return $this->getField('metadata');
-    }
-
-    /**
-     * The 'sso' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getSso()
-    {
-        return $this->getMetadataProperty('sso');
-    }
-
-    /**
-     * The 'auth_type' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getAuthType()
-    {
-        return $this->getMetadataProperty('auth_type');
-    }
-
-    /**
-     * The 'auth_nonce' child property from the 'metadata' parent property.
-     *
-     * @return string|null
-     */
-    public function getAuthNonce()
-    {
-        return $this->getMetadataProperty('auth_nonce');
-    }
-
-    /**
-     * For impersonated access tokens, the ID of
-     * the page this token contains.
-     *
-     * @return string|null
-     */
-    public function getProfileId()
-    {
-        return $this->getField('profile_id');
-    }
-
-    /**
-     * List of permissions that the user has granted for
-     * the app in this access token.
-     *
-     * @return array
-     */
-    public function getScopes()
-    {
-        return $this->getField('scopes');
-    }
-
-    /**
-     * The ID of the user this access token is for.
-     *
-     * @return string|null
-     */
-    public function getUserId()
-    {
-        return $this->getField('user_id');
-    }
-
-    /**
-     * Ensures the app ID from the access token
-     * metadata is what we expect.
-     *
-     * @param string $appId
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateAppId($appId)
-    {
-        if ($this->getAppId() !== $appId) {
-            throw new FacebookSDKException('Access token metadata contains unexpected app ID.', 401);
-        }
-    }
-
-    /**
-     * Ensures the user ID from the access token
-     * metadata is what we expect.
-     *
-     * @param string $userId
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateUserId($userId)
-    {
-        if ($this->getUserId() !== $userId) {
-            throw new FacebookSDKException('Access token metadata contains unexpected user ID.', 401);
-        }
-    }
-
-    /**
-     * Ensures the access token has not expired yet.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateExpiration()
-    {
-        if (!$this->getExpiresAt() instanceof \DateTime) {
-            return;
-        }
-
-        if ($this->getExpiresAt()->getTimestamp() < time()) {
-            throw new FacebookSDKException('Inspection of access token metadata shows that the access token has expired.', 401);
-        }
-    }
-
-    /**
-     * Converts a unix timestamp into a DateTime entity.
-     *
-     * @param int $timestamp
-     *
-     * @return \DateTime
-     */
-    private function convertTimestampToDateTime($timestamp)
-    {
-        $dt = new \DateTime();
-        $dt->setTimestamp($timestamp);
-
-        return $dt;
-    }
-
-    /**
-     * Casts the unix timestamps as DateTime entities.
-     */
-    private function castTimestampsToDateTime()
-    {
-        foreach (static::$dateProperties as $key) {
-            if (isset($this->metadata[$key])) {
-                $this->metadata[$key] = $this->convertTimestampToDateTime($this->metadata[$key]);
-            }
-        }
-    }
-}

website/queries/Facebook/Authentication/OAuth2Client.php

@@ -1,292 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Authentication;
-
-use Facebook\Facebook;
-use Facebook\FacebookApp;
-use Facebook\FacebookRequest;
-use Facebook\FacebookResponse;
-use Facebook\FacebookClient;
-use Facebook\Exceptions\FacebookResponseException;
-use Facebook\Exceptions\FacebookSDKException;
-
-/**
- * Class OAuth2Client
- *
- * @package Facebook
- */
-class OAuth2Client
-{
-    /**
-     * @const string The base authorization URL.
-     */
-    const BASE_AUTHORIZATION_URL = 'https://www.facebook.com';
-
-    /**
-     * The FacebookApp entity.
-     *
-     * @var FacebookApp
-     */
-    protected $app;
-
-    /**
-     * The Facebook client.
-     *
-     * @var FacebookClient
-     */
-    protected $client;
-
-    /**
-     * The version of the Graph API to use.
-     *
-     * @var string
-     */
-    protected $graphVersion;
-
-    /**
-     * The last request sent to Graph.
-     *
-     * @var FacebookRequest|null
-     */
-    protected $lastRequest;
-
-    /**
-     * @param FacebookApp    $app
-     * @param FacebookClient $client
-     * @param string|null    $graphVersion The version of the Graph API to use.
-     */
-    public function __construct(FacebookApp $app, FacebookClient $client, $graphVersion = null)
-    {
-        $this->app = $app;
-        $this->client = $client;
-        $this->graphVersion = $graphVersion ?: Facebook::DEFAULT_GRAPH_VERSION;
-    }
-
-    /**
-     * Returns the last FacebookRequest that was sent.
-     * Useful for debugging and testing.
-     *
-     * @return FacebookRequest|null
-     */
-    public function getLastRequest()
-    {
-        return $this->lastRequest;
-    }
-
-    /**
-     * Get the metadata associated with the access token.
-     *
-     * @param AccessToken|string $accessToken The access token to debug.
-     *
-     * @return AccessTokenMetadata
-     */
-    public function debugToken($accessToken)
-    {
-        $accessToken = $accessToken instanceof AccessToken ? $accessToken->getValue() : $accessToken;
-        $params = ['input_token' => $accessToken];
-
-        $this->lastRequest = new FacebookRequest(
-            $this->app,
-            $this->app->getAccessToken(),
-            'GET',
-            '/debug_token',
-            $params,
-            null,
-            $this->graphVersion
-        );
-        $response = $this->client->sendRequest($this->lastRequest);
-        $metadata = $response->getDecodedBody();
-
-        return new AccessTokenMetadata($metadata);
-    }
-
-    /**
-     * Generates an authorization URL to begin the process of authenticating a user.
-     *
-     * @param string $redirectUrl The callback URL to redirect to.
-     * @param array  $scope       An array of permissions to request.
-     * @param string $state       The CSPRNG-generated CSRF value.
-     * @param array  $params      An array of parameters to generate URL.
-     * @param string $separator   The separator to use in http_build_query().
-     *
-     * @return string
-     */
-    public function getAuthorizationUrl($redirectUrl, $state, array $scope = [], array $params = [], $separator = '&')
-    {
-        $params += [
-            'client_id' => $this->app->getId(),
-            'state' => $state,
-            'response_type' => 'code',
-            'sdk' => 'php-sdk-' . Facebook::VERSION,
-            'redirect_uri' => $redirectUrl,
-            'scope' => implode(',', $scope)
-        ];
-
-        return static::BASE_AUTHORIZATION_URL . '/' . $this->graphVersion . '/dialog/oauth?' . http_build_query($params, null, $separator);
-    }
-
-    /**
-     * Get a valid access token from a code.
-     *
-     * @param string $code
-     * @param string $redirectUri
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getAccessTokenFromCode($code, $redirectUri = '')
-    {
-        $params = [
-            'code' => $code,
-            'redirect_uri' => $redirectUri,
-        ];
-
-        return $this->requestAnAccessToken($params);
-    }
-
-    /**
-     * Exchanges a short-lived access token with a long-lived access token.
-     *
-     * @param AccessToken|string $accessToken
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getLongLivedAccessToken($accessToken)
-    {
-        $accessToken = $accessToken instanceof AccessToken ? $accessToken->getValue() : $accessToken;
-        $params = [
-            'grant_type' => 'fb_exchange_token',
-            'fb_exchange_token' => $accessToken,
-        ];
-
-        return $this->requestAnAccessToken($params);
-    }
-
-    /**
-     * Get a valid code from an access token.
-     *
-     * @param AccessToken|string $accessToken
-     * @param string             $redirectUri
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    public function getCodeFromLongLivedAccessToken($accessToken, $redirectUri = '')
-    {
-        $params = [
-            'redirect_uri' => $redirectUri,
-        ];
-
-        $response = $this->sendRequestWithClientParams('/oauth/client_code', $params, $accessToken);
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['code'])) {
-            throw new FacebookSDKException('Code was not returned from Graph.', 401);
-        }
-
-        return $data['code'];
-    }
-
-    /**
-     * Send a request to the OAuth endpoint.
-     *
-     * @param array $params
-     *
-     * @return AccessToken
-     *
-     * @throws FacebookSDKException
-     */
-    protected function requestAnAccessToken(array $params)
-    {
-        $response = $this->sendRequestWithClientParams('/oauth/access_token', $params);
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['access_token'])) {
-            throw new FacebookSDKException('Access token was not returned from Graph.', 401);
-        }
-
-        // Graph returns two different key names for expiration time
-        // on the same endpoint. Doh! :/
-        $expiresAt = 0;
-        if (isset($data['expires'])) {
-            // For exchanging a short lived token with a long lived token.
-            // The expiration time in seconds will be returned as "expires".
-            $expiresAt = time() + $data['expires'];
-        } elseif (isset($data['expires_in'])) {
-            // For exchanging a code for a short lived access token.
-            // The expiration time in seconds will be returned as "expires_in".
-            // See: https://developers.facebook.com/docs/facebook-login/access-tokens#long-via-code
-            $expiresAt = time() + $data['expires_in'];
-        }
-
-        return new AccessToken($data['access_token'], $expiresAt);
-    }
-
-    /**
-     * Send a request to Graph with an app access token.
-     *
-     * @param string      $endpoint
-     * @param array       $params
-     * @param string|null $accessToken
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookResponseException
-     */
-    protected function sendRequestWithClientParams($endpoint, array $params, $accessToken = null)
-    {
-        $params += $this->getClientParams();
-
-        $accessToken = $accessToken ?: $this->app->getAccessToken();
-
-        $this->lastRequest = new FacebookRequest(
-            $this->app,
-            $accessToken,
-            'GET',
-            $endpoint,
-            $params,
-            null,
-            $this->graphVersion
-        );
-
-        return $this->client->sendRequest($this->lastRequest);
-    }
-
-    /**
-     * Returns the client_* params for OAuth requests.
-     *
-     * @return array
-     */
-    protected function getClientParams()
-    {
-        return [
-            'client_id' => $this->app->getId(),
-            'client_secret' => $this->app->getSecret(),
-        ];
-    }
-}

website/queries/Facebook/Exceptions/FacebookAuthenticationException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookAuthenticationException
- *
- * @package Facebook
- */
-class FacebookAuthenticationException extends FacebookSDKException
-{
-}

website/queries/Facebook/Exceptions/FacebookAuthorizationException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookAuthorizationException
- *
- * @package Facebook
- */
-class FacebookAuthorizationException extends FacebookSDKException
-{
-}

website/queries/Facebook/Exceptions/FacebookClientException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookClientException
- *
- * @package Facebook
- */
-class FacebookClientException extends FacebookSDKException
-{
-}

website/queries/Facebook/Exceptions/FacebookOtherException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookOtherException
- *
- * @package Facebook
- */
-class FacebookOtherException extends FacebookSDKException
-{
-}

website/queries/Facebook/Exceptions/FacebookResponseException.php

@@ -1,208 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-use Facebook\FacebookResponse;
-
-/**
- * Class FacebookResponseException
- *
- * @package Facebook
- */
-class FacebookResponseException extends FacebookSDKException
-{
-    /**
-     * @var FacebookResponse The response that threw the exception.
-     */
-    protected $response;
-
-    /**
-     * @var array Decoded response.
-     */
-    protected $responseData;
-
-    /**
-     * Creates a FacebookResponseException.
-     *
-     * @param FacebookResponse     $response          The response that threw the exception.
-     * @param FacebookSDKException $previousException The more detailed exception.
-     */
-    public function __construct(FacebookResponse $response, FacebookSDKException $previousException = null)
-    {
-        $this->response = $response;
-        $this->responseData = $response->getDecodedBody();
-
-        $errorMessage = $this->get('message', 'Unknown error from Graph.');
-        $errorCode = $this->get('code', -1);
-
-        parent::__construct($errorMessage, $errorCode, $previousException);
-    }
-
-    /**
-     * A factory for creating the appropriate exception based on the response from Graph.
-     *
-     * @param FacebookResponse $response The response that threw the exception.
-     *
-     * @return FacebookResponseException
-     */
-    public static function create(FacebookResponse $response)
-    {
-        $data = $response->getDecodedBody();
-
-        if (!isset($data['error']['code']) && isset($data['code'])) {
-            $data = ['error' => $data];
-        }
-
-        $code = isset($data['error']['code']) ? $data['error']['code'] : null;
-        $message = isset($data['error']['message']) ? $data['error']['message'] : 'Unknown error from Graph.';
-
-        $previousException = null;
-
-        if (isset($data['error']['error_subcode'])) {
-            switch ($data['error']['error_subcode']) {
-                // Other authentication issues
-                case 458:
-                case 459:
-                case 460:
-                case 463:
-                case 464:
-                case 467:
-                    return new static($response, new FacebookAuthenticationException($message, $code));
-            }
-        }
-
-        switch ($code) {
-            // Login status or token expired, revoked, or invalid
-            case 100:
-            case 102:
-            case 190:
-                return new static($response, new FacebookAuthenticationException($message, $code));
-
-            // Server issue, possible downtime
-            case 1:
-            case 2:
-                return new static($response, new FacebookServerException($message, $code));
-
-            // API Throttling
-            case 4:
-            case 17:
-            case 341:
-                return new static($response, new FacebookThrottleException($message, $code));
-
-            // Duplicate Post
-            case 506:
-                return new static($response, new FacebookClientException($message, $code));
-        }
-
-        // Missing Permissions
-        if ($code == 10 || ($code >= 200 && $code <= 299)) {
-            return new static($response, new FacebookAuthorizationException($message, $code));
-        }
-
-        // OAuth authentication error
-        if (isset($data['error']['type']) && $data['error']['type'] === 'OAuthException') {
-            return new static($response, new FacebookAuthenticationException($message, $code));
-        }
-
-        // All others
-        return new static($response, new FacebookOtherException($message, $code));
-    }
-
-    /**
-     * Checks isset and returns that or a default value.
-     *
-     * @param string $key
-     * @param mixed  $default
-     *
-     * @return mixed
-     */
-    private function get($key, $default = null)
-    {
-        if (isset($this->responseData['error'][$key])) {
-            return $this->responseData['error'][$key];
-        }
-
-        return $default;
-    }
-
-    /**
-     * Returns the HTTP status code
-     *
-     * @return int
-     */
-    public function getHttpStatusCode()
-    {
-        return $this->response->getHttpStatusCode();
-    }
-
-    /**
-     * Returns the sub-error code
-     *
-     * @return int
-     */
-    public function getSubErrorCode()
-    {
-        return $this->get('error_subcode', -1);
-    }
-
-    /**
-     * Returns the error type
-     *
-     * @return string
-     */
-    public function getErrorType()
-    {
-        return $this->get('type', '');
-    }
-
-    /**
-     * Returns the raw response used to create the exception.
-     *
-     * @return string
-     */
-    public function getRawResponse()
-    {
-        return $this->response->getBody();
-    }
-
-    /**
-     * Returns the decoded response used to create the exception.
-     *
-     * @return array
-     */
-    public function getResponseData()
-    {
-        return $this->responseData;
-    }
-
-    /**
-     * Returns the response entity used to create the exception.
-     *
-     * @return FacebookResponse
-     */
-    public function getResponse()
-    {
-        return $this->response;
-    }
-}

website/queries/Facebook/Exceptions/FacebookSDKException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookSDKException
- *
- * @package Facebook
- */
-class FacebookSDKException extends \Exception
-{
-}

website/queries/Facebook/Exceptions/FacebookServerException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookServerException
- *
- * @package Facebook
- */
-class FacebookServerException extends FacebookSDKException
-{
-}

website/queries/Facebook/Exceptions/FacebookThrottleException.php

@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook\Exceptions;
-
-/**
- * Class FacebookThrottleException
- *
- * @package Facebook
- */
-class FacebookThrottleException extends FacebookSDKException
-{
-}

website/queries/Facebook/Facebook.php

@@ -1,589 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook;
-
-use Facebook\Authentication\AccessToken;
-use Facebook\Authentication\OAuth2Client;
-use Facebook\FileUpload\FacebookFile;
-use Facebook\FileUpload\FacebookVideo;
-use Facebook\GraphNodes\GraphEdge;
-use Facebook\Url\UrlDetectionInterface;
-use Facebook\Url\FacebookUrlDetectionHandler;
-use Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface;
-use Facebook\PseudoRandomString\McryptPseudoRandomStringGenerator;
-use Facebook\PseudoRandomString\OpenSslPseudoRandomStringGenerator;
-use Facebook\PseudoRandomString\UrandomPseudoRandomStringGenerator;
-use Facebook\HttpClients\FacebookHttpClientInterface;
-use Facebook\HttpClients\FacebookCurlHttpClient;
-use Facebook\HttpClients\FacebookStreamHttpClient;
-use Facebook\HttpClients\FacebookGuzzleHttpClient;
-use Facebook\PersistentData\PersistentDataInterface;
-use Facebook\PersistentData\FacebookSessionPersistentDataHandler;
-use Facebook\PersistentData\FacebookMemoryPersistentDataHandler;
-use Facebook\Helpers\FacebookCanvasHelper;
-use Facebook\Helpers\FacebookJavaScriptHelper;
-use Facebook\Helpers\FacebookPageTabHelper;
-use Facebook\Helpers\FacebookRedirectLoginHelper;
-use Facebook\Exceptions\FacebookSDKException;
-
-/**
- * Class Facebook
- *
- * @package Facebook
- */
-class Facebook
-{
-    /**
-     * @const string Version number of the Facebook PHP SDK.
-     */
-    const VERSION = '5.0.0';
-
-    /**
-     * @const string Default Graph API version for requests.
-     */
-    const DEFAULT_GRAPH_VERSION = 'v2.4';
-
-    /**
-     * @const string The name of the environment variable that contains the app ID.
-     */
-    const APP_ID_ENV_NAME = 'FACEBOOK_APP_ID';
-
-    /**
-     * @const string The name of the environment variable that contains the app secret.
-     */
-    const APP_SECRET_ENV_NAME = 'FACEBOOK_APP_SECRET';
-
-    /**
-     * @var FacebookApp The FacebookApp entity.
-     */
-    protected $app;
-
-    /**
-     * @var FacebookClient The Facebook client service.
-     */
-    protected $client;
-
-    /**
-     * @var OAuth2Client The OAuth 2.0 client service.
-     */
-    protected $oAuth2Client;
-
-    /**
-     * @var UrlDetectionInterface|null The URL detection handler.
-     */
-    protected $urlDetectionHandler;
-
-    /**
-     * @var PseudoRandomStringGeneratorInterface|null The cryptographically secure pseudo-random string generator.
-     */
-    protected $pseudoRandomStringGenerator;
-
-    /**
-     * @var AccessToken|null The default access token to use with requests.
-     */
-    protected $defaultAccessToken;
-
-    /**
-     * @var string|null The default Graph version we want to use.
-     */
-    protected $defaultGraphVersion;
-
-    /**
-     * @var PersistentDataInterface|null The persistent data handler.
-     */
-    protected $persistentDataHandler;
-
-    /**
-     * @var FacebookResponse|FacebookBatchResponse|null Stores the last request made to Graph.
-     */
-    protected $lastResponse;
-
-    /**
-     * Instantiates a new Facebook super-class object.
-     *
-     * @param array $config
-     *
-     * @throws FacebookSDKException
-     */
-    public function __construct(array $config = [])
-    {
-        $appId = isset($config['app_id']) ? $config['app_id'] : getenv(static::APP_ID_ENV_NAME);
-        if (!$appId) {
-            throw new FacebookSDKException('Required "app_id" key not supplied in config and could not find fallback environment variable "' . static::APP_ID_ENV_NAME . '"');
-        }
-
-        $appSecret = isset($config['app_secret']) ? $config['app_secret'] : getenv(static::APP_SECRET_ENV_NAME);
-        if (!$appSecret) {
-            throw new FacebookSDKException('Required "app_secret" key not supplied in config and could not find fallback environment variable "' . static::APP_SECRET_ENV_NAME . '"');
-        }
-
-        $this->app = new FacebookApp($appId, $appSecret);
-
-        $httpClientHandler = null;
-        if (isset($config['http_client_handler'])) {
-            if ($config['http_client_handler'] instanceof FacebookHttpClientInterface) {
-                $httpClientHandler = $config['http_client_handler'];
-            } elseif ($config['http_client_handler'] === 'curl') {
-                $httpClientHandler = new FacebookCurlHttpClient();
-            } elseif ($config['http_client_handler'] === 'stream') {
-                $httpClientHandler = new FacebookStreamHttpClient();
-            } elseif ($config['http_client_handler'] === 'guzzle') {
-                $httpClientHandler = new FacebookGuzzleHttpClient();
-            } else {
-                throw new \InvalidArgumentException('The http_client_handler must be set to "curl", "stream", "guzzle", or be an instance of Facebook\HttpClients\FacebookHttpClientInterface');
-            }
-        }
-
-        $enableBeta = isset($config['enable_beta_mode']) && $config['enable_beta_mode'] === true;
-        $this->client = new FacebookClient($httpClientHandler, $enableBeta);
-
-        if (isset($config['url_detection_handler'])) {
-            if ($config['url_detection_handler'] instanceof UrlDetectionInterface) {
-                $this->urlDetectionHandler = $config['url_detection_handler'];
-            } else {
-                throw new \InvalidArgumentException('The url_detection_handler must be an instance of Facebook\Url\UrlDetectionInterface');
-            }
-        }
-
-        if (isset($config['pseudo_random_string_generator'])) {
-            if ($config['pseudo_random_string_generator'] instanceof PseudoRandomStringGeneratorInterface) {
-                $this->pseudoRandomStringGenerator = $config['pseudo_random_string_generator'];
-            } elseif ($config['pseudo_random_string_generator'] === 'mcrypt') {
-                $this->pseudoRandomStringGenerator = new McryptPseudoRandomStringGenerator();
-            } elseif ($config['pseudo_random_string_generator'] === 'openssl') {
-                $this->pseudoRandomStringGenerator = new OpenSslPseudoRandomStringGenerator();
-            } elseif ($config['pseudo_random_string_generator'] === 'urandom') {
-                $this->pseudoRandomStringGenerator = new UrandomPseudoRandomStringGenerator();
-            } else {
-                throw new \InvalidArgumentException('The pseudo_random_string_generator must be set to "mcrypt", "openssl", or "urandom", or be an instance of Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface');
-            }
-        }
-
-        if (isset($config['persistent_data_handler'])) {
-            if ($config['persistent_data_handler'] instanceof PersistentDataInterface) {
-                $this->persistentDataHandler = $config['persistent_data_handler'];
-            } elseif ($config['persistent_data_handler'] === 'session') {
-                $this->persistentDataHandler = new FacebookSessionPersistentDataHandler();
-            } elseif ($config['persistent_data_handler'] === 'memory') {
-                $this->persistentDataHandler = new FacebookMemoryPersistentDataHandler();
-            } else {
-                throw new \InvalidArgumentException('The persistent_data_handler must be set to "session", "memory", or be an instance of Facebook\PersistentData\PersistentDataInterface');
-            }
-        }
-
-        if (isset($config['default_access_token'])) {
-            $this->setDefaultAccessToken($config['default_access_token']);
-        }
-
-        if (isset($config['default_graph_version'])) {
-            $this->defaultGraphVersion = $config['default_graph_version'];
-        } else {
-            // @todo v6: Throw an InvalidArgumentException if "default_graph_version" is not set
-            $this->defaultGraphVersion = static::DEFAULT_GRAPH_VERSION;
-        }
-    }
-
-    /**
-     * Returns the FacebookApp entity.
-     *
-     * @return FacebookApp
-     */
-    public function getApp()
-    {
-        return $this->app;
-    }
-
-    /**
-     * Returns the FacebookClient service.
-     *
-     * @return FacebookClient
-     */
-    public function getClient()
-    {
-        return $this->client;
-    }
-
-    /**
-     * Returns the OAuth 2.0 client service.
-     *
-     * @return OAuth2Client
-     */
-    public function getOAuth2Client()
-    {
-        if (!$this->oAuth2Client instanceof OAuth2Client) {
-            $app = $this->getApp();
-            $client = $this->getClient();
-            $this->oAuth2Client = new OAuth2Client($app, $client, $this->defaultGraphVersion);
-        }
-
-        return $this->oAuth2Client;
-    }
-
-    /**
-     * Returns the last response returned from Graph.
-     *
-     * @return FacebookResponse|FacebookBatchResponse|null
-     */
-    public function getLastResponse()
-    {
-        return $this->lastResponse;
-    }
-
-    /**
-     * Returns the URL detection handler.
-     *
-     * @return UrlDetectionInterface
-     */
-    public function getUrlDetectionHandler()
-    {
-        if (!$this->urlDetectionHandler instanceof UrlDetectionInterface) {
-            $this->urlDetectionHandler = new FacebookUrlDetectionHandler();
-        }
-
-        return $this->urlDetectionHandler;
-    }
-
-    /**
-     * Returns the default AccessToken entity.
-     *
-     * @return AccessToken|null
-     */
-    public function getDefaultAccessToken()
-    {
-        return $this->defaultAccessToken;
-    }
-
-    /**
-     * Sets the default access token to use with requests.
-     *
-     * @param AccessToken|string $accessToken The access token to save.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setDefaultAccessToken($accessToken)
-    {
-        if (is_string($accessToken)) {
-            $this->defaultAccessToken = new AccessToken($accessToken);
-
-            return;
-        }
-
-        if ($accessToken instanceof AccessToken) {
-            $this->defaultAccessToken = $accessToken;
-
-            return;
-        }
-
-        throw new \InvalidArgumentException('The default access token must be of type "string" or Facebook\AccessToken');
-    }
-
-    /**
-     * Returns the default Graph version.
-     *
-     * @return string
-     */
-    public function getDefaultGraphVersion()
-    {
-        return $this->defaultGraphVersion;
-    }
-
-    /**
-     * Returns the redirect login helper.
-     *
-     * @return FacebookRedirectLoginHelper
-     */
-    public function getRedirectLoginHelper()
-    {
-        return new FacebookRedirectLoginHelper(
-            $this->getOAuth2Client(),
-            $this->persistentDataHandler,
-            $this->urlDetectionHandler,
-            $this->pseudoRandomStringGenerator
-        );
-    }
-
-    /**
-     * Returns the JavaScript helper.
-     *
-     * @return FacebookJavaScriptHelper
-     */
-    public function getJavaScriptHelper()
-    {
-        return new FacebookJavaScriptHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Returns the canvas helper.
-     *
-     * @return FacebookCanvasHelper
-     */
-    public function getCanvasHelper()
-    {
-        return new FacebookCanvasHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Returns the page tab helper.
-     *
-     * @return FacebookPageTabHelper
-     */
-    public function getPageTabHelper()
-    {
-        return new FacebookPageTabHelper($this->app, $this->client, $this->defaultGraphVersion);
-    }
-
-    /**
-     * Sends a GET request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function get($endpoint, $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'GET',
-            $endpoint,
-            $params = [],
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a POST request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function post($endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'POST',
-            $endpoint,
-            $params,
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a DELETE request to Graph and returns the result.
-     *
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function delete($endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        return $this->sendRequest(
-            'DELETE',
-            $endpoint,
-            $params,
-            $accessToken,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Sends a request to Graph for the next page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function next(GraphEdge $graphEdge)
-    {
-        return $this->getPaginationResults($graphEdge, 'next');
-    }
-
-    /**
-     * Sends a request to Graph for the previous page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function previous(GraphEdge $graphEdge)
-    {
-        return $this->getPaginationResults($graphEdge, 'previous');
-    }
-
-    /**
-     * Sends a request to Graph for the next page of results.
-     *
-     * @param GraphEdge $graphEdge The GraphEdge to paginate over.
-     * @param string    $direction The direction of the pagination: next|previous.
-     *
-     * @return GraphEdge|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function getPaginationResults(GraphEdge $graphEdge, $direction)
-    {
-        $paginationRequest = $graphEdge->getPaginationRequest($direction);
-        if (!$paginationRequest) {
-            return null;
-        }
-
-        $this->lastResponse = $this->client->sendRequest($paginationRequest);
-
-        // Keep the same GraphNode subclass
-        $subClassName = $graphEdge->getSubClassName();
-        $graphEdge = $this->lastResponse->getGraphEdge($subClassName, false);
-
-        return count($graphEdge) > 0 ? $graphEdge : null;
-    }
-
-    /**
-     * Sends a request to Graph and returns the result.
-     *
-     * @param string                  $method
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendRequest($method, $endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-        $request = $this->request($method, $endpoint, $params, $accessToken, $eTag, $graphVersion);
-
-        return $this->lastResponse = $this->client->sendRequest($request);
-    }
-
-    /**
-     * Sends a batched request to Graph and returns the result.
-     *
-     * @param array                   $requests
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookBatchResponse
-     *
-     * @throws FacebookSDKException
-     */
-    public function sendBatchRequest(array $requests, $accessToken = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-        $batchRequest = new FacebookBatchRequest(
-            $this->app,
-            $requests,
-            $accessToken,
-            $graphVersion
-        );
-
-        return $this->lastResponse = $this->client->sendBatchRequest($batchRequest);
-    }
-
-    /**
-     * Instantiates a new FacebookRequest entity.
-     *
-     * @param string                  $method
-     * @param string                  $endpoint
-     * @param array                   $params
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $eTag
-     * @param string|null             $graphVersion
-     *
-     * @return FacebookRequest
-     *
-     * @throws FacebookSDKException
-     */
-    public function request($method, $endpoint, array $params = [], $accessToken = null, $eTag = null, $graphVersion = null)
-    {
-        $accessToken = $accessToken ?: $this->defaultAccessToken;
-        $graphVersion = $graphVersion ?: $this->defaultGraphVersion;
-
-        return new FacebookRequest(
-            $this->app,
-            $accessToken,
-            $method,
-            $endpoint,
-            $params,
-            $eTag,
-            $graphVersion
-        );
-    }
-
-    /**
-     * Factory to create FacebookFile's.
-     *
-     * @param string $pathToFile
-     *
-     * @return FacebookFile
-     *
-     * @throws FacebookSDKException
-     */
-    public function fileToUpload($pathToFile)
-    {
-        return new FacebookFile($pathToFile);
-    }
-
-    /**
-     * Factory to create FacebookVideo's.
-     *
-     * @param string $pathToFile
-     *
-     * @return FacebookVideo
-     *
-     * @throws FacebookSDKException
-     */
-    public function videoToUpload($pathToFile)
-    {
-        return new FacebookVideo($pathToFile);
-    }
-}

website/queries/Facebook/FacebookApp.php

@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook;
-
-use Facebook\Authentication\AccessToken;
-
-class FacebookApp implements \Serializable
-{
-    /**
-     * @var string The app ID.
-     */
-    protected $id;
-
-    /**
-     * @var string The app secret.
-     */
-    protected $secret;
-
-    /**
-     * @param string $id
-     * @param string $secret
-     */
-    public function __construct($id, $secret)
-    {
-        $this->id = $id;
-        $this->secret = $secret;
-    }
-
-    /**
-     * Returns the app ID.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the app secret.
-     *
-     * @return string
-     */
-    public function getSecret()
-    {
-        return $this->secret;
-    }
-
-    /**
-     * Returns an app access token.
-     *
-     * @return AccessToken
-     */
-    public function getAccessToken()
-    {
-        return new AccessToken($this->id . '|' . $this->secret);
-    }
-
-    /**
-     * Serializes the FacebookApp entity as a string.
-     *
-     * @return string
-     */
-    public function serialize()
-    {
-        return serialize([$this->id, $this->secret]);
-    }
-
-    /**
-     * Unserializes a string as a FacebookApp entity.
-     *
-     * @param string $serialized
-     */
-    public function unserialize($serialized)
-    {
-        list($id, $secret) = unserialize($serialized);
-
-        $this->__construct($id, $secret);
-    }
-}

website/queries/Facebook/FacebookBatchRequest.php

@@ -1,303 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook;
-
-use ArrayIterator;
-use IteratorAggregate;
-use ArrayAccess;
-use Facebook\Authentication\AccessToken;
-use Facebook\Exceptions\FacebookSDKException;
-
-/**
- * Class BatchRequest
- *
- * @package Facebook
- */
-class FacebookBatchRequest extends FacebookRequest implements IteratorAggregate, ArrayAccess
-{
-    /**
-     * @var array An array of FacebookRequest entities to send.
-     */
-    protected $requests;
-
-    /**
-     * @var array An array of files to upload.
-     */
-    protected $attachedFiles;
-
-    /**
-     * Creates a new Request entity.
-     *
-     * @param FacebookApp|null        $app
-     * @param array                   $requests
-     * @param AccessToken|string|null $accessToken
-     * @param string|null             $graphVersion
-     */
-    public function __construct(FacebookApp $app = null, array $requests = [], $accessToken = null, $graphVersion = null)
-    {
-        parent::__construct($app, $accessToken, 'POST', '', [], null, $graphVersion);
-
-        $this->add($requests);
-    }
-
-    /**
-     * A a new request to the array.
-     *
-     * @param FacebookRequest|array $request
-     * @param string|null           $name
-     *
-     * @return FacebookBatchRequest
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function add($request, $name = null)
-    {
-        if (is_array($request)) {
-            foreach ($request as $key => $req) {
-                $this->add($req, $key);
-            }
-
-            return $this;
-        }
-
-        if (!$request instanceof FacebookRequest) {
-            throw new \InvalidArgumentException('Argument for add() must be of type array or FacebookRequest.');
-        }
-
-        $this->addFallbackDefaults($request);
-        $requestToAdd = [
-            'name' => $name,
-            'request' => $request,
-        ];
-
-        // File uploads
-        $attachedFiles = $this->extractFileAttachments($request);
-        if ($attachedFiles) {
-            $requestToAdd['attached_files'] = $attachedFiles;
-        }
-        $this->requests[] = $requestToAdd;
-
-        return $this;
-    }
-
-    /**
-     * Ensures that the FacebookApp and access token fall back when missing.
-     *
-     * @param FacebookRequest $request
-     *
-     * @throws FacebookSDKException
-     */
-    public function addFallbackDefaults(FacebookRequest $request)
-    {
-        if (!$request->getApp()) {
-            $app = $this->getApp();
-            if (!$app) {
-                throw new FacebookSDKException('Missing FacebookApp on FacebookRequest and no fallback detected on FacebookBatchRequest.');
-            }
-            $request->setApp($app);
-        }
-
-        if (!$request->getAccessToken()) {
-            $accessToken = $this->getAccessToken();
-            if (!$accessToken) {
-                throw new FacebookSDKException('Missing access token on FacebookRequest and no fallback detected on FacebookBatchRequest.');
-            }
-            $request->setAccessToken($accessToken);
-        }
-    }
-
-    /**
-     * Extracts the files from a request.
-     *
-     * @param FacebookRequest $request
-     *
-     * @return string|null
-     *
-     * @throws FacebookSDKException
-     */
-    public function extractFileAttachments(FacebookRequest $request)
-    {
-        if (!$request->containsFileUploads()) {
-            return null;
-        }
-
-        $files = $request->getFiles();
-        $fileNames = [];
-        foreach ($files as $file) {
-            $fileName = uniqid();
-            $this->addFile($fileName, $file);
-            $fileNames[] = $fileName;
-        }
-
-        $request->resetFiles();
-
-        // @TODO Does Graph support multiple uploads on one endpoint?
-        return implode(',', $fileNames);
-    }
-
-    /**
-     * Return the FacebookRequest entities.
-     *
-     * @return array
-     */
-    public function getRequests()
-    {
-        return $this->requests;
-    }
-
-    /**
-     * Prepares the requests to be sent as a batch request.
-     *
-     * @return string
-     */
-    public function prepareRequestsForBatch()
-    {
-        $this->validateBatchRequestCount();
-
-        $params = [
-            'batch' => $this->convertRequestsToJson(),
-            'include_headers' => true,
-        ];
-        $this->setParams($params);
-    }
-
-    /**
-     * Converts the requests into a JSON(P) string.
-     *
-     * @return string
-     */
-    public function convertRequestsToJson()
-    {
-        $requests = [];
-        foreach ($this->requests as $request) {
-            $attachedFiles = isset($request['attached_files']) ? $request['attached_files'] : null;
-            $requests[] = $this->requestEntityToBatchArray($request['request'], $request['name'], $attachedFiles);
-        }
-
-        return json_encode($requests);
-    }
-
-    /**
-     * Validate the request count before sending them as a batch.
-     *
-     * @throws FacebookSDKException
-     */
-    public function validateBatchRequestCount()
-    {
-        $batchCount = count($this->requests);
-        if ($batchCount === 0) {
-            throw new FacebookSDKException('There are no batch requests to send.');
-        } elseif ($batchCount > 50) {
-            // Per: https://developers.facebook.com/docs/graph-api/making-multiple-requests#limits
-            throw new FacebookSDKException('You cannot send more than 50 batch requests at a time.');
-        }
-    }
-
-    /**
-     * Converts a Request entity into an array that is batch-friendly.
-     *
-     * @param FacebookRequest $request       The request entity to convert.
-     * @param string|null     $requestName   The name of the request.
-     * @param string|null     $attachedFiles Names of files associated with the request.
-     *
-     * @return array
-     */
-    public function requestEntityToBatchArray(FacebookRequest $request, $requestName = null, $attachedFiles = null)
-    {
-        $compiledHeaders = [];
-        $headers = $request->getHeaders();
-        foreach ($headers as $name => $value) {
-            $compiledHeaders[] = $name . ': ' . $value;
-        }
-
-        $batch = [
-            'headers' => $compiledHeaders,
-            'method' => $request->getMethod(),
-            'relative_url' => $request->getUrl(),
-        ];
-
-        // Since file uploads are moved to the root request of a batch request,
-        // the child requests will always be URL-encoded.
-        $body = $request->getUrlEncodedBody()->getBody();
-        if ($body) {
-            $batch['body'] = $body;
-        }
-
-        if (isset($requestName)) {
-            $batch['name'] = $requestName;
-        }
-
-        if (isset($attachedFiles)) {
-            $batch['attached_files'] = $attachedFiles;
-        }
-
-        // @TODO Add support for "omit_response_on_success"
-        // @TODO Add support for "depends_on"
-        // @TODO Add support for JSONP with "callback"
-
-        return $batch;
-    }
-
-    /**
-     * Get an iterator for the items.
-     *
-     * @return ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->requests);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->add($value, $offset);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->requests[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->requests[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->requests[$offset]) ? $this->requests[$offset] : null;
-    }
-}

website/queries/Facebook/FacebookBatchResponse.php

@@ -1,154 +0,0 @@
-<?php
-/**
- * Copyright 2014 Facebook, Inc.
- *
- * You are hereby granted a non-exclusive, worldwide, royalty-free license to
- * use, copy, modify, and distribute this software in source code or binary
- * form for use in connection with the web services and APIs provided by
- * Facebook.
- *
- * As with any software that integrates with the Facebook platform, your use
- * of this software is subject to the Facebook Developer Principles and
- * Policies [http://developers.facebook.com/policy/]. This copyright notice
- * shall be included in all copies or substantial portions of the software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- */
-namespace Facebook;
-
-use ArrayIterator;
-use IteratorAggregate;
-use ArrayAccess;
-
-/**
- * Class FacebookBatchResponse
- *
- * @package Facebook
- */
-class FacebookBatchResponse extends FacebookResponse implements IteratorAggregate, ArrayAccess
-{
-    /**
-     * @var FacebookBatchRequest The original entity that made the batch request.
-     */
-    protected $batchRequest;
-
-    /**
-     * @var array An array of FacebookResponse entities.
-     */
-    protected $responses = [];
-
-    /**
-     * Creates a new Response entity.
-     *
-     * @param FacebookBatchRequest $batchRequest
-     * @param FacebookResponse     $response
-     */
-    public function __construct(FacebookBatchRequest $batchRequest, FacebookResponse $response)
-    {
-        $this->batchRequest = $batchRequest;
-
-        $request = $response->getRequest();
-        $body = $response->getBody();
-        $httpStatusCode = $response->getHttpStatusCode();
-        $headers = $response->getHeaders();
-        parent::__construct($request, $body, $httpStatusCode, $headers);
-
-        $responses = $response->getDecodedBody();
-        $this->setResponses($responses);
-    }
-
-    /**
-     * Returns an array of FacebookResponse entities.
-     *
-     * @return array
-     */
-    public function getResponses()
-    {
-        return $this->responses;
-    }
-
-    /**
-     * The main batch response will be an array of requests so
-     * we need to iterate over all the responses.
-     *
-     * @param array $responses
-     */
-    public function setResponses(array $responses)
-    {
-        $this->responses = [];
-
-        foreach ($responses as $key => $graphResponse) {
-            $this->addResponse($key, $graphResponse);
-        }
-    }
-
-    /**
-     * Add a response to the list.
-     *
-     * @param int        $key
-     * @param array|null $response
-     */
-    public function addResponse($key, $response)
-    {
-        $originalRequestName = isset($this->batchRequest[$key]['name']) ? $this->batchRequest[$key]['name'] : $key;
-        $originalRequest = isset($this->batchRequest[$key]['request']) ? $this->batchRequest[$key]['request'] : null;
-
-        $httpResponseBody = isset($response['body']) ? $response['body'] : null;
-        $httpResponseCode = isset($response['code']) ? $response['code'] : null;
-        $httpResponseHeaders = isset($response['headers']) ? $response['headers'] : [];
-
-        $this->responses[$originalRequestName] = new FacebookResponse(
-            $originalRequest,
-            $httpResponseBody,
-            $httpResponseCode,
-            $httpResponseHeaders
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getIterator()
-    {
-        return new ArrayIterator($this->responses);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetSet($offset, $value)
-    {
-        $this->addResponse($offset, $value);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetExists($offset)
-    {
-        return isset($this->responses[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetUnset($offset)
-    {
-        unset($this->responses[$offset]);
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function offsetGet($offset)
-    {
-        return isset($this->responses[$offset]) ? $this->responses[$offset] : null;
-    }
-}