MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'joey-testing' into 'master'

Browse Source 
Fixed login link

See merge request !58
This commit was merged in pull request #62.
This commit is contained in:
Marijn Jansen
2017-01-18 15:54:36 +01:00
parent 097ccf49b3 455705e286
commit b95705df29
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/login.php
View File

@@ -15,21 +15,21 @@
// Trying to login
if ($_SERVER["REQUEST_METHOD"] == "POST") {
$uname=strtolower($_POST["uname"]);
// Empty username or password field
if (empty($_POST["uname"]) || empty($_POST["psw"])) {
$loginErr = "Gebruikersnaam of wachtwoord is niet ingevuld";
}
else {
$uname=strtolower($_POST["uname"]);
$psw=$_POST["psw"];
$hash=hashPassword()["password"];
$userid=hashPassword()["userID"];
// If there's an account, go to the profile page
if(password_verify($psw.$uname, $hash)) {
$_SESSION["userID"] = $userid;
header("location: /profile.php");
header("location: profile.php");
} else {
$loginErr = "Inloggegevens zijn niet correct";

14
website/public/styles/index.css
View File

@@ -60,7 +60,7 @@ body {
height: 900px;
background-image: url(https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEnqKdVtLbxjKuNsCSCxFRhTOpp3Gm0gsU8bMgA_MeUYyzrUFy);
background-size: contain;
background-size: cover;
background-repeat: repeat-x;
background-attachment: fixed;
@@ -109,10 +109,10 @@ form {
border: 5px solid #325da3;
background-color: #a87a87;
border-radius: 12px;
height: 57%;
margin: 8px auto;
height: 55%;
margin: 35px auto;
width: 45%;
overflow: auto;
overflow-y:auto;
}
/* inlog titel */
@@ -135,14 +135,14 @@ input[type=text], input[type=password], input[type=email], input[type="date"] {
box-sizing: border-box;
display: inline-block;
height: 50%;
padding: 12px 20px;
margin: 8px 0;
padding: 8px 20px;
margin: 4px 0;
width: 50%;
font-family: Arial;
font-size: 16px;
}
input[type=submit] {
button[type=submit] {
background-color: #845663;
border: 2px solid black;
border-radius: 12px;