From 424dbdb5778d9d721838da920bb24c5edc55c2b0 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 14 Aug 2025 13:03:06 +0000 Subject: [PATCH] YAXX#88573 Export via interface bij lege data geen bestand aanmaken svn path=/Website/trunk/; revision=70007 --- APPL/EXP/exp_export.asp | 50 +++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 29 deletions(-) diff --git a/APPL/EXP/exp_export.asp b/APPL/EXP/exp_export.asp index 3f398f79f1..02d2be9437 100644 --- a/APPL/EXP/exp_export.asp +++ b/APPL/EXP/exp_export.asp @@ -52,45 +52,37 @@ DOCTYPE_Disable = 1; Response.Write(msg); Response.End; } - if (!streamObj.streamData) + if (!streamObj.streamData || streamObj.streamData.Size == 0) shared.simpel_page(L("lcl_export_nodata")); Response.clear; streamObj.streamData.Type = 1; // verder als adTypeBinary - if (streamObj.streamData.Size == 0) + if (params.compress) { - Response.contenttype = "text/html"; - Response.Write(L("lcl_empty")); + Response.contenttype = 'application/zip'; } else { - if (params.compress) + if (params.charset.toUpperCase() == 'UTF-8') { - Response.contenttype = 'application/zip'; - } - else - { - if (params.charset.toUpperCase() == 'UTF-8') - { - Session.Codepage = 65001; - Response.Charset = 'utf-8'; // Alleen voor de header var, we doen zo een binary write - } - Response.contenttype = "application/octet-stream"; - } - Response.AddHeader("content-disposition", "attachment; filename= \"" + streamObj.exportFile + "\""); - try - { - Response.BinaryWrite(streamObj.streamData.Read()); - } - catch (e) - { // Meestal te groot - var msg = L("lcl_export_oversized").format(params.code, export_key, streamObj.streamData.Size); // S("maxdownloadsize") - __DoLog(e.description + "
" + msg); - Response.clear; - Response.contenttype = "text/html"; - // De content-disposition krijgen we niet echt weg - Response.Write(msg); + Session.Codepage = 65001; + Response.Charset = 'utf-8'; // Alleen voor de header var, we doen zo een binary write } + Response.contenttype = "application/octet-stream"; + } + Response.AddHeader("content-disposition", "attachment; filename= \"" + streamObj.exportFile + "\""); + try + { + Response.BinaryWrite(streamObj.streamData.Read()); + } + catch (e) + { // Meestal te groot + var msg = L("lcl_export_oversized").format(params.code, export_key, streamObj.streamData.Size); // S("maxdownloadsize") + __DoLog(e.description + "
" + msg); + Response.clear; + Response.contenttype = "text/html"; + // De content-disposition krijgen we niet echt weg + Response.Write(msg); } // Komen uit wsf_shared.js