updated mail-portlet refs liferay#60

University-of-Potsdam-MM · Feb 3, 2017 · 6ebbc3b · 6ebbc3b
1 parent a054af5
commit 6ebbc3b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/...il-portlet/docroot/WEB-INF/src/com/liferay/mail/service/impl/MessageLocalServiceImpl.java b/...il-portlet/docroot/WEB-INF/src/com/liferay/mail/service/impl/MessageLocalServiceImpl.java
@@ -365,6 +365,12 @@ protected long getSize(long messageId, String body) throws SystemException {
 	}
 
 	protected String removeBoundaryMarker(String contentType) {
+		// BEGIN CHANGE
+		// added check if contentType is null, because it is necessary... 
+		if (contentType == null)
+			return contentType;
+		// END CHANGE
+
 		int i = contentType.indexOf(CharPool.SEMICOLON);
 
 		if (i == -1) {

diff --git a/portlets/mail-portlet/docroot/WEB-INF/src/content/Language_de.properties b/portlets/mail-portlet/docroot/WEB-INF/src/content/Language_de.properties
@@ -85,4 +85,8 @@ unable-to-update-account=Das Konto kann nicht aktualisiert werden.
 update-account=Konto aktualisieren
 updating-account=Konto wird aktualisiert...
 updating-folder=Ordner wird aktualisiert...
-x-of-x={0} / {1}
+x-of-x={0} / {1}
+
+mailup-account=Mail.UP-Konto
+mailup-description=Verwenden Sie Mail.UP in Campus.UP.
+discard=Verwerfen
diff --git a/portlets/mail-portlet/docroot/WEB-INF/src/content/Language_en.properties b/portlets/mail-portlet/docroot/WEB-INF/src/content/Language_en.properties
@@ -85,4 +85,7 @@ unable-to-update-account=Unable to update account.
 update-account=Update Account
 updating-account=Updating account...
 updating-folder=Updating folder...
-x-of-x={0} / {1}
+x-of-x={0} / {1}
+
+mailup-account=Mail.UP-Account
+mailup-description=User Mail.UP in Campus.UP.
diff --git a/portlets/mail-portlet/docroot/WEB-INF/src/portlet.properties b/portlets/mail-portlet/docroot/WEB-INF/src/portlet.properties
@@ -23,6 +23,21 @@ default.accounts=\
         "folderPrefix": "",\
         "useLocalPartAsLogin": true\
     },\
+    {\
+        "titleLanguageKey": "mailup-account",\
+        "descriptionLanguageKey": "mailup-description",\
+        "address": "@uni-potsdam.de",\
+        "protocol": "imap",\
+        "hideSettings": true,\
+        "incomingHostName": "imap.uni-potsdam.de",\
+        "incomingPort": "993",\
+        "incomingSecure": true,\
+        "outgoingHostName": "smtpout.uni-potsdam.de",\
+        "outgoingPort": "465",\
+        "outgoingSecure": "true",\
+        "folderPrefix": "",\
+        "useLocalPartAsLogin": true\
+    },\
     {\
         "titleLanguageKey": "custom-mail-account",\
         "descriptionLanguageKey": "",\