From e31c9d9534a465eae49203a93720e0d2b0c9c65a Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 12 Dec 2011 12:59:10 +0100
Subject: [PATCH] FXOLAT-358: consolidate mail function (send mail controller
-> mail package)
---
.../file/mail/_i18n/LocalStrings_de.properties | 12 ------------
.../file/mail/_i18n/LocalStrings_en.properties | 13 -------------
.../file/mail/_spring/sendDocByMailContext.xml | 15 ---------------
.../util/mail/_content/sendattachments.html} | 0
.../util/mail/_i18n/LocalStrings_de.properties | 12 ++++++++++++
.../util/mail/_i18n/LocalStrings_en.properties | 12 ++++++++++++
.../olat/core/util/mail/_spring/mailContext.xml | 4 ++++
.../mail/ui}/SendDocumentsByEMailController.java | 8 +++++---
8 files changed, 33 insertions(+), 43 deletions(-)
delete mode 100644 src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_de.properties
delete mode 100644 src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_en.properties
delete mode 100644 src/main/java/org/olat/commons/file/mail/_spring/sendDocByMailContext.xml
rename src/main/java/org/olat/{commons/file/mail/_content/attachments.html => core/util/mail/_content/sendattachments.html} (100%)
rename src/main/java/org/olat/{commons/file/mail => core/util/mail/ui}/SendDocumentsByEMailController.java (98%)
diff --git a/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_de.properties
deleted file mode 100644
index 075fdbb99de..00000000000
--- a/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_de.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-send.mail.title=Dateien per E-Mail versenden
-send.mail.description=Sie können E-Mail mit Dokumenten versenden
-send.mail.attachments=Anhang
-send.mail.subject=Betreff
-send.mail.body=Nachricht
-send.mail.to=An
-send.mail.to.auto=An
-send.mail.to.auto.add=+
-send.mail.noFileSelected=Sie haben keine Dateien ausgewählt.
-send.mail.error=Achtung!!!
-send.mail.selectionContainsFolder=Nur einzelne Dateien können versendet werden.
-send.mail.fileToBigForAttachments={0}MB ist die maximale Grösse für Anhänge. E-Mail wird nur Links zu Dokumenten enthalten.
diff --git a/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_en.properties
deleted file mode 100644
index 3e9a612f2fc..00000000000
--- a/src/main/java/org/olat/commons/file/mail/_i18n/LocalStrings_en.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-#Thu May 26 10:42:18 CEST 2011
-send.mail.attachments=Attachment
-send.mail.body=Message
-send.mail.description=You can send e-mails with attachments
-send.mail.error=Attention\!\!\!
-send.mail.fileToBigForAttachments=The maximum size for mail attachments is {0}MB. The e-mail will contain links to the documents instead.
-send.mail.noFileSelected=No document selected.
-send.mail.selectionContainsFolder=You can send only single documents.
-send.mail.subject=Subject
-send.mail.title=Send files by e-mail
-send.mail.to=To
-send.mail.to.auto=To
-send.mail.to.auto.add=+
diff --git a/src/main/java/org/olat/commons/file/mail/_spring/sendDocByMailContext.xml b/src/main/java/org/olat/commons/file/mail/_spring/sendDocByMailContext.xml
deleted file mode 100644
index f0a89aca2ff..00000000000
--- a/src/main/java/org/olat/commons/file/mail/_spring/sendDocByMailContext.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd">
-
- <bean id="sendDocumentByEMailControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator" >
- <property name="className" value="org.olat.commons.file.mail.SendDocumentsByEMailController"/>
- </bean>
-
-</beans>
\ No newline at end of file
diff --git a/src/main/java/org/olat/commons/file/mail/_content/attachments.html b/src/main/java/org/olat/core/util/mail/_content/sendattachments.html
similarity index 100%
rename from src/main/java/org/olat/commons/file/mail/_content/attachments.html
rename to src/main/java/org/olat/core/util/mail/_content/sendattachments.html
diff --git a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
index d7ada9f495f..690543c8912 100644
--- a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties
@@ -77,4 +77,16 @@ mail.action.unread=Nicht gelesen
mail.action.mark=Markieren
mail.action.unmark=Nicht markieren
mail.action.emtpy=Wählen Sie mindestens eine E-Mail aus um eine Aktion auszulösen.
+send.mail.title=Dateien per E-Mail versenden
+send.mail.description=Sie können E-Mail mit Dokumenten versenden
+send.mail.attachments=Anhang
+send.mail.subject=Betreff
+send.mail.body=Nachricht
+send.mail.to=An
+send.mail.to.auto=An
+send.mail.to.auto.add=+
+send.mail.noFileSelected=Sie haben keine Dateien ausgewählt.
+send.mail.error=Achtung!!!
+send.mail.selectionContainsFolder=Nur einzelne Dateien können versendet werden.
+send.mail.fileToBigForAttachments={0}MB ist die maximale Grösse für Anhänge. E-Mail wird nur Links zu Dokumenten enthalten.
diff --git a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
index 1a20a4896e8..de9f43034fc 100644
--- a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties
@@ -76,3 +76,15 @@ mailtemplateform.sendMailSwitchElem=Send e-mail
mailtemplateform.subject=Mail subject
menu.mail=E-mail
menu.mail.alt=E-mail system configuration
+send.mail.attachments=Attachment
+send.mail.body=Message
+send.mail.description=You can send e-mails with attachments
+send.mail.error=Attention\!\!\!
+send.mail.fileToBigForAttachments=The maximum size for mail attachments is {0}MB. The e-mail will contain links to the documents instead.
+send.mail.noFileSelected=No document selected.
+send.mail.selectionContainsFolder=You can send only single documents.
+send.mail.subject=Subject
+send.mail.title=Send files by e-mail
+send.mail.to=To
+send.mail.to.auto=To
+send.mail.to.auto.add=+
\ No newline at end of file
diff --git a/src/main/java/org/olat/core/util/mail/_spring/mailContext.xml b/src/main/java/org/olat/core/util/mail/_spring/mailContext.xml
index 0d3bfac8b41..3748aafb749 100644
--- a/src/main/java/org/olat/core/util/mail/_spring/mailContext.xml
+++ b/src/main/java/org/olat/core/util/mail/_spring/mailContext.xml
@@ -34,6 +34,10 @@
</property>
</bean>
+ <bean id="sendDocumentByEMailControllerCreator" class="org.olat.core.gui.control.creator.AutoCreator" >
+ <property name="className" value="org.olat.core.util.mail.ui.SendDocumentsByEMailController"/>
+ </bean>
+
<!-- Mail admin. panel -->
<bean class="org.olat.core.extensions.action.GenericActionExtension" id="sysadmin.menupoint.syscfg.mailcfg" init-method="initExtensionPoints">
<property name="actionController">
diff --git a/src/main/java/org/olat/commons/file/mail/SendDocumentsByEMailController.java b/src/main/java/org/olat/core/util/mail/ui/SendDocumentsByEMailController.java
similarity index 98%
rename from src/main/java/org/olat/commons/file/mail/SendDocumentsByEMailController.java
rename to src/main/java/org/olat/core/util/mail/ui/SendDocumentsByEMailController.java
index 9b2a4b692d0..4d61ff0534c 100644
--- a/src/main/java/org/olat/commons/file/mail/SendDocumentsByEMailController.java
+++ b/src/main/java/org/olat/core/util/mail/ui/SendDocumentsByEMailController.java
@@ -17,7 +17,7 @@
* frentix GmbH, http://www.frentix.com
* <p>
*/
-package org.olat.commons.file.mail;
+package org.olat.core.util.mail.ui;
import java.io.File;
import java.text.DecimalFormat;
@@ -68,6 +68,7 @@ import org.olat.core.id.context.ContextEntry;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
import org.olat.core.util.mail.MailHelper;
+import org.olat.core.util.mail.MailModule;
import org.olat.core.util.mail.MailTemplate;
import org.olat.core.util.mail.MailerResult;
import org.olat.core.util.mail.MailerWithTemplate;
@@ -103,7 +104,8 @@ public class SendDocumentsByEMailController extends FormBasicController implemen
private static final int MAX_RESULTS_USERS = 12;
public SendDocumentsByEMailController(UserRequest ureq, WindowControl wControl) {
- super(ureq, wControl, null, Util.createPackageTranslator(MetaInfoFormController.class, ureq.getLocale(), Util.createPackageTranslator(SendDocumentsByEMailController.class, ureq.getLocale())));
+ super(ureq, wControl, null, Util.createPackageTranslator(MetaInfoFormController.class, ureq.getLocale(), Util.createPackageTranslator(MailModule.class, ureq.getLocale())));
+ setBasePackage(MailModule.class);
securityManager = BaseSecurityManager.getInstance();
allowAttachments = !FolderConfig.getSendDocumentLinkOnly();
@@ -133,7 +135,7 @@ public class SendDocumentsByEMailController extends FormBasicController implemen
bodyElement = uifactory.addTextAreaElement("tbody", "send.mail.body", -1, 20, emailCols, false, "", formLayout);
if(allowAttachments) {
- String page = Util.getPackageVelocityRoot(SendDocumentsByEMailController.class) + "/attachments.html";
+ String page = Util.getPackageVelocityRoot(MailModule.class) + "/sendattachments.html";
attachmentsLayout = FormLayoutContainer.createCustomFormLayout("attachments", getTranslator(), page);
attachmentsLayout.setRootForm(mainForm);
attachmentsLayout.setLabel("send.mail.attachments", null);
--
GitLab