diff options
| author | michael pereira | 2011-04-12 15:12:53 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-12 15:12:53 +0200 |
| commit | 00bc92208362a33464bd8bce77c2c2c72e091446 (patch) | |
| tree | b4db858e3260933885e63bf24af5f581a59bbd9b /application | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-00bc92208362a33464bd8bce77c2c2c72e091446.tar.gz pbs2-00bc92208362a33464bd8bce77c2c2c72e091446.tar.xz pbs2-00bc92208362a33464bd8bce77c2c2c72e091446.zip | |
default tgz in kcl
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/ResourceController.php | 6 | ||||
| -rw-r--r-- | application/modules/user/controllers/BootosController.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index d651f4d..88555d1 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -89,7 +89,7 @@ class ResourceController extends Zend_Controller_Action 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="config.tgz"'); + header('Content-Disposition: ' . $content_disp . '; filename="default.tgz"'); header('Pragma: no-cache'); header('Expires: 0'); @@ -141,9 +141,9 @@ class ResourceController extends Zend_Controller_Action if($bme->getKcl()){ $kcl = $bootosmapper->find($bme->getBootosID())->getDefaultkcl(); - $result = $kcl . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend(); + $result = $kcl . " alpha=" . $this->_request->getParam('alpha') . " file=http://".$_SERVER['HTTP_HOST']."/resource/getconfig/alpha/".$this->_request->getParam('alpha')."/file/default.tgz ".$bme->getKclappend(); }else{ - $result = "alpha=" . $this->_request->getParam('alpha') . " " .$bme->getKclappend(); + $result = "alpha=" . $this->_request->getParam('alpha') . " file=http://".$_SERVER['HTTP_HOST']."/resource/getconfig/alpha/".$this->_request->getParam('alpha')."/file/default.tgz ".$bme->getKclappend(); } echo $result; diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php index b4801f6..df2d7fd 100644 --- a/application/modules/user/controllers/BootosController.php +++ b/application/modules/user/controllers/BootosController.php @@ -1,4 +1,4 @@ -v<?php +<?php class user_BootosController extends Zend_Controller_Action { |