From 20db959980a891355daee9a3510834ca197358f2 Mon Sep 17 00:00:00 2001
From: "SIMONVOLLENDORF\\Simon" <simon.vollendorf@smail.inf.h-brs.de>
Date: Wed, 14 Jun 2017 11:33:07 +0200
Subject: [PATCH] no message
---
src/main/java/org/s4s/dao/RegistrationDAO.java | 6 +++---
.../java/org/s4s/dao/impl/RegistrationControl.java | 11 +----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/s4s/dao/RegistrationDAO.java b/src/main/java/org/s4s/dao/RegistrationDAO.java
index a62c9f0..cdc41f3 100644
--- a/src/main/java/org/s4s/dao/RegistrationDAO.java
+++ b/src/main/java/org/s4s/dao/RegistrationDAO.java
@@ -22,10 +22,10 @@ public class RegistrationDAO extends AbstractDatabaseClass {
public void addUser(String benutzer, String nachname, String vorname, java.util.Date gebDate, int fBereich, String email, String emailwdh, String passwort, String passwortWdh) {
try {
sql_update = "INSERT INTO \"ERR\".\"user\"(benutzername, nachname, vorname, geburtsdatum, fachbreichid, email, passwort)" +
- "VALUES(" + benutzer + ", " + nachname + ", " + vorname + ", " + gebDate + ", " + fBereich + ", " + email + ", " + passwort + ")";
+ "VALUES(\'" + benutzer + "\', \'" + nachname + "\', \'" + vorname + "\', \'" + gebDate + "\', \'" + fBereich + "\', \'" + email + "\', \'" + passwort + "\')";
- boolean exe = st.execute(sql_update);
- if(!exe) {
+ int exe = st.executeUpdate(sql_update);
+ if(exe < 0) {
throw new WrongInputException("Wrong Input!");
}
diff --git a/src/main/java/org/s4s/dao/impl/RegistrationControl.java b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
index 9de4fa9..7e1a192 100644
--- a/src/main/java/org/s4s/dao/impl/RegistrationControl.java
+++ b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
@@ -48,19 +48,9 @@ public class RegistrationControl {
throw new WrongInputException("Passwort entspricht nicht den Anforderungen!");
}
-<<<<<<< HEAD
if(!email.equals(emailwdh) && !emailValidator()) {
throw new WrongInputException("Email-Adressen stimmen nicht Þberein oder sind nicht gÞltig!");
-=======
-<<<<<<< HEAD
-
-=======
- if(!(passwort.equals(data[5]) || email.equals(data[3]))) {
- return false;
->>>>>>> a531185a6d588bdb777cb933d716155d3ba428de
}
-
->>>>>>> efa220193da851f3b49575d9736c0d39145b79ac
if (!nameValidator(nachname)) {
throw new WrongInputException("Nachname enthÃĪlt ungÞltige Zeichen!");
}
@@ -79,6 +69,7 @@ public class RegistrationControl {
regDAO.addUser(benutzer, nachname, vorname, gebDate, fBereich, email, emailwdh, passwort, passwortWdh);
}
+
public static boolean nameValidator(String toValidate) {
//wenn Eingabe falsch -> Notification
--
GitLab