1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java
index b822e4d..6d9fe0a 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java
@@ -12,11 +12,11 @@ public class DbUser extends User
 
 	private static Logger log = Logger.getLogger( DbUser.class );
 
-	public DbUser( int userId, String eppn, String password, String organizationId,
+	public DbUser( int userId, String login, String password, String organizationId,
 			String firstName, String lastName, String eMail,
 			String satelliteAddress )
 	{
-		super( userId, eppn, password, organizationId, firstName, lastName, eMail,
+		super( userId, login, password, organizationId, firstName, lastName, eMail,
 				satelliteAddress );
 	}
 
@@ -33,9 +33,9 @@ public class DbUser extends User
 		return MySQL
 				.findUniqueOrNull(
 						DbUser.class,
-						"SELECT user.userid, user.eppn, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user"
+						"SELECT user.userid, user.login, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user"
 								+ " LEFT JOIN satellite USING (organizationid)"
-								+ " WHERE user.eppn = ? LIMIT 1",
+								+ " WHERE user.login = ? LIMIT 1",
 						login );
 	}
 
@@ -51,7 +51,7 @@ public class DbUser extends User
 		return MySQL
 				.findUniqueOrNull(
 						DbUser.class,
-						"SELECT user.userid, user.eppn, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user"
+						"SELECT user.userid, user.login, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user"
 								+ " LEFT JOIN satellite USING (organizationid)"
 								+ " WHERE user.userid = ? LIMIT 1",
 						userid );
@@ -72,10 +72,10 @@ public class DbUser extends User
 
 	public static boolean insertOrUpdate( User user )
 	{
-		log.debug( "Inserted user '" + user.eppn + "' into db." );
+		log.debug( "Inserted user '" + user.login + "' into db." );
 		MySQL.update(
-				"INSERT INTO user (eppn, password, organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE password=VALUES(password), organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)",
-				user.eppn, user.password, user.organizationId, user.firstName, user.lastName, user.eMail );
+				"INSERT INTO user (login, password, organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE password=VALUES(password), organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)",
+				user.login, user.password, user.organizationId, user.firstName, user.lastName, user.eMail );
 		return false;
 	}