From 8ae7d12a63d5ae787c8353d5b4fcf36e4bcce68d Mon Sep 17 00:00:00 2001 From: Vincent LAURENT Date: Sat, 2 Apr 2022 00:58:35 +0200 Subject: [PATCH] If there was no signature at the time of sharing, no signature layer is recorded --- app.php | 8 +++----- public/js/signature.js | 12 +++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app.php b/app.php index cbdf841..0c5d86a 100644 --- a/app.php +++ b/app.php @@ -208,14 +208,12 @@ $f3->route('POST /share', $f3->error(403); } - if(!$svgFiles) { - $f3->error(403); + if($svgFiles) { + shell_exec(sprintf("rsvg-convert -f pdf -o %s %s", $tmpfile.'.svg.pdf', $svgFiles)); } - shell_exec(sprintf("rsvg-convert -f pdf -o %s %s", $tmpfile.'.svg.pdf', $svgFiles)); - if(!$f3->get('DEBUG')) { - array_map('unlink', explode(' ', trim($svgFiles))); + array_map('unlink', glob($tmpfile."*.svg")); } $f3->reroute('/signature/'.$hash."#informations"); diff --git a/public/js/signature.js b/public/js/signature.js index 6419771..936e24d 100644 --- a/public/js/signature.js +++ b/public/js/signature.js @@ -763,11 +763,13 @@ var createEventsListener = function() { if(document.getElementById('save_share')) { document.getElementById('save_share').addEventListener('click', function(event) { var dataTransfer = new DataTransfer(); - canvasEditions.forEach(function(canvasEdition, index) { - dataTransfer.items.add(new File([canvasEdition.toSVG()], index+'.svg', { - type: 'image/svg+xml' - })); - }) + if(!document.getElementById('save').hasAttribute('disabled')) { + canvasEditions.forEach(function(canvasEdition, index) { + dataTransfer.items.add(new File([canvasEdition.toSVG()], index+'.svg', { + type: 'image/svg+xml' + })); + }) + } document.getElementById('input_svg_share').files = dataTransfer.files; }); }