diff options
| author | Björn Hagemeister | 2014-10-22 16:38:43 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-10-22 16:38:43 +0200 |
| commit | b05ccce1ce7b428c36c754aa6673a2e08d0ba209 (patch) | |
| tree | 23ecd1c4f47073fcad04f4b82c759eddc75661f4 /src/main/java/org/openslx/imagemaster/db/DbUser.java | |
| parent | Store publickey in DbSatellite with prefix mod: and exp: for better indicatin... (diff) | |
| download | masterserver-b05ccce1ce7b428c36c754aa6673a2e08d0ba209.tar.gz masterserver-b05ccce1ce7b428c36c754aa6673a2e08d0ba209.tar.xz masterserver-b05ccce1ce7b428c36c754aa6673a2e08d0ba209.zip | |
Fixed several things for successful up and download to satellite.
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbUser.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java index 23ee6d5..87febe1 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java @@ -85,8 +85,8 @@ public class DbUser extends User public static boolean insertOrUpdate(UserInfo userInfo) { log.debug( "Inserted user '" + userInfo.userId + "' into db." ); int ret = MySQL.update( - "INSERT INTO user (organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?) ON DUPLICATE KEY UPDATE organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)", - userInfo.organizationId, userInfo.firstName, userInfo.lastName, userInfo.eMail ); + "INSERT INTO user (login, password, organizationid, firstname, lastname, email) VALUES (?, '', ?, ?, ?, ?) ON DUPLICATE KEY UPDATE organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)", + userInfo.userId, userInfo.organizationId, userInfo.firstName, userInfo.lastName, userInfo.eMail ); return (ret != 0); } |