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

FCLT#57081 'delete' -> 'candelete' en 'pDelete' -> 'pCanDelete'. Ook overbodige voorwaarde weggehaald in UploadForm_save.asp

Browse Source 
svn path=/Website/branches/v2019.1/; revision=41842
This commit is contained in:
Koen Reefman
2019-03-28 12:29:42 +00:00
parent 517ac1c7c6
commit 5ec4b2a10b
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/mld_show_note2.asp
View File

@@ -161,7 +161,7 @@ if (mld_key > 0)
<%
for (var i = 0; i < kenmerk_key_arr.length; i++)
{ %>
url[<%=i%>] = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&delete=" + canDeleteNoteAttachment + "&key=" + mld_key + "&kenmerk_key=" + kenmerk_key_arr[i])%>";
url[<%=i%>] = "<%=protectQS.create("../Shared/BijlagenForm.asp?module=MLD&niveau=M&multi=1&candelete=" + canDeleteNoteAttachment + "&key=" + mld_key + "&kenmerk_key=" + kenmerk_key_arr[i])%>";
<% }
if (kenmerk_key_arr.length)
{ %>

12
APPL/Shared/BijlagenForm.asp
View File

@@ -49,14 +49,14 @@ protectQS.verify({ allowparams: ["no_autoscroll"]}); // tamper check
var pKenmerk_key = getQParamInt("kenmerk_key", -1);
var pMulti = getQParamInt("multi", 0) == 1;
var pReado = getQParamInt("reado", 0) == 1;
var pDelete = getQParamInt("delete", 1) == 1;
var pCanDelete = getQParamInt("candelete", 1) == 1;
var showFilter = getFParam("showFilter", ""); // zoek mogelijkheid binnen lijst bestanden
var pAlgLevel = getQParam("kenmerk_module", "");
var transitParam = buildTransitParam(["key", "module", "niveau", "kenmerk_key", "encrypt", "extFilter", "pregexp",
"showFilter", "reado", "multi", "tmpfolder", "kenmerk_module",
"zipfile", "autozipfile", "delete"]);
"zipfile", "autozipfile", "candelete"]);
params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau, {alglevel: pAlgLevel});
@@ -241,7 +241,7 @@ if (fso.FolderExists(params.AttachPath))
document.forms.finder.target="_self";
document.forms.finder.submit();
}
<% if (pDelete)
<% if (pCanDelete)
{ %>
function DeleteFile(fname, safeDeleteurl)
{
@@ -318,7 +318,7 @@ if (fso.FolderExists(params.AttachPath))
}
}
}
<% if (!pDelete)
<% if (!pCanDelete)
{ %>
if (equals.length)
FcltMgr.alert("<%=L("lcl_shared_file_no_overwrite")%>");
@@ -434,7 +434,7 @@ if (fso.FolderExists(params.AttachPath))
<th><%=L("lcl_filename")%></th>
<th style="text-align:right"><%=L("lcl_filedate")%></th>
<th style="text-align:right"><%=L("lcl_filesize")%></th>
<% if (!pReado && pDelete)
<% if (!pReado && pCanDelete)
{ %>
<th><%=L("lcl_filedelete")%></th>
<% } %>
@@ -465,7 +465,7 @@ if (fso.FolderExists(params.AttachPath))
</td>
<td align="right"><%=toDateTimeString(fileArray[i].vDateStr)%></td>
<td align="right"><%=fileArray[i].vFileSize%></td>
<% if (!pReado && (!params.keephistory || fileArray[i].ishistory) && pDelete)
<% if (!pReado && (!params.keephistory || fileArray[i].ishistory) && pCanDelete)
{ %>
<td align=center><span onClick="DeleteFile('<%=safe.jsstring(safe.html(fileArray[i].vFileName))%>', '<%=safe.jsstring(protectQS.create("Bijlagenform_delete.asp?DoDelete="+Server.URLEncode(fileArray[i].vFileName)+transitParam))%>')"
class="fa fa-lg fa-trash" title="<%=L("lcl_filedelete")%>"></span>

6
APPL/Shared/UploadForm_save.asp
View File

@@ -40,7 +40,7 @@ FCLTHeader.Requires({ plugins:["jQuery"]
var pKenmerk_key = getQParamInt("kenmerk_key", -1);
var pAlgLevel = getQParam("kenmerk_module", "");
var pDelete = getQParamInt("delete", 1) == 1;
var pCanDelete = getQParamInt("candelete", 1) == 1;
var params = flexProps(pModule, pKey, String(pKenmerk_key), pNiveau, {alglevel: pAlgLevel});
var doEncrypt = (params.encrypt? 1 : 0);
@@ -167,7 +167,7 @@ var oorzaak_bekend = false;
BinaryStream.Write(finfo.data);
// Save binary data To disk
__Log("Saving to: " + params.AttachPath + safefilename);
if (params.keephistory && fso.FileExists(params.AttachPath + safefilename) && pDelete)
if (params.keephistory && fso.FileExists(params.AttachPath + safefilename))
{
var jsDate = new Date();
var backupTime = String(jsDate.getFullYear()) + padout(jsDate.getMonth() + 1) + padout(jsDate.getDate()) + "_"
@@ -178,7 +178,7 @@ var oorzaak_bekend = false;
fso.MoveFile(params.AttachPath + safefilename, params.AttachPath + backupName);
__DoLog("Replaced {0}, previous version in {1}".format(params.AttachPath + safefilename, backupName));
}
BinaryStream.SaveToFile(params.AttachPath + safefilename, (pDelete ? 2 : 1)); // adSaveCreateOverWrite
BinaryStream.SaveToFile(params.AttachPath + safefilename, (pCanDelete ? 2 : 1)); // adSaveCreateOverWrite
}
result.safefilename.push(safefilename);
}