From 05d6bf8aa60b2aaaef8d5810af048fc19b0f53eb Mon Sep 17 00:00:00 2001
From: Joey Lai <joeylai96@hotmail.com>
Date: Fri, 3 Feb 2017 11:47:16 +0100
Subject: [PATCH 1/2] Added fbModal button

---
 website/public/js/loginRegisterModals.js | 5 ++++-
 website/views/facebookRegisterModal.php  | 6 ++++++
 website/views/homeLoginRegister.php      | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/website/public/js/loginRegisterModals.js b/website/public/js/loginRegisterModals.js
index 373fb7e..104dd02 100644
--- a/website/public/js/loginRegisterModals.js
+++ b/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
diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php
index a38a3a3..17ce7ef 100644
--- a/website/views/facebookRegisterModal.php
+++ b/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"]);?>"
diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php
index 2e00905..e363446 100644
--- a/website/views/homeLoginRegister.php
+++ b/website/views/homeLoginRegister.php
@@ -69,7 +69,7 @@ $fb = new Facebook\Facebook([
 ]);
 
 // Redirect back to login.php after logging/canceling with facebook.
-$redirect = "https://myhyvesbookplus.nl/login.php";
+$redirect = "https://myhyvesbookplus.nl/~joey/login.php";
 $helper = $fb->getRedirectLoginHelper();
 
 try {

From 4643dfcddb4f8ef314168cb0851c811d559d57bd Mon Sep 17 00:00:00 2001
From: Joey Lai <joeylai96@hotmail.com>
Date: Fri, 3 Feb 2017 12:42:30 +0100
Subject: [PATCH 2/2] Fixed comments and links

---
 website/queries/register.php        | 31 +++++++++++++++++++++++++++++
 website/queries/requestpassword.php | 18 +++++++++++++++--
 website/views/homeLoginRegister.php |  2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/website/queries/register.php b/website/queries/register.php
index 3dcbed4..7f91dfa 100644
--- a/website/queries/register.php
+++ b/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";
diff --git a/website/queries/requestpassword.php b/website/queries/requestpassword.php
index a54bd7d..daad355 100644
--- a/website/queries/requestpassword.php
+++ b/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
diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php
index e363446..2e00905 100644
--- a/website/views/homeLoginRegister.php
+++ b/website/views/homeLoginRegister.php
@@ -69,7 +69,7 @@ $fb = new Facebook\Facebook([
 ]);
 
 // Redirect back to login.php after logging/canceling with facebook.
-$redirect = "https://myhyvesbookplus.nl/~joey/login.php";
+$redirect = "https://myhyvesbookplus.nl/login.php";
 $helper = $fb->getRedirectLoginHelper();
 
 try {