Merge branch 'joey-testing' into 'master'

Fixed date and other extras

See merge request !132

website/queries/checkInput.php

@@ -38,8 +38,7 @@ function checkName($variable){
     if (empty($variable)) {
         throw new lettersAndSpacesException("Verplicht!");
     } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) {
-
-            throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!");
+        throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!");
     }
 }
 
@@ -48,12 +47,12 @@ function validateBday($variable){
     if (empty($variable)) {
         throw new bdayException("Verplicht!");
     } else {
-        if (!(validateDate($variable, "Y/m/d"))) {
+        if (!(validateDate($variable, "Y-m-d"))) {
             throw new bdayException("Geen geldige datum");
         } else {
-            $dateNow = date("Y/m/d");
+            $dateNow = date("Y-m-d");
             if ($dateNow < $variable) {
-                throw new bdayException("Geen geldige datum");
+                throw new bdayException("Geen geldige datum!");
             }
         }
     }
@@ -97,6 +96,12 @@ function validateEmail($variable){
     }
 }
 
+function matchEmail(){
+    if (strtolower($_POST["email"]) != strtolower($_POST["confirmEmail"])){
+        throw new confirmEmailException("Emails matchen niet!");
+    }
+}
+
 /* checks if an input is a valid email. */
 function resetEmail($variable){
     if (empty($variable)) {
@@ -206,6 +211,14 @@ class emailException extends Exception
     }
 }
 
+class confirmEmailException extends Exception
+{
+    public function __construct($message = "", $code = 0, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}
+
 class captchaException extends Exception
 {
     public function __construct($message = "", $code = 0, Exception $previous = null)

website/queries/login.php

@@ -9,10 +9,10 @@ function getUser() {
     FROM
       `user`
     WHERE
-      `username` LIKE :username
+      `username` LIKE :username OR 
+      `email` LIKE :username
     ");
 
-    $stmt->bindParam(":username", $_POST["uname"]);
     $stmt->execute();
     return $stmt->fetch(PDO::FETCH_ASSOC);
 }
@@ -20,7 +20,7 @@ function getUser() {
 function validateLogin($username, $password){
     // Empty username or password field
     if (empty($username) || empty($password)) {
-        throw new loginException("Gebruikersnaam of wachtwoord is niet ingevuld");
+        throw new loginException("Inloggegevens zijn niet ingevuld");
     }
     else {
         $psw = test_input($password);

website/queries/register.php

@@ -10,7 +10,7 @@ function getExistingUsername() {
       `username` LIKE :username
     ");
 
-    $stmt->bindParam(":username", $_POST["username"]);
+    $stmt->bindParam(":username", test_input($_POST["username"]));
     $stmt->execute();
     return $stmt->rowCount();
 
@@ -26,7 +26,7 @@ function getExistingEmail() {
       `email` LIKE :email
     ");
 
-    $stmt->bindParam(":email", $_POST["email"]);
+    $stmt->bindParam(":email", test_input($_POST["email"]));
     $stmt->execute();
     return $stmt->rowCount();
 
@@ -42,7 +42,7 @@ function getResetEmail() {
       `email` LIKE :email
     ");
 
-    $stmt->bindParam(":email", $_POST["forgotEmail"]);
+    $stmt->bindParam(":email", test_input($_POST["forgotEmail"]));
     $stmt->execute();
     return $stmt->rowCount();
 
@@ -70,15 +70,21 @@ function registerAccount() {
 
     $hash=password_hash($_POST["password"], 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", (strtolower($_POST["email"])));
+    $stmt->bindParam(":fname", test_input($_POST["name"]));
+    $stmt->bindParam(":lname", test_input($_POST["surname"]));
+    $stmt->bindParam(":bday", test_input($_POST["bday"]));
+    $stmt->bindParam(":username", test_input($_POST["username"]));
+    $stmt->bindParam(":password", test_input($hash));
+    $stmt->bindParam(":location", test_input($_POST["location"]));
+    $stmt->bindParam(":email", test_input(strtolower($_POST["email"])));
 
     $stmt->execute();
     $stmt->rowCount();
 }
+
+function submitselect($date, $value){
+    if ($date == $value){
+        echo "selected";
+    }
+}
 ?>