Skip to content
Snippets Groups Projects
Commit d22cbaed authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon: Committed by Sebastian Listl
Browse files

1061035 fix bulkmail throw error

parent f7723960
No related branches found
No related tags found
No related merge requests found
......@@ -7269,6 +7269,9 @@
<entry>
<key>Favoritegroup</key>
</entry>
<entry>
<key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
......@@ -9642,6 +9642,10 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>FavoriteGroup</key>
</entry>
<entry>
<key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
<value>Mailbridge fehlgeschlagen: Benutzer '%0' ist unbekannt, kontaktieren sie einen Administrator.</value>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
......@@ -7350,6 +7350,9 @@
<entry>
<key>Favoritegroup</key>
</entry>
<entry>
<key>Mailbridge failed: user '%0' is unknown, contact an administrator.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
import("system.question");
import("Sql_lib");
import("MimeType_lib");
import("Document_lib");
......@@ -10,7 +11,8 @@ import("Communication_lib");
import("DocumentTemplate_lib");
import("system.neon");
import("system.mail");
import("Bulkmail_lib")
import("Bulkmail_lib");
import("system.tools");
function EmailWritingUtils () {}
......@@ -380,8 +382,19 @@ Email.prototype.send = function (pUser)
if (this.sender)
mail.setSender(mailId, this.sender);
var sentMails = mail.sendMailAs(pUser || "mailbridge", mailId)
var mailbridgeTitle = "mailbridge";
var sentMails;
if(pUser)
sentMails = mail.sendMailAs(pUser, mailId)
else
{
let mailbridgeExists = tools.getUser(mailbridgeTitle);
if(mailbridgeExists)
mail.sendMailAs(mailbridgeTitle, mailId)
else //check mailbridge user if this error gets thrown
question.showMessage(translate.withArguments("Mailbridge failed: user '%0' is unknown, contact an administrator.", [mailbridgeTitle]), question.ERROR, translate.text("Error"));
}
// remove from cache
mail.deleteMail(mailId)
return sentMails > 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment