diff options
author | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
commit | 287ad92152c530b400a5405a4672a41d92e4d368 (patch) | |
tree | 42dcb2c698672ae371d70a81ea5c49f3280db9c6 /src/main/java/org/openslx/imagemaster/db/DbUser.java | |
parent | Add remove image from process list (when user gets deleted after timeout) (diff) | |
download | masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.gz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.xz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.zip |
Add ftp users and images in processing list are remembered
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbUser.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java index 45cbb2a..8cf4b55 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java @@ -55,11 +55,20 @@ public class DbUser extends User "SELECT user.userid, user.username, user.password, user.organization, user.firstname, user.lastname, user.email, satellite.address FROM user" + " LEFT JOIN satellite USING (organization)" + " WHERE user.username = ? LIMIT 1", username ); - if ( user != null ) { - return user.userId; - } else { - return 0; - } + if ( user == null ) return 0; + return user.userId; + } + + public static String getUserNameById( int id ) + { + DbUser user = MySQL + .findUniqueOrNull( + DbUser.class, + "SELECT user.userid, user.username, user.password, user.organization, user.firstname, user.lastname, user.email, satellite.address FROM user" + + " LEFT JOIN satellite USING (organization)" + + " WHERE user.userid = ? LIMIT 1", id ); + if (user == null) return ""; + return user.username; } } |