From 90ac38acdd00f0b9154ab7a9777e711d09a81b5b Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 2 Feb 2017 10:43:34 +0100 Subject: [PATCH 1/2] Fixed restrictions with registering --- website/queries/checkInput.php | 14 +++++++++++++- website/views/homeLoginRegister.php | 1 - website/views/login-view.php | 2 +- website/views/login_head.php | 4 ++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index 663da1f..8722418 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -47,6 +47,8 @@ function checkName($variable){ throw new lettersAndSpacesException("Verplicht!"); } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) { throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!"); + } else if (strlen($variable) > 63){ + throw new lettersAndSpacesException(("Mag maximaal 63 karakters hebben!")); } } @@ -81,6 +83,8 @@ function username($variable){ throw new usernameException("Moet minstens 6 karakters bevatten"); } else if (getExistingUsername() == 1) { throw new usernameException("Gebruikersnaam bestaal al"); + } else if (strlen($variable) > 50) { + throw new usernameException("Mag maximaal 50 karakters!"); } } @@ -92,6 +96,8 @@ function fbUsername($variable){ throw new usernameException("Moet minstens 6 karakters bevatten"); } else if (getExistingFBUsername() == 1) { throw new usernameException("Gebruikersnaam bestaal al"); + } else if (strlen($variable) > 50) { + throw new usernameException("Mag maximaal 50 karakters!"); } } @@ -101,6 +107,8 @@ function longerEight($variable){ throw new passwordException("Verplicht!"); } else if (strlen($variable) < 8) { throw new passwordException("Moet minstens 8 karakters bevatten"); + } else if (strlen($variable) > 50) { + throw new usernameException("Mag maximaal 50 karakters!"); } } @@ -112,9 +120,11 @@ function validateEmail($variable){ throw new emailException("Geldige email invullen"); } else if (getExistingEmail() == 1){ throw new emailException("Email bestaal al!"); + } else if (strlen($variable) > 255) { + throw new emailException("Mag maximaal 50 karakters!"); } } - +//255 /* checks if an input is a valid email. */ function validateFBEmail($variable){ if (empty($variable)) { @@ -123,6 +133,8 @@ function validateFBEmail($variable){ throw new emailException("Geldige email invullen"); } else if (getExistingFBEmail() == 1){ throw new emailException("Email bestaal al!"); + } else if (strlen($variable) > 255) { + throw new emailException("Mag maximaal 50 karakters!"); } } diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php index beffff8..54c2015 100644 --- a/website/views/homeLoginRegister.php +++ b/website/views/homeLoginRegister.php @@ -7,7 +7,6 @@ $fbUsername = $fbPassword = $fbConfirmpassword = ""; $fbUsernameErr = $fbPasswordErr = $fbConfirmpasswordErr = $fbEmailErr = $fbBdayErr = ""; $fbCorrect = true; $fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = ""; -$bdayExist = false; // Register variables $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = ""; diff --git a/website/views/login-view.php b/website/views/login-view.php index f525103..4f85b0a 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -62,7 +62,7 @@ login with Facebook!'; + echo '
login met Facebook!
'; } ?> diff --git a/website/views/login_head.php b/website/views/login_head.php index e319a9d..61bf9c3 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -7,7 +7,11 @@ + + From 044ed6a9d34345e54778ef1795611a51402521c1 Mon Sep 17 00:00:00 2001 From: Joey Lai Date: Thu, 2 Feb 2017 13:19:39 +0100 Subject: [PATCH 2/2] Added noscript --- website/public/styles/index.css | 8 +++++++- website/queries/checkInput.php | 2 +- website/views/facebookRegisterModal.php | 3 +-- website/views/login-view.php | 7 +++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/website/public/styles/index.css b/website/public/styles/index.css index 196485e..c7a0aa8 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -133,6 +133,12 @@ label { color: red; } +.login_containerNoscript { + padding: 4px; + text-align: center; + color: red; +} + @keyframes animatezoom { from {transform: scale(0)} to {transform: scale(1)} @@ -150,7 +156,7 @@ label { margin: 16px auto; overflow-y: auto; padding: 20px; - width: 600px; + width: 650px; } select{ diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php index 8722418..69274ce 100644 --- a/website/queries/checkInput.php +++ b/website/queries/checkInput.php @@ -132,7 +132,7 @@ function validateFBEmail($variable){ } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) { throw new emailException("Geldige email invullen"); } else if (getExistingFBEmail() == 1){ - throw new emailException("Email bestaal al!"); + throw new emailException("Uw email wordt al gebruikt voor een ander account!"); } else if (strlen($variable) > 255) { throw new emailException("Mag maximaal 50 karakters!"); } diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php index 7db44b0..7271d63 100644 --- a/website/views/facebookRegisterModal.php +++ b/website/views/facebookRegisterModal.php @@ -55,7 +55,6 @@ * - + *
- diff --git a/website/views/login-view.php b/website/views/login-view.php index 4f85b0a..98ce71c 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -1,3 +1,9 @@ +