Fixed comments and links

website/public/groupAdmin.php

@@ -21,8 +21,6 @@ require_once "../queries/alerts.php";
 include("../views/main.php");
 $alertClass;
 $alertMessage;
-
-// Select which button has been pressed.
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     try {
         switch ($_POST["form"]) {
@@ -46,15 +44,6 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
                 }
                 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();

website/public/js/loginRegisterModals.js

@@ -7,7 +7,7 @@ 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];
@@ -24,6 +24,9 @@ btn.onclick = function () {
 registerBtn.onclick = function () {
     registerModal.style.display = "block";
 }
+fbBtn.onclick = function () {
+    facebookModal.style.display = "block";
+}
 
 /**
  * WHen the user clicks on (X), close the modal

website/public/settings.php

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

website/queries/checkInput.php

@@ -41,11 +41,7 @@ function checkInputChoice($variable, $option){
     }
 }
 
-/**
- * Checks for only letters and spaces.
- * @param $variable
- * @throws lettersAndSpacesException
- */
+/* Checks for only letters and spaces. */
 function checkName($variable){
     if (empty($variable)) {
         throw new lettersAndSpacesException("Verplicht!");
@@ -56,11 +52,7 @@ function checkName($variable){
     }
 }
 
-/**
- * Checks for bday
- * @param $variable
- * @throws bdayException
- */
+/* Checks for bday */
 function validateBday($variable){
     if (empty($variable)) {
         throw new bdayException("Verplicht!");
@@ -227,9 +219,6 @@ function test_input($data) {
     return $data;
 }
 
-/**
- * Class lettersAndSpacesException
- */
 class lettersAndSpacesException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -238,9 +227,7 @@ class lettersAndSpacesException extends Exception
     }
 }
 
-/**
- * Class bdayException
- */
+
 class bdayException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -249,9 +236,6 @@ class bdayException extends Exception
     }
 }
 
-/**
- * Class usernameException
- */
 class usernameException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -260,9 +244,6 @@ class usernameException extends Exception
     }
 }
 
-/**
- * Class passwordException
- */
 class passwordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -271,9 +252,6 @@ class passwordException extends Exception
     }
 }
 
-/**
- * Class confirmPasswordException
- */
 class confirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -282,9 +260,6 @@ class confirmPasswordException extends Exception
     }
 }
 
-/**
- * Class fbConfirmPasswordException
- */
 class fbConfirmPasswordException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -293,9 +268,6 @@ class fbConfirmPasswordException extends Exception
     }
 }
 
-/**
- * Class emailException
- */
 class emailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -304,9 +276,6 @@ class emailException extends Exception
     }
 }
 
-/**
- * Class confirmEmailException
- */
 class confirmEmailException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -315,9 +284,6 @@ class confirmEmailException extends Exception
     }
 }
 
-/**
- * Class captchaException
- */
 class captchaException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)
@@ -326,9 +292,6 @@ class captchaException extends Exception
     }
 }
 
-/**
- * Class registerException
- */
 class registerException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)

website/queries/connect.php

@@ -10,11 +10,6 @@ else {
     or die('Error connecting to mysql server');
 }
 
-/**
- * Helperfunction to create a database query.
- * @param string $query
- * @return PDOStatement
- */
 function prepareQuery(string $query) : PDOStatement {
     return $GLOBALS["db"]->prepare($query);
 }

website/queries/createGroup.php

@@ -2,13 +2,8 @@
 require_once "../queries/checkInput.php";
 require_once "../queries/picture.php";
 require_once "../queries/alerts.php";
