From ae8c2efa4fedd15ed5d082fa9d63a03d8e862e05 Mon Sep 17 00:00:00 2001
From: abarrau <hesky378@gmail.com>
Date: Thu, 1 Feb 2024 16:59:28 +0100
Subject: [PATCH] remove model class on view, use generic function

---
 application/views/interface_assets/footer.php | 31 ++++++-------------
 .../views/logbookadvanced/qslcarousel.php     |  3 +-
 application/views/qslcard/qslcarousel.php     |  3 +-
 application/views/view_log/qso.php            |  5 +--
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index b4bea7b3b..7a0bb2a8f 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2383,14 +2383,11 @@ $(document).ready(function(){
 
 <script>
 function viewQsl(picture, callsign) {
-            <?php 
-            $CI =& get_instance();
-            $CI->load->model('Qsl_model');
-            echo 'var qslpath = "'.$CI->Qsl_model->get_imagePath().'"; '; 
-            ?>
+
+            var webpath_qsl = "<?php echo wl_getPathQsl(); ?>"; 
             var baseURL= "<?php echo base_url();?>";
             var $textAndPic = $('<div></div>');
-                $textAndPic.append('<center><img class="img-fluid w-qsl" style="height:auto;width:auto;"src="'+baseURL+'/'+qslpath+'/'+picture+'" /><center>');
+                $textAndPic.append('<center><img class="img-fluid w-qsl" style="height:auto;width:auto;"src="'+baseURL+'/'+webpath_qsl+'/'+picture+'" /><center>');
             var title = '';
             if (callsign == null) {
                 title = 'QSL Card';
@@ -2450,14 +2447,10 @@ function deleteQsl(id) {
 </script>
 <script>
 function viewEqsl(picture, callsign) {
-            <?php
-            $CI =& get_instance();
-            $CI->load->model('Eqsl_images');
-            echo 'var eqslpath = "'.$CI->Eqsl_images->get_imagePath().'"; '; 
-            ?>
+            var webpath_eqsl = "<?php echo wl_getPathEqsl(); ?>"; 
             var baseURL= "<?php echo base_url();?>";
             var $textAndPic = $('<div></div>');
-                $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+eqslpath+'/'+picture+'" />');
+                $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+webpath_eqsl+'/'+picture+'" />');
             var title = '';
             if (callsign == null) {
                 title = 'eQSL Card';
@@ -2605,11 +2598,7 @@ function viewEqsl(picture, callsign) {
     });
     }
     function uploadQsl() {
-        <?php 
-        $CI =& get_instance();
-        $CI->load->model('Qsl_model');
-        echo 'var qslpath = "'.$CI->Qsl_model->get_imagePath().'"; '; 
-        ?>
+        var webpath_qsl = "<?php echo wl_getPathQsl(); ?>"; 
         var baseURL= "<?php echo base_url();?>";
         var formdata = new FormData(document.getElementById("fileinfo"));
 
@@ -2629,7 +2618,7 @@ function viewEqsl(picture, callsign) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+qslpath+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
+                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+webpath_qsl+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardfront").val(null);
                     }
                     else {
@@ -2649,7 +2638,7 @@ function viewEqsl(picture, callsign) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+qslpath+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
+                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.front.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+webpath_qsl+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardfront").val(null);
                     }
@@ -2668,7 +2657,7 @@ function viewEqsl(picture, callsign) {
                             '</tr>');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+qslpath+'/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
+                        $(".carousel-inner").append('<center><div class="carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+webpath_qsl+'/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardback").val(null);
                     }
                     else {
@@ -2688,7 +2677,7 @@ function viewEqsl(picture, callsign) {
                         $('.qslcardtab').removeAttr('hidden');
                         var quantity = $(".carousel-indicators li").length;
                         $(".carousel-indicators").append('<li class="active" data-bs-target="#carouselExampleIndicators" data-bs-slide-to="'+quantity+'"></li>');
-                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+qslpath+'/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
+                        $(".carousel-inner").append('<center><div class="active carousel-item carouselimageid_'+data.status.back.insertid+'"><img class="img-fluid w-qsl" src="'+baseURL+'/'+webpath_qsl+'/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardback").val(null);
                     }
diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php
index f0f703b8c..bde0fbf21 100644
--- a/application/views/logbookadvanced/qslcarousel.php
+++ b/application/views/logbookadvanced/qslcarousel.php
@@ -17,7 +17,6 @@
 <div class="carousel-inner">
 
     <?php
-	$this->load->model('Qsl_model');
     $i = 1;
     foreach ($qslimages as $image) {
         echo '<div class="text-center carousel-item carouselimageid_' . $image->id;
@@ -57,7 +56,7 @@
 		?>
 		</tbody>
 </table>
-        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'.$this->Qsl_model->get_imagePath().'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. wl_getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
         echo '</div>';
     }
     ?>
diff --git a/application/views/qslcard/qslcarousel.php b/application/views/qslcard/qslcarousel.php
index de8eb8a61..532b93b9b 100644
--- a/application/views/qslcard/qslcarousel.php
+++ b/application/views/qslcard/qslcarousel.php
@@ -17,7 +17,6 @@
 <div class="carousel-inner">
 
     <?php
-    $this->load->model('Qsl_model');
     $i = 1;
     foreach ($qslimages as $image) {
         echo '<div class="text-center carousel-item carouselimageid_' . $image->id;
@@ -25,7 +24,7 @@
             echo ' active';
         }
         echo '">';
-        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'.$this->Qsl_model->get_imagePath().'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. wl_getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
         echo '</div>';
     }
     ?>
diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index ee1632191..a8a3bf955 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -607,11 +607,8 @@
 
         <div class="tab-pane fade" id="eqslcard" role="tabpanel" aria-labelledby="table-tab">
         <?php
-        $CI =& get_instance();
-        $CI->load->model('Eqsl_images');
-        $eqlpath = $CI->Eqsl_images->get_imagePath();
 	    if ($row->eqsl_image_file != null) {
-		    echo '<img class="d-block" src="' . base_url() . '/'. $eqlpath .'/' . $row->eqsl_image_file .'" alt="eQSL picture">';
+		    echo '<img class="d-block" src="' . base_url() . '/'. wl_getPathEqsl() .'/' . $row->eqsl_image_file .'" alt="eQSL picture">';
 	    }
         ?>
         </div>