From b6f68be4b3eaad787b885b1df2d853b1ba76d205 Mon Sep 17 00:00:00 2001 From: Monique Date: Wed, 2 Nov 2022 15:19:47 +0100 Subject: [PATCH 1/2] headerinfo --- application/controllers/monpas/Compactsop.php | 2 +- application/controllers/monpas/Pdfmaker.php | 11 ++++++----- application/core/MY_Controller.php | 2 +- application/views/monpas/modals/school_modal.php | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index 406537e..fd2b614 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/application/controllers/monpas/Compactsop.php @@ -152,8 +152,8 @@ class Compactsop extends MY_Controller{ $schoolID = $orgid; $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.$schooljaarnr.'.html', $html); echo json_encode($padnaam); } diff --git a/application/controllers/monpas/Pdfmaker.php b/application/controllers/monpas/Pdfmaker.php index d727d70..97615d6 100644 --- a/application/controllers/monpas/Pdfmaker.php +++ b/application/controllers/monpas/Pdfmaker.php @@ -84,14 +84,15 @@ class Pdfmaker extends MY_Controller{ file_put_contents($downloadnaam, $pdf); chmod($downloadnaam, 0777); - header( 'Content-Description: File Transfer' ); + + + // header( 'Content-Description: File Transfer' ); header( 'Content-Type: application/pdf' ); header( 'Content-disposition:inline; filename="' .$bestandsnaam.'"'); - header( 'Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0' ); - header( 'Pragma: public' ); - header( 'Content-Length: ' . filesize( $downloadnaam ) ); + // header( 'Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0' ); + // header( 'Pragma: public' ); + // header( 'Content-Length: ' . filesize( $downloadnaam ) ); readfile($downloadnaam); -// } } \ No newline at end of file diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 75ed124..8944f06 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -79,7 +79,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.18.05';// fout schoolgegevens compactsop // public $version = '1.18.08';// kleurenfout // public $version = '1.18.09';// zoek gebruikers sneller - public $version = '1.18.10';// compactsops maken van valtonderorgs + public $version = '1.18.11';// compactsops maken van valtonderorgs diff --git a/application/views/monpas/modals/school_modal.php b/application/views/monpas/modals/school_modal.php index 9cff4e7..729fe62 100644 --- a/application/views/monpas/modals/school_modal.php +++ b/application/views/monpas/modals/school_modal.php @@ -11,7 +11,7 @@