-
-/**
- * Creates a group.
- */
 function createGroup()
 {
-    // Creates the group.
     $createGroup = prepareQuery("
     INSERT INTO
         `group_page` (`name`, `description`)
@@ -18,7 +13,6 @@ function createGroup()
     $createGroup->bindValue(':description', test_input($_POST["bio"]));
     $createGroup->execute();
 
-    // Gets the groupID just created.
     $getGroupID = prepareQuery("
     SELECT
         `groupID`
@@ -30,7 +24,6 @@ function createGroup()
     $getGroupID->execute();
     $groupID = $getGroupID->fetch()["groupID"];
 
-    // Adds the user as an admin.
     $makeUserAdmin = prepareQuery("
     INSERT INTO
         `group_member` (userID, groupID, role)

website/queries/emailconfirm.php

@@ -1,8 +1,5 @@
 <?php
-/**
- * Sends a confirm email if you know the username.
- * @param string $username
- */
+
 function sendConfirmEmailUsername(string $username) {
     $stmt = prepareQuery("
     SELECT
@@ -18,10 +15,6 @@ function sendConfirmEmailUsername(string $username) {
     sendConfirmEmail($userID);
 }
 
-/**
- * Sends a confirm email if you know the userID.
- * @param int $userID
- */
 function sendConfirmEmail(int $userID) {
     $stmt = prepareQuery("
     SELECT 

website/queries/groupAdmin.php

@@ -1,9 +1,4 @@
 <?php
-/**
- * Gets the current settings for a group.
- * @param int $groupID
- * @return mixed
- */
 function getGroupSettings(int $groupID) {
     $stmt = prepareQuery("
     SELECT
@@ -20,12 +15,6 @@ function getGroupSettings(int $groupID) {
     return $stmt->fetch();
 }
 
-/**
- * Updates the settings for a group.
- * @param int $groupID
- * @throws AngryAlert
- * @throws HappyAlert
- */
 function updateGroupSettings(int $groupID)
 {
     if (!checkGroupAdmin($groupID, $_SESSION["userID"])) {
@@ -51,12 +40,6 @@ function updateGroupSettings(int $groupID)
     }
 }
 
-/**
- * Checks if an user is an admin for a page.
- * @param int $groupID
- * @param int $userID
- * @return bool
- */
 function checkGroupAdmin(int $groupID, int $userID) : bool {
     $stmt = prepareQuery("
     SELECT
@@ -77,40 +60,7 @@ function checkGroupAdmin(int $groupID, int $userID) : bool {
     return ($role == "admin");
 }
 
-/**
- * Returns all normal members for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupUsers(int $groupID) {
-    return getAllGroupMembers($groupID, 'member');
-}
-
-/**
- * Returns all admin for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupAdmins(int $groupID) {
-    return getAllGroupMembers($groupID, 'admin');
-}
-
-/**
- * Returns all Moderators for a group.
- * @param int $groupID
- * @return array|bool
- */
-function getAllGroupMods(int $groupID) {
-    return getAllGroupMembers($groupID, 'mod');
-}
-
-/**
- * Returns all members for a group specified by a string.
- * @param int $groupID
- * @param string $role
- * @return array|bool
- */
-function getAllGroupMembers(int $groupID, string $role) {
+function getAllGroupMembers(int $groupID) {
     $stmt = prepareQuery("
         SELECT
           `username`,
@@ -124,25 +74,16 @@ function getAllGroupMembers(int $groupID, string $role) {
         ON
           `group_member`.`userID` = `user`.`userID`
         WHERE
-          `groupID` = :groupID AND `group_member`.`role` = :role
+          `groupID` = :groupID AND `group_member`.`role` = 'member'
     ");
 
     $stmt->bindParam(':groupID', $groupID);
-    $stmt->bindParam(":role", $role);
     if (!$stmt->execute()) {
         return False;
     }
     return $stmt->fetchAll();
 }
 
-/**
- * Upgrades or downgrades a groupmember to a different role.
- * @param int $groupID
- * @param int $userID
- * @param string $role
- * @throws AngryAlert
- * @throws HappyAlert
- */
 function upgradeUser(int $groupID, int $userID, string $role) {
     if (!checkGroupAdmin($groupID, $_SESSION["userID"])) {
         throw new AngryAlert("Geen toestemming om te wijzigen");
@@ -166,27 +107,3 @@ function upgradeUser(int $groupID, int $userID, string $role) {
         throw new AngryAlert("Er is iets mis gegaan");
     }
 }
-
-/**
- * Removes a group form the database.
- * @throws AngryAlert
- * @throws HappyAlert
- */
-function deleteGroup() {
-    if (!checkGroupAdmin($_POST["groupID"], $_SESSION["userID"])) {
-        throw new AngryAlert("Geen toestemming om de groep te verwijderen!");
-    }
-    $stmt = prepareQuery("
-    DELETE FROM
-        `group_page`
-    WHERE
-        `groupID` = :groupID
-    ");
-    $stmt->bindValue(":groupID", $_POST["groupID"]);
-    $stmt->execute();
-    if ($stmt->rowCount()) {
-        throw new HappyAlert("Group verwijderd!");
-    } else {
-        throw new AngryAlert("Er is iets mis gegaan");
-    }
-}

website/queries/login.php

@@ -1,9 +1,6 @@
 <?php
 
-/**
- * Find matching password with the inputted username/emailadress.
- * @return mixed
- */
+//Find matching password with the inputted username/emailadress.
 function getUser() {
     $stmt = prepareQuery("
     SELECT
@@ -38,7 +35,6 @@ function getUserID() {
 }
 
 function validateLogin($username, $password, $url){
-    echo $url;
         // Empty username or password field
     if (empty($username) || empty($password)) {
         throw new loginException("Inloggegevens zijn niet ingevuld");

website/queries/post.php

@@ -281,12 +281,6 @@ function checkPermissionOnPost(int $postID, int $userID) : bool {
     }
 }
 
-/**
- * Returns role of an user.
- * @param int $userID
- * @param int $groupID
- * @return mixed role of an user.
- */
 function getRoleInGroup(int $userID, int $groupID) {
     $stmt = prepareQuery("
     SELECT

website/queries/register.php

@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * Returns 1 if an username exists with the filled in username.
+ * @return int
+ */
 function getExistingUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -16,6 +20,10 @@ function getExistingUsername() {
 
 }
 
+/**
+ * Returns 1 if an username exists with facebooklogin
+ * @return int
+ */
 function getExistingFBUsername() {
     $stmt = prepareQuery("
     SELECT
@@ -32,6 +40,10 @@ function getExistingFBUsername() {
 
 }
 
+/**
+ * Returns 1 if an email exists with the filled in email.
+ * @return int
+ */
 function getExistingEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -48,6 +60,10 @@ function getExistingEmail() {
 
 }
 
+/**
+ * Returns 1 if an email exists with facebook register
+ * @return int
+ */
 function getExistingFBEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -65,6 +81,10 @@ function getExistingFBEmail() {
 
 }
 
+/**
+ * Returns 1 if an email exists with the forgot email input
+ * @return int
+ */
 function getResetEmail() {
     $stmt = prepareQuery("
     SELECT
@@ -81,6 +101,9 @@ function getResetEmail() {
 
 }
 
+/**
+ * Registers a new account in the database
+ */
 function registerAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -119,6 +142,9 @@ function registerAccount() {
     $stmt->rowCount();
 }
 
+/**
+ * Registers a new account with facebook register
+ */
 function fbRegisterAccount() {
     $stmt = prepareQuery("
     INSERT INTO
@@ -158,6 +184,11 @@ function fbRegisterAccount() {
     return $stmt->execute();
 }
 
+/**
+ * Checks which dates need to be selected when there is an invalid registration.
+ * @param $date
+ * @param $value
+ */
 function submitselect($date, $value){
     if ($date == $value){
         echo "selected";

website/queries/requestpassword.php

@@ -1,6 +1,10 @@
 <?php
 include_once "../queries/connect.php";
 
+/**
+ * Sends a link to an email to change the password of an account
+ * @param string $email
+ */
 function sendPasswordRecovery(string $email) {
     if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
         $stmt = prepareQuery("
@@ -24,11 +28,16 @@ function sendPasswordRecovery(string $email) {
         $hashedHash = password_hash($hash, PASSWORD_DEFAULT);
         setHashToDatabase($userID, $hash);
         doSendPasswordRecovery($userID, $email, $username, $hashedHash);
-    } else {
-        // TODO: Be angry!
     }
 }
 
+/**
+ * Sets the message in the email to reset a password of an account.
+ * @param int $userID
+ * @param string $email
+ * @param string $username
+ * @param string $hash
+ */
 function doSendPasswordRecovery(int $userID, string $email, string $username, string $hash) {
     $resetLink = "https://myhyvesbookplus.nl/resetpassword.php?u=$userID&h=$hash";
 
@@ -38,6 +47,11 @@ function doSendPasswordRecovery(int $userID, string $email, string $username, st
     mail($email, $subject, $body, $header);
 }
 
+/**
+ * Sets the previous password invalid.
+ * @param int $userID
+ * @param string $hash
+ */
 function setHashToDatabase(int $userID, string $hash) {
     $stmt = prepareQuery("
     UPDATE

website/queries/settings.php

@@ -16,10 +16,7 @@ function getSettings() {
       `location`,
       `birthdate`,
       `bio`,
-      IFNULL(
       `profilepicture`,
-                '../img/avatar-standard.png'
-            ) AS profilepicture,
       `showBday`,
       `showEmail`,
       `showProfile`

website/views/facebookRegisterModal.php

@@ -1,3 +1,9 @@
+<?php
+if(isset($acces_token)) {
+    echo '<button id="fbBtn" class="button">Facebook registreer</button>';
+
+}
+?>
 <!-- The Modal -->
 <div id="fbModal" class="modal">
     <form action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]);?>"

website/views/groupAdmin.php

@@ -16,7 +16,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                 <li>
                     <label></label>
                     <a href="group.php?groupname=<?=$groupinfo["name"]?>">
-                        <button><i class="fa fa-chevron-left"></i> Terug naar de groep</button>
+                        <button class="fa fa-chevron-left"> Terug naar de groep</button>
                     </a>
                 </li>
             </ul>
@@ -51,7 +51,8 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <button type="submit"
                             name="form"
                             value="group"
-                    ><i class="fa fa-save"></i> Opslaan</button>
+                            class="fa fa-save"
+                    > Opslaan</button>
                 </li>
             </ul>
         </form>
@@ -79,7 +80,8 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <button type="submit"
                             name="form"
                             value="picture"
-                    ><i class="fa fa-picture-o"></i> Verander profielfoto</button>
+                            class="fa fa-picture-o"
+                    > Verander profielfoto</button>
                 </li>
             </ul>
         </form>
@@ -92,7 +94,7 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                     <select name="userID">
                         <option disabled selected>Geen gebruiker geselecteerd:</option>
                         <?php
-                        $groupMembers = getAllGroupUsers($_GET["groupID"]);
+                        $groupMembers = getAllGroupMembers($_GET["groupID"]);
                         foreach ($groupMembers as $groupMember) {?>
                             <option value="<?=$groupMember["userID"]?>">
                                 <?=$groupMember["fullname"]?> (<?=$groupMember["username"]?>)
@@ -112,55 +114,11 @@ $groupinfo = getGroupSettings($_GET["groupID"]);
                 </il>
             </ul>
         </form>
-        <form class="platform" method="post">
-            <h5>Verwijder een admin/mod</h5>
-            <ul>
-                <il>
-                    <input name="groupID" value="<?=$_GET["groupID"]?>" type="hidden">
-                    <label>Selecteer gebruiker</label>
-                    <select name="userID">
-                        <option disabled selected>Geen gebruiker geselecteerd:</option>
-                        <?php
-                        $groupAdmins = getAllGroupAdmins($_GET["groupID"]);
-                        foreach ($groupAdmins as $groupAdmin) {?>
-                            <option value="<?=$groupAdmin["userID"]?>">
-                                <?=$groupAdmin["fullname"]?> (<?=$groupAdmin["username"]?>) (<?=$groupAdmin["role"]?>)
-                            </option>
-                        <?php } ?>
-                        <?php
-                        $groupMods = getAllGroupMods($_GET["groupID"]);
-                        foreach ($groupMods as $groupMod) {?>
-                            <option value="<?=$groupMod["userID"]?>">
-                                <?=$groupMod["fullname"]?> (<?=$groupMod["username"]?>) (<?=$groupMod["role"]?>)
-                            </option>
-                        <?php } ?>
-                    </select>
-                    <button name="form"
-                            value="deadmin"
-                    >
-                        Verwijder
-                    </button>
-                </il>
-            </ul>
-        </form>
-        <form class="platform" method="post">
-            <ul>
-                <h5>Verwijder groep</h5>
-                <li>
-                    <label></label>
-                    <input name="groupID" value="<?=$_GET["groupID"]?>" type="hidden">
-                    <button class="red"
-                            name="form"
-                            value="delete"
-                    ><i class="fa fa-trash"></i> Verwijder groep</button>
-                </li>
-            </ul>
-        </form>
         <div class="platform">
             <ul>
                 <li>
                     <label></label>
-                    <a href="group.php?groupname=<?=$groupinfo["name"]?>"><button><i class="fa fa-chevron-left"></i> Terug naar de groep</button></a>
+                    <a href="group.php?groupname=<?=$groupinfo["name"]?>"><button class="fa fa-chevron-left"> Terug naar de groep</button></a>
                 </li>
             </ul>
         </div>