From 6d4455b54d2df5a700e84a95530ee0a7ef1ff5de Mon Sep 17 00:00:00 2001
From: Julian Dehne <julian.dehne@uni-potsdam.de>
Date: Wed, 28 Mar 2018 15:57:54 +0200
Subject: [PATCH] fixed problem with duplicate users
---
studentview/database/createUser.php | 8 ++++---
studentview/register.html | 35 -----------------------------
studentview/register.php | 6 ++---
3 files changed, 8 insertions(+), 41 deletions(-)
delete mode 100644 studentview/register.html
diff --git a/studentview/database/createUser.php b/studentview/database/createUser.php
index 531fff0e..936eccde 100644
--- a/studentview/database/createUser.php
+++ b/studentview/database/createUser.php
@@ -21,13 +21,12 @@ $token = uniqid();
$db->query("use fltrail;");
// if user exists login
-$query = "SELECT (u.token) from users u where u.password = \"".$password. "\" and u.email=\""
- .$email."\";";
+$query = "SELECT (u.token) from users u where u.email='".$email."' or u.name='". $name ."';";
$queryObj = mysqli_query($db, $query);
$result = mysqli_fetch_object($queryObj);
if ($result) {
- header("Location: ../pages/projects.php?token=".$result->token);
+ header("Location: ../register.php?userExists=true");
die();
}
@@ -38,3 +37,6 @@ $db->commit();
header("Location: ../pages/projects.php?token=".$token);
die();
+
+
+?>
\ No newline at end of file
diff --git a/studentview/register.html b/studentview/register.html
deleted file mode 100644
index 9a40b6cf..00000000
--- a/studentview/register.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Gruppenmatcher</title>
- <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Ubuntu:400,700">
- <link rel="stylesheet" href="assets/css/Login-Form-Clean.css">
- <link rel="stylesheet" href="assets/css/Navigation-with-Button1.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu.css">
- <link rel="stylesheet" href="assets/css/Sidebar-Menu1.css">
- <link rel="stylesheet" href="assets/css/styles.css">
- <script src="assets/js/jquery.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
-
-</head>
-
-<body>
- <div class="login-clean">
- <form method="post" action="database/createUser.php" target="pages/overview.html">
- <h2 class="sr-only">Login Formular</h2>
- <div class="illustration"><img src="assets/img/fides-logo.svg"></div>
- <div class="form-group"><input class="form-control" name="name" placeholder="Name"></div>
- <div class="form-group"><input class="form-control" type="email" name="email" placeholder="Email"></div>
- <div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password"></div>
- <!--<div class="form-group"><input class="form-control" type="password" name="password"
- placeholder="Password wiederholen"></div>-->
- <div class="form-group"><button class="btn btn-primary btn-block" type="submit">Registrieren</button></div>
- <a href="index.php" class="forgot">einloggen</a></form>
- </div>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/studentview/register.php b/studentview/register.php
index 3ae1c204..3f6a7c5c 100644
--- a/studentview/register.php
+++ b/studentview/register.php
@@ -24,12 +24,12 @@
<div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password"></div>
<!--<div class="form-group"><input class="form-control" type="password" name="password"
placeholder="Password wiederholen"></div>-->
- <div class="form-group"><button class="btn btn-primary btn-block" type="submit">Log In</button></div>
+ <div class="form-group"><button class="btn btn-primary btn-block" type="submit">registrieren</button></div>
<div class="form-group">
<?php
- if (isset($_GET['emailExists'])) {
+ if (isset($_GET['userExists'])) {
echo "<div class=\"alert alert-danger\" role=\"alert\">
- Es existiert ein Nutzer mit dieser Email!
+ Es existiert ein Nutzer mit dieser Email oder diesem Benutzernamen!
</div>";
}
?>
--
GitLab