From 39616c6a6982659946d3b41fea90a3c74efda654 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Fri, 2 Feb 2024 14:57:27 +0100
Subject: [PATCH] paths libary

---
 application/config/autoload.php               |  2 +-
 application/core/genericFunctions.php         | 17 --------------
 application/libraries/Paths.php               | 23 +++++++++++++++++++
 application/views/interface_assets/footer.php |  6 ++---
 .../views/logbookadvanced/qslcarousel.php     |  2 +-
 application/views/qslcard/qslcarousel.php     |  2 +-
 application/views/view_log/qso.php            |  2 +-
 index.php                                     |  1 -
 8 files changed, 30 insertions(+), 25 deletions(-)
 delete mode 100644 application/core/genericFunctions.php
 create mode 100644 application/libraries/Paths.php

diff --git a/application/config/autoload.php b/application/config/autoload.php
index 282830d21..7270b2332 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -52,7 +52,7 @@ $autoload['packages'] = array(APPPATH.'third_party');
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Frequency');
+$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Paths', 'Frequency');
 
 
 /*
diff --git a/application/core/genericFunctions.php b/application/core/genericFunctions.php
deleted file mode 100644
index 58520cad1..000000000
--- a/application/core/genericFunctions.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php 
-
-// generic function for return eQsl path //
-function wl_getPathEqsl() {
-    $CI =& get_instance();
-    $CI->load->model('Eqsl_images');
-    return $CI->Eqsl_images->get_imagePath();
-}
-
-// generic function for return Qsl path //
-function wl_getPathQsl() {
-    $CI =& get_instance();
-    $CI->load->model('Qsl_model');
-    return $CI->Qsl_model->get_imagePath();
-}
-
-?>
\ No newline at end of file
diff --git a/application/libraries/Paths.php b/application/libraries/Paths.php
new file mode 100644
index 000000000..871ac6ad1
--- /dev/null
+++ b/application/libraries/Paths.php
@@ -0,0 +1,23 @@
+<?php defined('BASEPATH') or exit('No direct script access allowed');
+
+/***
+ * Paths Libary to return specific paths
+ */
+class Paths
+{
+    // generic function for return eQsl path //
+    function getPathEqsl()
+    {
+        $CI = &get_instance();
+        $CI->load->model('Eqsl_images');
+        return $CI->Eqsl_images->get_imagePath();
+    }
+
+    // generic function for return Qsl path //
+    function getPathQsl()
+    {
+        $CI = &get_instance();
+        $CI->load->model('Qsl_model');
+        return $CI->Qsl_model->get_imagePath();
+    }
+}
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 7a0bb2a8f..558e11f38 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2384,7 +2384,7 @@ $(document).ready(function(){
 <script>
 function viewQsl(picture, callsign) {
 
-            var webpath_qsl = "<?php echo wl_getPathQsl(); ?>"; 
+            var webpath_qsl = "<?php echo $this->paths->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+'/'+webpath_qsl+'/'+picture+'" /><center>');
@@ -2447,7 +2447,7 @@ function deleteQsl(id) {
 </script>
 <script>
 function viewEqsl(picture, callsign) {
-            var webpath_eqsl = "<?php echo wl_getPathEqsl(); ?>"; 
+            var webpath_eqsl = '<?php echo $this->paths->getPathEqsl(); ?>'; 
             var baseURL= "<?php echo base_url();?>";
             var $textAndPic = $('<div></div>');
                 $textAndPic.append('<img class="img-fluid" style="height:auto;width:auto;"src="'+baseURL+webpath_eqsl+'/'+picture+'" />');
@@ -2598,7 +2598,7 @@ function viewEqsl(picture, callsign) {
     });
     }
     function uploadQsl() {
-        var webpath_qsl = "<?php echo wl_getPathQsl(); ?>"; 
+        var webpath_qsl = "<?php echo $this->paths->getPathQsl(); ?>"; 
         var baseURL= "<?php echo base_url();?>";
         var formdata = new FormData(document.getElementById("fileinfo"));
 
diff --git a/application/views/logbookadvanced/qslcarousel.php b/application/views/logbookadvanced/qslcarousel.php
index bde0fbf21..2af2961e5 100644
--- a/application/views/logbookadvanced/qslcarousel.php
+++ b/application/views/logbookadvanced/qslcarousel.php
@@ -56,7 +56,7 @@
 		?>
 		</tbody>
 </table>
-        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. wl_getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. $this->paths->getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
         echo '</div>';
     }
     ?>
diff --git a/application/views/qslcard/qslcarousel.php b/application/views/qslcard/qslcarousel.php
index 532b93b9b..40d4d132d 100644
--- a/application/views/qslcard/qslcarousel.php
+++ b/application/views/qslcard/qslcarousel.php
@@ -24,7 +24,7 @@
             echo ' active';
         }
         echo '">';
-        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. wl_getPathQsl() .'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'. $this->paths->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 a8a3bf955..c189433c9 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -608,7 +608,7 @@
         <div class="tab-pane fade" id="eqslcard" role="tabpanel" aria-labelledby="table-tab">
         <?php
 	    if ($row->eqsl_image_file != null) {
-		    echo '<img class="d-block" src="' . base_url() . '/'. wl_getPathEqsl() .'/' . $row->eqsl_image_file .'" alt="eQSL picture">';
+		    echo '<img class="d-block" src="' . base_url() . '/'. $this->paths->getPathEqsl() .'/' . $row->eqsl_image_file .'" alt="eQSL picture">';
 	    }
         ?>
         </div>
diff --git a/index.php b/index.php
index 7f3092bc0..fc458e605 100644
--- a/index.php
+++ b/index.php
@@ -317,5 +317,4 @@ switch (ENVIRONMENT)
  *
  * And away we go...
  */
-require_once APPPATH.'core/genericFunctions.php';
 require_once BASEPATH.'core/CodeIgniter.php';