From cb95b3a5e1c677f5537f56451beb1933014fb703 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:54:39 +0200
Subject: [PATCH] [QSL Image Upload] Fixed some errors in the upload

---
 application/controllers/Qsl.php               | 4 ++++
 application/views/interface_assets/footer.php | 4 ++--
 application/views/view_log/qso.php            | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Qsl.php b/application/controllers/Qsl.php
index 2602fa78..fb039215 100644
--- a/application/controllers/Qsl.php
+++ b/application/controllers/Qsl.php
@@ -66,11 +66,15 @@ class Qsl extends CI_Controller {
         if (isset($_FILES['qslcardfront']) && $_FILES['qslcardfront']['name'] != "" && $_FILES['qslcardfront']['error'] == 0)
         {
             $result['front'] = $this->uploadQslCardFront($qsoid);
+        } else {
+            $result['front']['status'] = '';
         }
 
         if (isset($_FILES['qslcardback']) && $_FILES['qslcardback']['name'] != "" && $_FILES['qslcardback']['error'] == 0)
         {
             $result['back'] = $this->uploadQslCardBack($qsoid);
+        } else {
+            $result['back']['status'] = '';
         }
 
         header("Content-type: application/json");
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index cb3e3c63..df7aef74 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2398,7 +2398,7 @@ function viewEqsl(picture, callsign) {
                         $("#qslcardfront").val(null);
                     }
 
-                } else {
+                } else if (data.status.front.status != '') {
                     $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Front QSL Card:' +
                     data.status.front.error +
                         '</div>');
@@ -2436,7 +2436,7 @@ function viewEqsl(picture, callsign) {
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardback").val(null);
                     }
-                } else {
+                } else if (data.status.back.status != '') {
                     $("#qslupload").append('<div class="alert alert-danger"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>\nBack QSL Card: ' +
                     data.status.back.error +
                         '</div>');
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index 3807efe8..6595ded1 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -507,9 +507,9 @@
 
             <p><div class="alert alert-warning" role="alert"><span class="badge badge-warning">Warning</span> Maximum file upload size is <?php echo $max_upload; ?>B.</div></p>
 
+            <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
             <div class="row">
                 <div class="col-md">
-                    <form class="form" id="fileinfo" name="fileinfo" enctype="multipart/form-data">
                         <fieldset>
 
                             <div class="form-group">
@@ -528,9 +528,9 @@
                             </div>
 
                         </fieldset>
-                    </form>
+                    </div>
                 </div>
-            </div>
+            </form>
             <p>
             <div class="row">
                 <div class="col-md">