From 532aa3e3101cc5ee6d3e01b19e8ff52132005550 Mon Sep 17 00:00:00 2001
From: abarrau <hesky378@gmail.com>
Date: Thu, 1 Feb 2024 11:58:34 +0100
Subject: [PATCH] userdata for qsl

---
 application/controllers/Qsl.php               | 24 +++++++------------
 application/models/Qsl_model.php              | 22 +++++++++++++++++
 application/views/interface_assets/footer.php | 20 ++++++++++++----
 .../views/logbookadvanced/qslcarousel.php     |  3 ++-
 application/views/qslcard/qslcarousel.php     |  3 ++-
 5 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/application/controllers/Qsl.php b/application/controllers/Qsl.php
index 15c35fb34..d37fac724 100644
--- a/application/controllers/Qsl.php
+++ b/application/controllers/Qsl.php
@@ -16,13 +16,12 @@ class Qsl extends CI_Controller {
     // Default view when loading controller.
     public function index() {
 
-        $folder_name = "assets/qslcard";
+        $this->load->model('qsl_model');
+        $folder_name = $this->qsl_model->get_imagePath('p');
         $data['storage_used'] = sizeFormat(folderSize($folder_name));
 
         // Render Page
         $data['page_title'] = "QSL Cards";
-
-        $this->load->model('qsl_model');
         $data['qslarray'] = $this->qsl_model->getQsoWithQslList();
 
         $this->load->view('interface_assets/header', $data);
@@ -46,10 +45,10 @@ class Qsl extends CI_Controller {
         $id = $this->input->post('id');
         $this->load->model('Qsl_model');
 
-        $path = './assets/qslcard/';
+        $path = $this->Qsl_model->get_imagePath('p');
         $file = $this->Qsl_model->getFilename($id)->row();
         $filename = $file->filename;
-        unlink($path.$filename);
+        unlink($path.'/'.$filename);
 
         $this->Qsl_model->deleteQsl($id);
     }
@@ -58,9 +57,6 @@ class Qsl extends CI_Controller {
         $this->load->model('user_model');
         if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
 
-        if (!file_exists('./assets/qslcard')) {
-            mkdir('./assets/qslcard', 0755, true);
-        }
         $qsoid = $this->input->post('qsoid');
 
         if (isset($_FILES['qslcardfront']) && $_FILES['qslcardfront']['name'] != "" && $_FILES['qslcardfront']['error'] == 0)
@@ -82,7 +78,8 @@ class Qsl extends CI_Controller {
     }
 
     function uploadQslCardFront($qsoid) {
-        $config['upload_path']          = './assets/qslcard';
+        $this->load->model('Qsl_model');
+        $config['upload_path']          = $this->Qsl_model->get_imagePath('p');
         $config['allowed_types']        = 'jpg|gif|png|jpeg|JPG|PNG';
         $array = explode(".", $_FILES['qslcardfront']['name']);
         $ext = end($array);
@@ -97,9 +94,6 @@ class Qsl extends CI_Controller {
             return $error;
         }
         else {
-            // Load database queries
-            $this->load->model('Qsl_model');
-
             //Upload of QSL card was successful
             $data = $this->upload->data();
 
@@ -115,7 +109,8 @@ class Qsl extends CI_Controller {
     }
 
     function uploadQslCardBack($qsoid) {
-        $config['upload_path']          = './assets/qslcard';
+        $this->load->model('Qsl_model');
+        $config['upload_path']          = $this->Qsl_model->get_imagePath('p');
         $config['allowed_types']        = 'jpg|gif|png|jpeg|JPG|PNG';
         $array = explode(".", $_FILES['qslcardback']['name']);
         $ext = end($array);
@@ -130,9 +125,6 @@ class Qsl extends CI_Controller {
             return $error;
         }
         else {
-            // Load database queries
-            $this->load->model('Qsl_model');
-
             //Upload of QSL card was successful
             $data = $this->upload->data();
 
diff --git a/application/models/Qsl_model.php b/application/models/Qsl_model.php
index 1fdc317b0..33f548bef 100644
--- a/application/models/Qsl_model.php
+++ b/application/models/Qsl_model.php
@@ -127,4 +127,26 @@ class Qsl_model extends CI_Model {
 
 		return $this->db->insert_id();
 	}
+
+	// return path of esql file : u=url / p=real path //
+	function get_imagePath($pathorurl='u') {
+		$qsl_dir = "qsl_card";
+		// test if new folder directory exist // 
+		$userdata_dir = $this->config->item('userdata');
+		if (isset($userdata_dir)) {
+			if (!file_exists(realpath(APPPATH.'../').'/'.$userdata_dir)) {
+				mkdir(realpath(APPPATH.'../').'/'.$userdata_dir, 0755, true);
+			}
+			if (!file_exists(realpath(APPPATH.'../').'/'.$userdata_dir.'/'.$qsl_dir)) {
+				mkdir(realpath(APPPATH.'../').'/'.$userdata_dir.'/'.$qsl_dir, 0755, true);
+			}
+			if ($pathorurl=='u') {
+				return $userdata_dir.'/'.$qsl_dir;
+			} else {
+				return realpath(APPPATH.'../').'/'.$userdata_dir.'/'.$qsl_dir;
+			}
+		} else {
+			return 'assets/qslcard';
+		}
+	}
 }
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index fb6f22508..b4bea7b3b 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2383,9 +2383,14 @@ $(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 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+'/assets/qslcard/'+picture+'" /><center>');
+                $textAndPic.append('<center><img class="img-fluid w-qsl" style="height:auto;width:auto;"src="'+baseURL+'/'+qslpath+'/'+picture+'" /><center>');
             var title = '';
             if (callsign == null) {
                 title = 'QSL Card';
@@ -2600,6 +2605,11 @@ function viewEqsl(picture, callsign) {
     });
     }
     function uploadQsl() {
+        <?php 
+        $CI =& get_instance();
+        $CI->load->model('Qsl_model');
+        echo 'var qslpath = "'.$CI->Qsl_model->get_imagePath().'"; '; 
+        ?>
         var baseURL= "<?php echo base_url();?>";
         var formdata = new FormData(document.getElementById("fileinfo"));
 
@@ -2619,7 +2629,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+'/assets/qslcard/'+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+'/'+qslpath+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardfront").val(null);
                     }
                     else {
@@ -2639,7 +2649,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+'/assets/qslcard/'+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+'/'+qslpath+'/'+data.status.front.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $(".carouselExampleIndicators").carousel();
                         $("#qslcardfront").val(null);
                     }
@@ -2658,7 +2668,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+'/assets/qslcard/'+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+'/'+qslpath+'/'+data.status.back.filename+'" alt="QSL picture #'+(quantity+1)+'"></div></center>');
                         $("#qslcardback").val(null);
                     }
                     else {
@@ -2678,7 +2688,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+'/assets/qslcard/'+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+'/'+qslpath+'/'+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 00270a315..f0f703b8c 100644
--- a/application/views/logbookadvanced/qslcarousel.php
+++ b/application/views/logbookadvanced/qslcarousel.php
@@ -17,6 +17,7 @@
 <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;
@@ -56,7 +57,7 @@
 		?>
 		</tbody>
 </table>
-        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/assets/qslcard/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        <?php echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'.$this->Qsl_model->get_imagePath().'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
         echo '</div>';
     }
     ?>
diff --git a/application/views/qslcard/qslcarousel.php b/application/views/qslcard/qslcarousel.php
index 887b2a362..de8eb8a61 100644
--- a/application/views/qslcard/qslcarousel.php
+++ b/application/views/qslcard/qslcarousel.php
@@ -17,6 +17,7 @@
 <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;
@@ -24,7 +25,7 @@
             echo ' active';
         }
         echo '">';
-        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/assets/qslcard/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
+        echo '<img class="img-fluid w-qsl" src="' . base_url() . '/'.$this->Qsl_model->get_imagePath().'/' . $image->filename .'" alt="QSL picture #'. $i++.'">';
         echo '</div>';
     }
     ?>