From 7a2c96eb6b9c6d4dad56f1f096b5f98c2517da39 Mon Sep 17 00:00:00 2001
From: Matthai Kurian <matthai.kurian@frentix.com>
Date: Tue, 14 Aug 2012 11:15:27 +0200
Subject: [PATCH] OO-328: disable user deletion emails by repient=disabled
---
.../olat/admin/user/delete/BulkDeleteController.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/delete/BulkDeleteController.java b/src/main/java/org/olat/admin/user/delete/BulkDeleteController.java
index c57320063f3..ca376f8f9bd 100644
--- a/src/main/java/org/olat/admin/user/delete/BulkDeleteController.java
+++ b/src/main/java/org/olat/admin/user/delete/BulkDeleteController.java
@@ -133,6 +133,13 @@ public class BulkDeleteController extends BasicController {
* list of not deleted users, reason for deletion
*/
public void sendMail(UserRequest ureq) {
+
+ String recipient = WebappHelper.getMailConfig("mailDeleteUser");
+
+ if (recipient.equals("disabled")) {
+ return;
+ }
+
StringBuffer loginsFound = new StringBuffer();
for(String login : lstLoginsFound) loginsFound.append(login + "\n");
StringBuffer loginsNotfound = new StringBuffer();
@@ -150,8 +157,8 @@ public class BulkDeleteController extends BasicController {
String subject = translate("mail.subject");
String body = getTranslator().translate("mail.body", bodyArgs);
- ContactList cl = new ContactList(WebappHelper.getMailConfig("mailDeleteUser"));
- cl.add(WebappHelper.getMailConfig("mailDeleteUser"));
+ ContactList cl = new ContactList(recipient);
+ cl.add(recipient);
cl.add(ureq.getIdentity());
List<ContactList> lstAddrTO = new ArrayList<ContactList>();
lstAddrTO.add(cl);
--
GitLab