Merge branch 'm_1079868_opener_revert' into '2021.0.3'

[Projekt: xRM-Marketing][TicketNr.: 1079868][Redesign: Opener Link Ersetzung...

See merge request xrm/basic!918

process/Bulkmail_lib/process.js

@@ -133,24 +133,10 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun)
         {
             if (Utils.toBoolean(isRedirect))
             {
-                var linkFn;
-                //Mosaico places a url in front of the placeholder if it gets placed inside image src 
-                //so we temporarily create the whole html tag with a placeholder for the opener until this is solved
-                if (placeholder == "pixel")
-                {
-                    linkFn = function (pContactId)
-                        {
-                            return "<img src=\""+baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId)+"\" alt=\"\" width=\"1\" height=\"1\" border=\"0\" hspace=\"0\" vspace=\"0\" align=\"top\">";
-                        }  
-                }
-                else
-                {
-                    linkFn = function (pContactId)
-                        {
-                            return baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId);
-                        }  
-                }
-                
+                var linkFn = function (pContactId)
+                    {
+                        return baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId);
+                    }  
                 return new Placeholder(placeholder, Placeholder.types.CALLBACKFUNCTION, linkFn);
             }
             return new Placeholder(placeholder, Placeholder.types.FIXEDVALUE, url);

process/DocumentTemplate_lib/process.js

@@ -438,12 +438,8 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements)
         case DocumentTemplate.types.HTML:
             // replaces ä, ö, ü, ... with html escape signs
             for (let i in pReplacements)
-            {
-                //we need to write a full html tag and not only text for the opener pixel at the moment
-                if(i != "{@pixel@}")
-                {
-                    pReplacements[i] = text.text2html(pReplacements[i], false);
-                }
+            {                
+                pReplacements[i] = text.text2html(pReplacements[i], false);
             }
         case DocumentTemplate.types.TXT:
             let decodedContent = util.decodeBase64String(content);