diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 5e056b9be76761e3e2a61835ef47c8d3e761ad3d..8b633511b0c4c9faba5f9e3b50735af40f527318 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -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> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index e65b895509e9ced245bbfda2736f56742b573897..61cbdca2017302dd4a0d634690f5f5ba38d10044 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -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> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 8347bc106bd7e417f278268297161df07529049f..7b56909fe432b7642e440636ea2dbb6aaa8c9454 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -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> diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js index 373495625a441019c820af8d3bfc4578ecbe0afc..bffbe633e28bdc6119fdea0898094c96809e493e 100644 --- a/process/Email_lib/process.js +++ b/process/Email_lib/process.js @@ -1,3 +1,4 @@ +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;