From 08225470b0abd27f1960801f461878dd48f1e6d0 Mon Sep 17 00:00:00 2001 From: Thies Mueller Date: Fri, 8 Jan 2021 15:43:17 +0100 Subject: [PATCH 1/4] changed db schema to english --- usertable.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usertable.sql b/usertable.sql index 46b7669..5bc6011 100644 --- a/usertable.sql +++ b/usertable.sql @@ -1,9 +1,9 @@ CREATE TABLE `users` ( `id` INT NOT NULL AUTO_INCREMENT , `email` VARCHAR(255) NOT NULL , - `passwort` VARCHAR(255) NOT NULL , - `vorname` VARCHAR(255) NOT NULL DEFAULT '' , - `nachname` VARCHAR(255) NOT NULL DEFAULT '' , + `password` VARCHAR(255) NOT NULL , + `givenName` VARCHAR(255) NOT NULL DEFAULT '' , + `lastName` VARCHAR(255) NOT NULL DEFAULT '' , `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `updated_at` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , PRIMARY KEY (`id`), UNIQUE (`email`) -- 2.34.1 From 31b4325296fa16b2f97fbb65d94fad64329085a2 Mon Sep 17 00:00:00 2001 From: Thies Mueller Date: Fri, 8 Jan 2021 15:44:20 +0100 Subject: [PATCH 2/4] added username field for later usage and made it unique --- usertable.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usertable.sql b/usertable.sql index 5bc6011..62b44d3 100644 --- a/usertable.sql +++ b/usertable.sql @@ -1,10 +1,11 @@ CREATE TABLE `users` ( `id` INT NOT NULL AUTO_INCREMENT , `email` VARCHAR(255) NOT NULL , + `username` VARCHAR(255) NOT NULL , `password` VARCHAR(255) NOT NULL , `givenName` VARCHAR(255) NOT NULL DEFAULT '' , `lastName` VARCHAR(255) NOT NULL DEFAULT '' , `created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `updated_at` TIMESTAMP on update CURRENT_TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , - PRIMARY KEY (`id`), UNIQUE (`email`) + PRIMARY KEY (`id`), UNIQUE (`email`), UNIQUE (`username`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; \ No newline at end of file -- 2.34.1 From a0d4743074b2f510d8ff2d527d49bbda092171c0 Mon Sep 17 00:00:00 2001 From: Thies Mueller Date: Fri, 8 Jan 2021 15:46:39 +0100 Subject: [PATCH 3/4] register.php is now english only --- register.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/register.php b/register.php index 5817465..8530fd0 100644 --- a/register.php +++ b/register.php @@ -17,18 +17,18 @@ if(isset($_GET['register'])) { $email = $_POST['email']; $givenName = $_POST['givenName']; $lastName = $_POST['lastName']; - $passwort = $_POST['passwort']; - $passwort_confirm = $_POST['passwort_confirm']; + $password = $_POST['password']; + $password_confirm = $_POST['password_confirm']; if(!filter_var($email, FILTER_VALIDATE_EMAIL)) { echo 'Please use valid email
'; $error = true; } - if(strlen($passwort) == 0) { + if(strlen($password) == 0) { echo 'Please enter password
'; $error = true; } - if($passwort != $passwort_confirm) { + if($password != $password_confirm) { echo 'passwords doesnt match
'; $error = true; } @@ -46,10 +46,10 @@ if(isset($_GET['register'])) { } if(!$error) { - $passwort_hash = password_hash($passwort, PASSWORD_DEFAULT); + $password_hash = password_hash($password, PASSWORD_DEFAULT); - $statement = $pdo->prepare("INSERT INTO users (email, vorname, nachname, passwort) VALUES (:email, :givenName, :lastName, :passwort)"); - $result = $statement->execute(array('email' => $email, 'givenName' => $givenName, 'lastName' => $lastName, 'passwort' => $passwort_hash)); + $statement = $pdo->prepare("INSERT INTO users (email, givenName, lastName, password) VALUES (:email, :givenName, :lastName, :password)"); + $result = $statement->execute(array('email' => $email, 'givenName' => $givenName, 'lastName' => $lastName, 'password' => $password_hash)); if($result) { echo 'successfull registered. Login'; @@ -71,10 +71,10 @@ Given Name:
Family Name:


Password:
-
+
Password (aganin):
-

+

-- 2.34.1 From 8e4f753e63601a4dc0ce3f1a546c9c7b6239e785 Mon Sep 17 00:00:00 2001 From: Thies Mueller Date: Fri, 8 Jan 2021 15:49:40 +0100 Subject: [PATCH 4/4] login.php is now english only --- login.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/login.php b/login.php index fc4a4c2..0bc4d0e 100644 --- a/login.php +++ b/login.php @@ -4,18 +4,18 @@ $pdo = new PDO('mysql:host=localhost;dbname=usertable', 'usertable', 'password') if(isset($_GET['login'])) { $email = $_POST['email']; - $passwort = $_POST['passwort']; + $password = $_POST['password']; $statement = $pdo->prepare("SELECT * FROM users WHERE email = :email"); $result = $statement->execute(array('email' => $email)); $user = $statement->fetch(); //Überprüfung des Passworts - if ($user !== false && password_verify($passwort, $user['passwort'])) { + if ($user !== false && password_verify($password, $user['password'])) { $_SESSION['userid'] = $user['id']; $_SESSION['email'] = $user['email']; - $_SESSION['givenName'] = $user['vorname']; - $_SESSION['lastName'] = $user['nachname']; + $_SESSION['givenName'] = $user['givenName']; + $_SESSION['lastName'] = $user['lastName']; die('successfull. go to: secure page'); } else { $errorMessage = "somethings wrong (maybe wrong password or wrong email)
"; @@ -41,7 +41,7 @@ E-Mail:


Your password:
-
+
-- 2.34.1