Merge branch 'master' into 'marijn-settings'

# Conflicts:
#   website/queries/settings.php

website/queries/friendship.php

@@ -15,8 +15,9 @@ function selectAllFriends($db, $userID) {
         `friendship`.`user1ID` = $userID AND
         `friendship`.`user2ID` = `user`.`userID` OR
         `friendship`.`user2ID` = $userID AND
-        `friendship`.`user1ID` = `user`.`userID`"
-    );
+        `friendship`.`user1ID` = `user`.`userID` AND
+        `user`.`role` != 3
+    ");
 }
 
 

website/queries/group_member.php

@@ -0,0 +1,21 @@
+<?php
+
+function selectAllGroupsFromUser($db, $userID) {
+    return $db->query("
+    SELECT
+        `group_page`.`name`,
+        `group_page`.`picture`
+    FROM
+        `group_page`
+    INNER JOIN
+        `group_member`
+    WHERE
+        `group_member`.`userID` = $userID AND
+        `group_member`.`groupID` = `group_page`.`groupID` AND
+        `group_page`.`status` != 0
+    ");
+}
+
+
+
+?>

website/queries/group_page.php

@@ -0,0 +1,56 @@
+<?php
+
+function selectGroupById($db, $groupID) {
+    return $db->query("
+    SELECT
+        `group_page`.`name`,
+        `group_page`.`picture`,
+        `group_page`.`description`,
+        `group_page`.`status`,
+        `group_page`.`creationdate`
+    FROM
+        `group_page`
+    WHERE
+        `group_page`.`groupID` = $groupID
+    ");
+}
+
+function select20GroupsFromN($db, $n) {
+    return $db->query("
+    SELECT
+        `group_page`.`groupID`,
+        `group_page`.`name`,
+        `group_page`.`picture`,
+        `group_page`.`description`,
+        `group_page`.`status`,
+        `group_page`.`creationdate`
+    FROM
+        `group_page`
+    ORDER BY
+        `group_page`.`name` ASC
+    LIMIT
+        $n, 20
+    ");
+}
+
+function select20GroupsByStatusFromN($db, $n, $status) {
+    return $db->query("
+    SELECT
+        `group_page`.`groupID`,
+        `group_page`.`name`,
+        `group_page`.`picture`,
+        `group_page`.`description`,
+        `group_page`.`status`,
+        `group_page`.`creationdate`
+    FROM
+        `group_page`
+    WHERE
+    	`group_page`.`status` = $status
+    ORDER BY
+        `group_page`.`name` ASC
+    LIMIT
+        $n, 20
+    ");
+}
+
+?>

website/queries/login.php

@@ -0,0 +1,19 @@
+<?php
+
+function hashPassword() {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+      `password`,
+      `userID`
+    FROM
+      `user`
+    WHERE
+      `username` LIKE :username
+    ");
+
+    $stmt->bindParam(":username", $_POST["uname"]);
+    $stmt->execute();
+    return $stmt->fetch(PDO::FETCH_ASSOC);
+}
+
+?>

website/queries/register.php

@@ -0,0 +1,62 @@
+<?php
+
+function getExistingUsername() {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT
+      `username`
+    FROM
+      `user`
+    WHERE
+      `username` LIKE :username
+    ");
+
+    $stmt->bindParam(":username", $_POST["username"]);
+    $stmt->execute();
+    return $stmt->rowCount();
+
+}
+
+function getExistingEmail() {
+    $stmt = $GLOBALS["db"]->prepare("
+    SELECT * FROM `user` WHERE `email` = :email
+    ");
+
+    $stmt->bindParam(":email", $_POST["email"]);
+    $stmt->execute();
+    return $stmt->rowCount();
+}
+
+function registerAccount() {
+    $stmt = $GLOBALS["db"]->prepare("
+    INSERT INTO
+      `user`(fname,
+             lname,
+             birthdate,
+             username,
+             password,
+             location,
+             email)
+    VALUES(
+      :fname,
+      :lname,
+      :bday,
+      :username,
+      :password,
+      :location,
+      :email
+    )");
+
+    $hash=password_hash($_POST["password"].(strtolower($_POST["username"])), PASSWORD_DEFAULT);
+
+    $stmt->bindParam(":fname", $_POST["name"]);
+    $stmt->bindParam(":lname", $_POST["surname"]);
+    $stmt->bindParam(":bday", $_POST["bday"]);
+    $stmt->bindParam(":username", $_POST["username"]);
+    $stmt->bindParam(":password", $hash);
+    $stmt->bindParam(":location", $_POST["location"]);
+    $stmt->bindParam(":email", $_POST["email"]);
+
+    $stmt->execute();
+    $stmt->rowCount();
+}
+?>

website/queries/settings.php

@@ -10,9 +10,9 @@ function getSettings() {
       `birthdate`,
       `bio`,
       `profilepicture`
-    FROM 
+    FROM
       `user`
-    WHERE 
+    WHERE
       `userID` = :userID
       ");