diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java')
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java | 8 | ||||
| -rw-r--r-- | dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java index 7e2651cb..ac77c022 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java @@ -157,16 +157,16 @@ public class DbUser { MysqlStatement insUpStmt; if (isLogin) { insUpStmt = connection.prepareStatement("INSERT INTO user" - + " (userid, firstname, lastname, email, organizationid, lastlogin, canlogin, issuperuser)" + + " (userid, firstname, lastname, email, organizationid, lastlogin, canlogin, issuperuser, emailnotifications)" + " VALUES" - + " (:userid, :firstname, :lastname, :email, :organizationid, UNIX_TIMESTAMP(), :canlogin, 0)" + + " (:userid, :firstname, :lastname, :email, :organizationid, UNIX_TIMESTAMP(), :canlogin, 0, 1)" + " ON DUPLICATE KEY UPDATE lastlogin = UNIX_TIMESTAMP(), email = VALUES(email)," + " firstname = VALUES(firstname), lastname = VALUES(lastname), organizationid = VALUES(organizationid)"); } else { insUpStmt = connection.prepareStatement("INSERT INTO user" - + " (userid, firstname, lastname, email, organizationid, canlogin, issuperuser)" + + " (userid, firstname, lastname, email, organizationid, canlogin, issuperuser, emailnotifications)" + " VALUES" - + " (:userid, :firstname, :lastname, :email, :organizationid, 0, 0)" + + " (:userid, :firstname, :lastname, :email, :organizationid, 0, 0, 0)" + " ON DUPLICATE KEY UPDATE email = VALUES(email)," + " firstname = VALUES(firstname), lastname = VALUES(lastname), organizationid = VALUES(organizationid)"); } diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java index 898574b8..2ee6aa54 100644 --- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java +++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java @@ -27,6 +27,7 @@ import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.ImageVersionDetails; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.bwlp.thrift.iface.LectureSummary; +import org.openslx.bwlp.thrift.iface.ShareMode; import org.openslx.bwlp.thrift.iface.TNotFoundException; import org.openslx.bwlp.thrift.iface.UserInfo; @@ -293,7 +294,11 @@ public class MailGenerator { } catch (SQLException e) { users = new HashMap<>(); } - users.put(image.ownerId, new ImagePermissions(true, true, true, true)); + // For images downloaded from master server, don't email the owner, as the owner + // is from some other organization (usually) + if (image.shareMode == ShareMode.LOCAL || image.shareMode == ShareMode.PUBLISH) { + users.put(image.ownerId, new ImagePermissions(true, true, true, true)); + } List<UserInfo> list = new ArrayList<>(users.size()); for (Entry<String, ImagePermissions> entry : users.entrySet()) { ImagePermissions perms = entry.getValue(); |