From 6deed74165fb481b9988782352d9641ef1a4556e Mon Sep 17 00:00:00 2001
From: "SIMONVOLLENDORF\\Simon" <simon.vollendorf@smail.inf.h-brs.de>
Date: Fri, 9 Jun 2017 10:40:57 +0200
Subject: [PATCH] =?UTF-8?q?DB-Anbindung=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../org/s4s/dao/impl/RegistrationControl.java | 26 +++++++++----------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/s4s/dao/impl/RegistrationControl.java b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
index aaf067c..8c4942e 100644
--- a/src/main/java/org/s4s/dao/impl/RegistrationControl.java
+++ b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
@@ -37,20 +37,23 @@ public class RegistrationControl {
email = data[2];
passwort = data[4];
-<<<<<<< HEAD
- if (!nameValidator(nachname)) {
-=======
+ if(!(passwort.equals(data[5]) || email.equals(data[3]))) {
+ return false;
+ }
- if (!nameValidator(surname)) {
->>>>>>> b9c731060515564cb15c225cca74afba8238a690
+ if (!nameValidator(nachname)) {
return false;
}
+
if (!nameValidator(vorname)) {
return false;
}
+
if (!emailValidator()) {
return false;
- } if (!passwordValidator()) {
+ }
+
+ if (!passwordValidator()) {
return false;
}
@@ -69,14 +72,9 @@ public class RegistrationControl {
con = DriverManager.getConnection(url);
st = con.createStatement();
- //wie wird die UserID vergeben?
- //benutzername soll was sein? Vorname und Nachname?
- //fachbereich muss noch in View hinzugefügt werden
- //adresse am besten in der DB in User hinterlegen
- sql_update = "INSERT INTO \"ERR\".\"user\"()"
- + ""; //erweitern
- //INSERT INTO user(userID, email, passwort, nachname, vorname)
- //VALUES(sq.generator.nextval, email, passwort, nachname, vorname);
+
+ sql_update = "INSERT INTO \"ERR\".\"user\"(email, passwort, nachname, vorname)" +
+ "VALUES(email, passwort, nachname, vorname)"; //erweitern
st.executeUpdate(sql_update);
--
GitLab