diff --git a/website/public/login.php b/website/public/login.php
index 0515793..d4dd991 100644
--- a/website/public/login.php
+++ b/website/public/login.php
@@ -20,15 +20,15 @@
}
// Define variables and set to empty values
- $uname = $psw ="";
+ $user = $psw ="";
$loginErr = $resetErr ="";
if ($_SERVER["REQUEST_METHOD"] == "POST") {
switch ($_POST["submit"]) {
case "login":
try {
- $uname = ($_POST["uname"]);
- validateLogin($_POST["uname"], $_POST["psw"]);
+ $user = ($_POST["user"]);
+ validateLogin($_POST["user"], $_POST["psw"]);
} catch(loginException $e) {
$loginErr = $e->getMessage();
}
diff --git a/website/public/register.php b/website/public/register.php
index 1ce4817..0077e62 100644
--- a/website/public/register.php
+++ b/website/public/register.php
@@ -14,9 +14,12 @@
header("location: login.php");
}
// define variables and set to empty values
- $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $captcha = $ip = "";
- $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = $captchaErr = "";
+ $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") {
@@ -38,7 +41,10 @@
}
try{
- $bday = test_input(($_POST["bday"]));
+ $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;
@@ -76,9 +82,14 @@
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{
diff --git a/website/public/styles/index.css b/website/public/styles/index.css
index 97d6f63..9829688 100644
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -133,6 +133,10 @@ label {
width: 45%;
}
+select{
+ width: 18%;
+}
+
ul {
font-family: Arial;
font-size: 16px;
@@ -203,7 +207,6 @@ ul {
.modal-body {padding: 2px 16px;}
.modal-footer {
- padding: 2px 16px;
background-color: #FBC02D;
color: black;
-}
\ No newline at end of file
+}
diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php
index 9b91833..fbf64a7 100644
--- a/website/queries/checkInput.php
+++ b/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)
diff --git a/website/queries/login.php b/website/queries/login.php
index 2af255a..15a5de1 100644
--- a/website/queries/login.php
+++ b/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);
diff --git a/website/queries/register.php b/website/queries/register.php
index 738ef43..be9d415 100644
--- a/website/queries/register.php
+++ b/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";
+ }
+}
?>
diff --git a/website/views/login-view.php b/website/views/login-view.php
index de4c48b..c64590e 100644
--- a/website/views/login-view.php
+++ b/website/views/login-view.php
@@ -13,11 +13,11 @@
-
+
@@ -47,46 +47,47 @@
-
-