From 2cb3e260f7fdc6be019de07663ded89b6e3f3d04 Mon Sep 17 00:00:00 2001 From: hystepik Date: Fri, 24 Feb 2023 12:20:39 +0100 Subject: [PATCH] add module verification --- htdocs/core/ajax/flowjs-server.php | 9 ++++++++- htdocs/public/test/test_forms.php | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/htdocs/core/ajax/flowjs-server.php b/htdocs/core/ajax/flowjs-server.php index 962db0b8548..d520c57c9c5 100644 --- a/htdocs/core/ajax/flowjs-server.php +++ b/htdocs/core/ajax/flowjs-server.php @@ -62,7 +62,7 @@ $flowTotalSize = GETPOST('flowTotalSize', 'alpha'); top_httphead(); dol_syslog(join(',', $_GET)); -$result = true; +$result = false; if (!empty($upload_dir)) { $temp_dir = $upload_dir.'/'.$flowIdentifier; @@ -71,6 +71,12 @@ if (!empty($upload_dir)) { $upload_dir = DOL_DATA_ROOT.'/'.$module.'/temp/'; } +if ($module != "test" && !isModEnabled($module)) { + echo json_encode("The module ".$module." is not enabled"); + header("HTTP/1.0 400"); + die(); +} + if ($_SERVER['REQUEST_METHOD'] === 'GET') { $chunk_file = $temp_dir.'/'.$flowFilename.'.part'.$flowChunkNumber; if (file_exists($chunk_file)) { @@ -83,6 +89,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { if (file_exists($upload_dir.'/'.$flowFilename)) { echo json_encode('File '.$flowIdentifier.' was already uploaded'); header("HTTP/1.0 200 Ok"); + die(); } elseif (!empty($_FILES)) foreach ($_FILES as $file) { // check the error status if ($file['error'] != 0) { diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php index 50693000442..b7ed524e297 100644 --- a/htdocs/public/test/test_forms.php +++ b/htdocs/public/test/test_forms.php @@ -161,6 +161,11 @@ if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) { $("#filespan").text("No file selected."); $(this).hide(); }) + flow.on("fileError", function(file, message){ + console.log("Error on file upload",file, message); + $("#"+file.uniqueIdentifier+"pgbar").width(20+"%"); + $("#"+file.uniqueIdentifier+"pgbar").children("span").text("ERROR UPLOAD"); + }); } }) ';