Merge branch 'master' of https://git.fslab.de/tpinza2s/s4s

# Conflicts:
#	src/main/java/org/s4s/dao/impl/RegistrationControl.java

src/main/java/org/s4s/dao/impl/RegistrationControl.java

@@ -48,10 +48,19 @@ 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!");
         }

src/main/java/org/s4s/dao/impl/TransactionControl.java

@@ -5,43 +5,37 @@
  */
 package org.s4s.dao.impl;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
+import com.vaadin.ui.UI;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import org.s4s.exceptions.DAOException;
-import org.s4s.exceptions.NoSuchUserOrPassword;
 import org.s4s.modell.dto.Product;
 import org.s4s.modell.dto.User;
-import java.sql.*;
+import org.s4s.services.util.Roles;
 
 /**
  *
  * @author Sebastian
  */
-public class TransactionControl extends AbstractDatabaseClass{
-   
-    User verkaeufer;
+public class TransactionControl extends AbstractDatabaseClass {
+
+    String verkaeufer;
     User kaeufer;
-    Product a;
-    
-    ResultSet rs;
-
-    public void createTransaction() throws DAOException{        
-        try
-        {               
-                rs = executeQuery("SELECT u.\"artikelid\""
-                    + " FROM \"ERR\".\"artikel\" u "
-                    + " WHERE u.artikelid = '" + a.getId() + "';");
-                                       
-        } catch (SQLException ex) 
-        {
+    Product produkt;
+    //Warenkorb warenkorb = Warenkorb.getInstance();
+
+    String kaufer = (String) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER);
+
+    public void createTransaction() throws DAOException, SQLException {
+        try (ResultSet rs = executeQuery("SELECT u.\"besitzer\"" + " FROM \"ERR\".\"shop\" u , \"ERR\".\"artikel\" s"
+                + " WHERE u.shopid = s.shopid AND "
+                + "s.artikelid'" + produkt.getId() + "';");) {
+
+            verkaeufer = rs.getString("besitzer");
+        } catch (SQLException ex) {
             throw new DAOException(ex);
         }
-        
-           
+
     }
-    
-    
+
 }