diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index c6a34bc8b..eb3a78cfc 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -12,14 +12,15 @@ class eqsl extends CI_Controller { public function index() { $this->lang->load('qslcard'); - $folder_name = "images/eqsl_card_images"; + $this->load->model('eqsl_images'); + $folder_name = $this->eqsl_images->get_imagePath('p'); $data['storage_used'] = $this->sizeFormat($this->folderSize($folder_name)); // Render Page $data['page_title'] = "eQSL Cards"; - $this->load->model('eqsl_images'); + $data['qslarray'] = $this->eqsl_images->eqsl_qso_list(); $this->load->view('interface_assets/header', $data); @@ -547,13 +548,13 @@ class eqsl extends CI_Controller { } echo $content; $filename = uniqid().'.jpg'; - if (file_put_contents('images/eqsl_card_images/' . '/'.$filename, $content) !== false) { + if (file_put_contents($this->Eqsl_images->get_imagePath('p') .'/'. $filename, $content) !== false) { $this->Eqsl_images->save_image($id, $filename); } } } else { header('Content-Type: image/jpg'); - $image_url = base_url('images/eqsl_card_images/'.$this->Eqsl_images->get_image($id)); + $image_url = base_url($this->Eqsl_images->get_imagePath() .'/'. $this->Eqsl_images->get_image($id)); header('Location: ' . $image_url); } @@ -608,7 +609,7 @@ class eqsl extends CI_Controller { return $error; } $filename = uniqid().'.jpg'; - if (file_put_contents('images/eqsl_card_images/' . '/'.$filename, $content) !== false) { + if (file_put_contents($this->Eqsl_images->get_imagePath('p') .'/'. $filename, $content) !== false) { $this->Eqsl_images->save_image($id, $filename); } } diff --git a/application/models/Eqsl_images.php b/application/models/Eqsl_images.php index dcd160922..e3af37d31 100644 --- a/application/models/Eqsl_images.php +++ b/application/models/Eqsl_images.php @@ -35,6 +35,27 @@ class Eqsl_images extends CI_Model { return $this->db->get('eQSL_images'); } + // return path of esql file : u=url / p=real path // + function get_imagePath($pathorurl='u') { + $eqsl_dir = "eqsl_card"; + // test if new folder directory exist // + $data_userdir = $this->config->item('userdatadir'); + if (isset($data_userdir)) { + if (!file_exists(realpath(APPPATH.'../').'/'.$data_userdir)) { + mkdir(realpath(APPPATH.'../').'/'.$data_userdir, 0755, true); + } + if (!file_exists(realpath(APPPATH.'../').'/'.$data_userdir.'/'.$eqsl_dir)) { + mkdir(realpath(APPPATH.'../').'/'.$data_userdir.'/'.$eqsl_dir, 0755, true); + } + if ($pathorurl=='u') { + return $data_userdir.'/'.$eqsl_dir; + } else { + return realpath(APPPATH.'../').'/'.$data_userdir.'/'.$eqsl_dir; + } + } else { + return 'images/eqsl_card_images'; + } + } } ?> diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 14766a0c2..1308b4883 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -2471,9 +2471,14 @@ function deleteQsl(id) {