diff options
author | Björn Geiger | 2011-03-21 12:04:14 +0100 |
---|---|---|
committer | Björn Geiger | 2011-03-21 12:04:14 +0100 |
commit | 00c8fa5eb4214145370d23638480a1dcc655f373 (patch) | |
tree | eb539700997d2154363bd8e40d34f6f56ee6c68e | |
parent | Fehler in SQL Dateien korrigiert (diff) | |
parent | Preboot download working (diff) | |
download | pbs2-00c8fa5eb4214145370d23638480a1dcc655f373.tar.gz pbs2-00c8fa5eb4214145370d23638480a1dcc655f373.tar.xz pbs2-00c8fa5eb4214145370d23638480a1dcc655f373.zip |
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
-rw-r--r-- | application/modules/dev/controllers/BootisoController.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/application/modules/dev/controllers/BootisoController.php b/application/modules/dev/controllers/BootisoController.php index 7390c95..b0f4c2f 100644 --- a/application/modules/dev/controllers/BootisoController.php +++ b/application/modules/dev/controllers/BootisoController.php @@ -33,22 +33,21 @@ class dev_BootisoController extends Zend_Controller_Action $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - $prebootID = $this->_request->getParams('prebootID'); + $prebootID = $this->_request->getParam('prebootID'); - // if(is_dir("../resources/bootmedium/$prebootID/") && is_numeric($prebootID)){ + if(is_dir("../resources/bootmedium/$prebootID/") && is_numeric($prebootID)){ header('Content-Type: application/x-gzip'); $content_disp = ( ereg('MSIE ([0-9].[0-9]{1,2})', $_SERVER['HTTP_USER_AGENT']) == 'IE') ? 'inline' : 'attachment'; - header('Content-Disposition: ' . $content_disp . '; filename="preboot.tar.gz"'); + header('Content-Disposition: ' . $content_disp . '; filename="preboot.zip"'); header('Pragma: no-cache'); header('Expires: 0'); - + // create the gzipped tarfile. - chdir(APPLICATION_PATH . "/resources/bootmedium/$prebootID/"); - passthru( "tar cz ./"); + chdir("../resources/bootmedium/$prebootID/"); + passthru("zip -r - ./"); - $this->_redirect('/dev/bootiso'); - //} + } |