admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LOGC#45667 content ID's zijn nu randomized zodat ze niet geladen worden uit cache door de mailclient van iOS

Browse Source 
svn path=/Website/trunk/; revision=37808
This commit is contained in:
Koen Reefman
2018-05-01 09:27:48 +00:00
parent f521005c24
commit bb72afaa81
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
UTILS/PutOrders/puo_sendmail.js
View File

@@ -127,7 +127,7 @@ function sendMail( p_mailfrom
// src="cid:qrc.png"
// Ondertussen is het al HTML dus we kunnen geen XML-query doen
// Daarom gewoon textueel opzoeken
var nn_cid = 0;
var rnd_cid;
var startPos = p_bodyhtml.indexOf("qrc=") + 4;
var quote = p_bodyhtml.substr(startPos, 1); // enkele of dubbele quote
var eindPos = p_bodyhtml.indexOf(quote, startPos + 2);
@@ -146,8 +146,8 @@ function sendMail( p_mailfrom
var sha1 = oCrypto.hex_sha1(qrc);
var tempfile = custabspath + "/../../temp/puo_qr_" + sha1 + ".png";
oStream.SaveToFile(tempfile, 2); // overwrite
nn_cid++;
var cidname = "qrc" + nn_cid + ".png";
rnd_cid = (Math.random().toString(36)+'00000000000000000').slice(2, 12);
var cidname = "qrc" + rnd_cid + ".png";
var newbody = p_bodyhtml.substr(0, startPos - 4) + "src=\"cid:" + cidname + "\"" + p_bodyhtml.substr(eindPos + 1);
p_bodyhtml = newbody;
objMail.addRelatedBodyPart(tempfile, cidname, 0);
@@ -156,7 +156,6 @@ function sendMail( p_mailfrom
}
// Nu frc-codering opzoeken <img frc="M=SML:K=34417"/>
var nn_cid = 0;
var startPos = p_bodyhtml.indexOf("frc=") + 4;
var quote = p_bodyhtml.substr(startPos, 1); // enkele of dubbele quote
var eindPos = p_bodyhtml.indexOf(quote, startPos + 2);
@@ -215,8 +214,8 @@ function sendMail( p_mailfrom
var file = filedata.resized;
else
var file = props.AttachPath + props.files[0].name;
nn_cid++;
var cidname = "flex" + nn_cid + ".png";
rnd_cid = (Math.random().toString(36)+'00000000000000000').slice(2, 12);
var cidname = "flex" + rnd_cid + ".png";
var newbody = p_bodyhtml.substr(0, startPos - 4) + "src=\"cid:" + cidname + "\"" + p_bodyhtml.substr(eindPos + 1);
p_bodyhtml = newbody;
try {
@@ -263,8 +262,6 @@ function sendMail( p_mailfrom
}
Log2File(2, "Before bodyHTML");
objMail.HtmlBody = p_bodyhtml.replace(/\<br/g, "\x0D\x0A<br"); // FSN#36318 Geen afsluitende '>'
objMail.HTMLBodyPart.Charset = S("puo_mailbodycharset");
var startPos = p_bodyhtml.indexOf("cid:") + 4;
var eindPos = p_bodyhtml.indexOf(".gif", startPos) + 4;
@@ -272,16 +269,31 @@ function sendMail( p_mailfrom
{
var logoFileName = p_bodyhtml.substring(startPos, eindPos);
var logoPathName = custabspath + "/" + logoFileName;
Log2File(2, logoFileName);
Log2File(2, "After bodyHTML");
try {
objMail.addRelatedBodyPart(logoPathName, logoFileName, 0);
}
catch (e)
if (objFso.FileExists(logoPathName))
{
throw new UserException(e + 1000, "PutOrders", e.description + "\nPerhaps invalid logo path: "+ logoPathName);
Log2File(2, logoFileName);
rnd_cid = (Math.random().toString(36)+'00000000000000000').slice(2, 12);
var cidname = "logo" + rnd_cid + ".gif";
var newbody = p_bodyhtml.substr(0, startPos - 4) + "cid:" + cidname + p_bodyhtml.substr(eindPos);
p_bodyhtml = newbody;
try {
objMail.addRelatedBodyPart(logoPathName, cidname, 0);
}
catch (e)
{
throw new UserException(e + 1000, "PutOrders", e.description + "\nPerhaps invalid logo path: "+ logoPathName);
}
}
else
{
Log2File(1, "Error: logo '" + logoPathName + "' not found. Ignoring.");
}
}
objMail.HtmlBody = p_bodyhtml.replace(/\<br/g, "\x0D\x0A<br"); // FSN#36318 Geen afsluitende '>'
objMail.HTMLBodyPart.Charset = S("puo_mailbodycharset");
Log2File(2, "After bodyHTML");
}
catch(e)
{