Skip to content
Snippets Groups Projects
Commit 67142a91 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix mails

parent 72467aee
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.1"> <aliasConfig xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/aliasConfig/1.1.2">
<name>mailServerIMAP_default</name> <name>mailServerIMAP_default</name>
<serverId>default</serverId> <serverId>default</serverId>
<definitionName>mailServerIMAP</definitionName> <definitionName>mailServerIMAP</definitionName>
<aliasConfigSub> <aliasConfigSub>
<aliasSubMailserverImap /> <aliasSubMailserverImap>
<host>localhost</host>
<smtpHost>localhost</smtpHost>
</aliasSubMailserverImap>
</aliasConfigSub> </aliasConfigSub>
</aliasConfig> </aliasConfig>
...@@ -67,7 +67,7 @@ DocumentTemplate.prototype.toString = function () ...@@ -67,7 +67,7 @@ DocumentTemplate.prototype.toString = function ()
DocumentTemplate.prototype._resolveEmbeddedTemplate = function () DocumentTemplate.prototype._resolveEmbeddedTemplate = function ()
{ {
if (this.type == DocumentTemplate.types.PLAIN || this.type == DocumentTemplate.types.TXT || this.type == DocumentTemplate.types.HTML) if (this.content != null && (this.type == DocumentTemplate.types.PLAIN || this.type == DocumentTemplate.types.TXT || this.type == DocumentTemplate.types.HTML))
{ {
var replacedContent = ""; var replacedContent = "";
if (this.type == DocumentTemplate.types.PLAIN) if (this.type == DocumentTemplate.types.PLAIN)
...@@ -111,7 +111,7 @@ DocumentTemplate.prototype._resolveEmbeddedTemplate = function () ...@@ -111,7 +111,7 @@ DocumentTemplate.prototype._resolveEmbeddedTemplate = function ()
// Note: some embedded templates in embedded templates may be replaced, but this is NOT SUPPORTED, as it only works if the second template is not already replaced at that time. // Note: some embedded templates in embedded templates may be replaced, but this is NOT SUPPORTED, as it only works if the second template is not already replaced at that time.
placeholders.forEach(function(pPlaceholder) { placeholders.forEach(function(pPlaceholder) {
replacedContent = replacedContent.replace("{@" + pPlaceholder[0] + "@}", pPlaceholder[1]) replacedContent = replacedContent.replace("{@" + pPlaceholder[0] + "@}", pPlaceholder[1], "g")
}, this); }, this);
this.content = util.encodeBase64String(replacedContent); this.content = util.encodeBase64String(replacedContent);
......
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