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

FCLT#90168 Iets betere sql-statement layout.

Browse Source 
svn path=/Website/trunk/; revision=70440
This commit is contained in:
Jos Groot Lipman
2025-09-29 12:12:34 +00:00
parent 826cba9694
commit c03616e600
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/API/api_hmail.asp
View File

@@ -289,7 +289,7 @@ function getEmailSetting(xmlReq, xmlParameters)
// - de afzender matcht of is niet specifiek gedefinieerd
// - het onderwerp matcht de conditie of is niet specifiek gedefinieerd
// - de verplichte bijlage is present of is niet specifiek gedefinieerd
// Het gevonden record levert de aan te roepen mailprocessor en
// Het gevonden record levert de aan te roepen mailprocessor en
// (bij de default fac.processemail) de aan te maken standaardmelding
while (!oRs.eof && !(hasRequiredAttachment && hasMatchingFrom && hasMatchingSubject))
@@ -315,7 +315,7 @@ function getEmailSetting(xmlReq, xmlParameters)
var expireResult = checkExpire(emlSetting.expire);
var senderResult = checkSender(emlSetting, xmlParameters);
var subjectResult = checkSubject(emlSetting, xmlParameters);
hasMatchingFrom = senderResult.success;
hasMatchingSubject = subjectResult.success;
__Log('hasMatchingFrom '+ hasMatchingFrom);
@@ -373,11 +373,11 @@ function emailAction(emlSetting, xmlParam, resultParam)
}
var actionsql =
"BEGIN " + emlSetting.action + " (" + safe.quoted_sql(emlSetting.theFrom) + ","
+ safe.quoted_sql(xmlParam.toAddr) + ","
+ safe.quoted_sql(xmlParam.Subject || L("lcl_fac_hmail_no_subject")) + "," // de actions kunnen slecht tegen lege subject
"BEGIN " + emlSetting.action + " (" + safe.quoted_sql(emlSetting.theFrom) + ", "
+ safe.quoted_sql(xmlParam.toAddr) + ", "
+ safe.quoted_sql(xmlParam.Subject || L("lcl_fac_hmail_no_subject")) + ", " // de actions kunnen slecht tegen lege subject
+ "?, "
+ safe.quoted_sql(xmlParam.sessionId) + ","
+ safe.quoted_sql(xmlParam.sessionId) + ", "
+ emlSetting.key + ");"
+ "END;";
@@ -476,7 +476,7 @@ function emailAction(emlSetting, xmlParam, resultParam)
return result;
}
//
//
function checkAttach(xmlReq, xmlParameter, emlSetting)
{
var requiredFound = false;

14
APPL/Shared/kenmerk_common.inc
View File

@@ -1455,7 +1455,7 @@ function kenmerktype_suggest (pfield, pprops, pparams)
var lkenmerkwaarde = "";
if (pfield.kwaarde)
{
var rsql = "SELECT flx.getdomeinwaarde("+pfield.kdomein_key+","+safe.quoted_sql(pfield.kwaarde)+") refwaarde FROM DUAL";
var rsql = "SELECT flx.getdomeinwaarde("+pfield.kdomein_key+", "+safe.quoted_sql(pfield.kwaarde)+") refwaarde FROM DUAL";
var rORs = Oracle.Execute(rsql);
if (!rORs.eof)
{
@@ -4065,15 +4065,15 @@ function _saveFlexKenmerken(parentKey, params, flexdata) // TODO: support multiM
{
sql = "INSERT INTO " + params.kenmerkTable
+ "(" + params.kenmerkParentKey
+ "," + params.kenmerkKey
+ "," + params.kenmerkWaarde
+ (params.moduleName? "," + params.moduleName : "")
+ ", " + params.kenmerkKey
+ ", " + params.kenmerkWaarde
+ (params.moduleName? ", " + params.moduleName : "")
+ ")"
+ " VALUES "
+ "(" + parentKey
+ "," + kenmerk_key
+ "," + safe.quoted_sql(flex.value)
+ (params.moduleName? "," + safe.quoted_sql(params.moduleVal): "")
+ ", " + kenmerk_key
+ ", " + safe.quoted_sql(flex.value)
+ (params.moduleName? ", " + safe.quoted_sql(params.moduleVal): "")
+ ")";
Oracle.Execute(sql);
}