diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index ec37d1b..cb6503c 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/application/controllers/monpas/Compactsop.php @@ -138,10 +138,11 @@ class Compactsop extends MY_Controller{ $compacteonderdelen = $compact->getCompacteOnderdelen(); $schoolID = $this->globorgid; $html = (new Compactepaginas($compacteonderdelen, $paginas))->getHtml(); + $padnaam = $schoolID . $schooljaarnr; + file_put_contents(MYROOTPATH.'public/tmp/temp'.$schoolID.$schooljaarnr.'.html', $html); - file_put_contents(MYROOTPATH.'public/tmp/temp'.$schoolID.'.html', $html); - echo json_encode($this->globorgid); + echo json_encode($padnaam); } public function uploadLogo($schoolID) @@ -158,14 +159,18 @@ class Compactsop extends MY_Controller{ //TODO: unlink eventueel oud logo $logo = $this->Schooldetails_model->getLogo($schoolID); $padNaam = $savePath.$logo; + // unlink($padNaam); $this->Schooldetails_model->update_record_where(['logo'=>$filename], ['organisatie_id' =>$schoolID]); } function getLogo(){ $schoolID = $this->clean_input('schoolID'); + $savePath = MYROOTPATH.'public/images/logos/'; $logo =$this->Schooldetails_model->getLogo($schoolID); - $this->json($logo); + $padNaam = $savePath.$logo; + chmod($padNaam, '0777'); + $this->json($padNaam); } } diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php index 6fb6082..e89f519 100644 --- a/application/libraries/monpas/compactsop/Compacteonderdelen.php +++ b/application/libraries/monpas/compactsop/Compacteonderdelen.php @@ -99,7 +99,7 @@ class Compacteonderdelen $logo = false; if($this->details && $this->details->logo) { // $logo = $this->CI->config->item('vendor_url') . '/images/logos/' . $this->details->logo; - $logo = $_ENV['BASE_URL']. '/images/logos/' . $this->details->logo; + $logo = $_ENV['VENDOR_URL']. '/images/logos/' . $this->details->logo; } diff --git a/application/models/monpas/Schooldetails_model.php b/application/models/monpas/Schooldetails_model.php index 40ca61c..dd8e893 100644 --- a/application/models/monpas/Schooldetails_model.php +++ b/application/models/monpas/Schooldetails_model.php @@ -37,7 +37,7 @@ class Schooldetails_model extends MY_Model{ } function getLogo($orgid){ - $this->sql = "SELECT concat('../images/logos/', logo) as logo + $this->sql = "SELECT logo FROM tb_schooldetails WHERE organisatie_id={$orgid}"; return $this->get_query_row('logo'); diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php index f6ce465..879f598 100644 --- a/application/views/monpas/compactsop/paginacompact.php +++ b/application/views/monpas/compactsop/paginacompact.php @@ -716,14 +716,10 @@
-
-
+
+
##PLACEHOLDER##
| @@ -63,7 +62,7 @@ | Logo |
-
+
|