diff --git a/website/public/login.php b/website/public/login.php index 09dce8c..f889f2f 100644 --- a/website/public/login.php +++ b/website/public/login.php @@ -2,7 +2,7 @@ @@ -23,11 +23,11 @@ } else { $psw=$_POST["psw"]; - $hash=hashPassword()["password"]; - $userid=hashPassword()["userID"]; + $hash=getUser()["password"]; + $userid=getUser()["userID"]; // If there's an account, go to the profile page - if(password_verify($psw.$uname, $hash)) { + if(password_verify($psw, $hash)) { $_SESSION["userID"] = $userid; header("location: profile.php"); diff --git a/website/public/logout.php b/website/public/logout.php new file mode 100644 index 0000000..6a2ba5d --- /dev/null +++ b/website/public/logout.php @@ -0,0 +1,15 @@ + + + + + + + diff --git a/website/public/register.php b/website/public/register.php index 2299cf0..c454d66 100644 --- a/website/public/register.php +++ b/website/public/register.php @@ -2,7 +2,7 @@ @@ -15,39 +15,6 @@ $genericErr = $nameErr = $surnameErr = $bdayErr = $usernameErr = $passwordErr = $confirmpasswordErr = $locationErr = $housenumberErr = $emailErr = ""; $correct = true; - // Saves information of filling in the form - if (isset($_POST["name"])) { - $name = $_POST["name"]; - } - - if (isset($_POST["surname"])) { - $surname = $_POST["surname"]; - } - - if (isset($_POST["bday"])) { - $bday = $_POST["bday"]; - } - - if (isset($_POST["username"])) { - $username = $_POST["username"]; - } - - if (isset($_POST["password"])) { - $password = $_POST["password"]; - } - - if (isset($_POST["location"])) { - $location = $_POST["location"]; - } - - if (isset($_POST["housenumber"])) { - $housenumber = $_POST["housenumber"]; - } - - if (isset($_POST["email"])) { - $email = $_POST["email"]; - } - // Trying to register an account if ($_SERVER["REQUEST_METHOD"] == "POST") { if (empty($_POST["name"])) { @@ -55,6 +22,7 @@ $correct = false; } else { + $name = test_input($_POST["name"]); if (!preg_match("/^[a-zA-Z ]*$/",$name)) { $nameErr = "Alleen letters en spaties zijn toegestaan!"; $correct = false; @@ -67,6 +35,7 @@ $correct = false; } else { + $surname = test_input($_POST["surname"]); if (!preg_match("/^[a-zA-Z ]*$/",$surname)) { $surnameErr = "Alleen letters en spaties zijn toegestaan!"; $correct = false; @@ -84,13 +53,14 @@ $correct = false; } else { + $username = test_input($_POST["username"]); if (strlen($username) < 6) { $usernameErr = "Gebruikersnaam moet minstens 6 karakters bevatten"; $correct = false; } else if (getExistingUsername() == 1){ $usernameErr = "Gebruikersnaam bestaat al"; - $correct = false; + $correct = false; } } @@ -100,6 +70,7 @@ $correct = false; } else { + $password = test_input($_POST["password"]); if (strlen($password) < 8) { $passwordErr = "Wachtwoord moet minstens 8 karakters bevatten"; $correct = false; @@ -124,6 +95,7 @@ $correct = false; } else { + $location = test_input($_POST["location"]); if (!preg_match("/^[a-zA-Z ]*$/",$location)) { $locationErr = "Alleen letters en spaties zijn toegestaan!"; $correct = false; @@ -136,6 +108,7 @@ $correct = false; } else { + $email = test_input($_POST["email"]); if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { $emailErr = "Geldige email invullen!"; $correct = false; @@ -158,6 +131,13 @@ } } + function test_input($data) { + $data = trim($data); + $data = stripslashes($data); + $data = htmlspecialchars($data); + return $data; + } + /* This view adds register view */ include("../views/register-view.php"); ?> diff --git a/website/public/styles/index.css b/website/public/styles/index.css index c7d482f..c551fd1 100644 --- a/website/public/styles/index.css +++ b/website/public/styles/index.css @@ -1,22 +1,6 @@ -::selection { - background: #845663; - color: white; -} - -::-moz-selection { - background: #845663; - color: white; -} - -a, a:link, a:visited, a:hover, a:active { - color: inherit; - text-decoration: none; -} - a.button { - background-color: #845663; - border: 2px solid black; - border-radius: 12px; + background-color: #405550; + border-radius: 10px; color: white; cursor: pointer; height: 50%; @@ -27,64 +11,19 @@ a.button { font-size: 16px; } -a[data-title]:hover:after, img[data-title]:hover:after, span[data-title]:hover:after, -div[data-title]:hover:after{ - content: attr(data-title); - padding: 4px 4px; - color: #FFFFFF; - position: absolute; - left: 0; - top: 100%; - z-index: 20; - white-space: nowrap; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; - -moz-box-shadow: 0px 0px 4px #222; - -webkit-box-shadow: 0px 0px 4px #222; - box-shadow: 0px 0px 4px #222; - background-color: #333; - font-size: 15px; - line-height: normal; - font-family: Arial, sans-serif; -} - -/* Add Zoom Animation */ -.animate { - animation: animatezoom 0.6s - -webkit-animation: animatezoom 0.6s; -} - /* Body */ body { height: 900px; - - background-image: url(https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEnqKdVtLbxjKuNsCSCxFRhTOpp3Gm0gsU8bMgA_MeUYyzrUFy); + background-color: #C8CABD; + /*background-image: url(http://play.pokemonshowdown.com/fx/client-bg-shaymin.jpg); background-size: cover; - background-repeat: repeat-x; - background-attachment: fixed; + background-attachment: fixed;*/ /*background-color: #B78996;*/ color: #333; - font-family: Arial, sans-serif; } -/* stijl voor alle buttons */ -button { - background-color: #845663; - border: 2px solid black; - border-radius: 12px; - color: white; - cursor: pointer; - height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 25%; - font-family: Arial; - font-size: 16px; -} - /* The Close Button */ .close { /* Position it in the top right corner outside of the modal */ @@ -106,20 +45,18 @@ button { /* inlogform */ form { /*background-color: #a87a87;*/ - border: 5px solid #325da3; - background-color: #a87a87; border-radius: 12px; - height: 55%; - margin: 35px auto; - width: 45%; + height: 75%; + margin: 10px auto; + width: 70%; overflow-y:auto; } /* inlog titel */ h1 { - padding: 16px; + padding: 8px; text-align: center; - font-size: 2.2em; + font-size: 1.5em; } /* registreer titel*/ @@ -130,30 +67,34 @@ h2 { } input[type=text], input[type=password], input[type=email], input[type="date"] { - border-radius: 12px; - border: 5px solid #ccc; box-sizing: border-box; + border-color: #C8CABD; display: inline-block; height: 50%; padding: 8px 20px; margin: 4px 0; width: 50%; - font-family: Arial; - font-size: 16px; } +/* +input[type=text], input[type=password], input[type=email], input[type="date"] { + border: 0px; + border-bottom: 4px solid lightgray; + border-radius: 0px; +}*/ button[type=submit] { - background-color: #845663; - border: 2px solid black; - border-radius: 12px; - color: white; + background-color: #C8CABD; + color: black ; cursor: pointer; - height: 50%; - margin: 8px 0; - padding: 14px 20px; - width: 50%; font-family: Arial; font-size: 16px; + width: 50%; +} + +.error { + font-family: Arial; + font-size: 15px; + color: red; } label { @@ -179,52 +120,31 @@ label { color: red; } -/* The Modal (background) */ -.modal { - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ - display: none; /* Hidden by default */ - height: 100%; - left: 0; - margin: auto; - overflow: auto; /* Enable scroll if needed */ - padding-top: 60px; - position: fixed; /* Stay in place */ - top: 0; - width: 100%; /* Full width */ - z-index: 1; /* Sit on top */ -} - -/* Modal Content/Box */ -.modal-content { - background-color: #B78996; - border: 5px solid #325da3; - margin: 5px auto; /* 15% from the top and centered */ - overflow-y: auto; - width: 40%; /* Could be more or less, depending on screen size */ - height: 60%; - -} - @keyframes animatezoom { from {transform: scale(0)} to {transform: scale(1)} } -/* datepicker */ -select { - border-radius: 12px; - border: 5px solid #ccc; - box-sizing: border-box; - display: inline-block; - height: 50%; - padding: 12px 20px; - margin: 8px 0; - width: 18%; - font-family: Arial; - font-size: 16px; +/* White boxes (squares) */ +.platform { + background-color: #FFFFFF; + /*background-image: url(http://www.planwallpaper.com/static/images/518071-background-hd_xO1TwRc.jpg); + background-size: cover; + background-repeat: repeat-x; + background-attachment: fixed;*/ + box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); + height: 53%; + margin: 34px auto; + overflow-y: auto; + padding: 20px; + width: 35%; } +/*.platform { + width: 40%; + margin: 34px auto; +}*/ + @-webkit-keyframes animatezoom { from {-webkit-transform: scale(0)} to {-webkit-transform: scale(1)} diff --git a/website/queries/login.php b/website/queries/login.php index 8f2eb19..180b431 100644 --- a/website/queries/login.php +++ b/website/queries/login.php @@ -1,6 +1,6 @@ prepare(" SELECT `password`, diff --git a/website/queries/register.php b/website/queries/register.php index 893bb3a..4700e72 100644 --- a/website/queries/register.php +++ b/website/queries/register.php @@ -52,7 +52,7 @@ function registerAccount() { :email )"); - $hash=password_hash($_POST["password"].(strtolower($_POST["username"])), PASSWORD_DEFAULT); + $hash=password_hash($_POST["password"], PASSWORD_DEFAULT); $stmt->bindParam(":fname", $_POST["name"]); $stmt->bindParam(":lname", $_POST["surname"]); diff --git a/website/views/header.php b/website/views/header.php index bb809ee..fb0e9c3 100644 --- a/website/views/header.php +++ b/website/views/header.php @@ -20,7 +20,7 @@ $userinfo = getHeaderInfo();
- | + | |
diff --git a/website/views/login-view.php b/website/views/login-view.php index df29cbc..9214a89 100644 --- a/website/views/login-view.php +++ b/website/views/login-view.php @@ -3,49 +3,49 @@ src="img/top-logo.png" alt="MyHyvesbook+">
- - -
" - return= $correct - method="post"> +

Welkom bij MyHyvesbook+

+ + " + return= $correct + method="post"> - + + + + + + + + + + + + + - - - - - - - - - - - - - diff --git a/website/views/login_head.php b/website/views/login_head.php index 2283b7d..a41e87e 100644 --- a/website/views/login_head.php +++ b/website/views/login_head.php @@ -1,6 +1,9 @@ MyHyvesbook+ + diff --git a/website/views/register-view.php b/website/views/register-view.php index b7efbc8..f2b9257 100644 --- a/website/views/register-view.php +++ b/website/views/register-view.php @@ -4,132 +4,132 @@ alt="MyHyvesbook+">
- -
" - return= $correct - method="post"> -

Registreer uw account

+
+

Registreer uw account

+ + " + return= $correct + method="post"> - - + + - -