diff options
| author | Simon | 2011-04-12 16:47:26 +0200 |
|---|---|---|
| committer | Simon | 2011-04-12 16:47:26 +0200 |
| commit | 46cff4b92ad3dcf62db9472fefe69b6bf473d60b (patch) | |
| tree | 41b4afcdaaea1acaaac2a76c39628fb794754be0 /application/controllers | |
| parent | Dev-Modul deaktiviert und User für alle geöffnet (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-46cff4b92ad3dcf62db9472fefe69b6bf473d60b.tar.gz pbs2-46cff4b92ad3dcf62db9472fefe69b6bf473d60b.tar.xz pbs2-46cff4b92ad3dcf62db9472fefe69b6bf473d60b.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/ResourceController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 542fcda..c172bf5 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -82,7 +82,7 @@ class ResourceController extends Zend_Controller_Action $bmm = new Application_Model_BootMenuEntriesMapper(); $bmm->find($bootmenuentryID,$bootmenuentry); - $configID = $bootmenuentry->getConfigID(); + $configID = $bootmenuentry->ge(); if(is_dir("../resources/config/$configID/") && is_numeric($configID)){ @@ -137,9 +137,9 @@ class ResourceController extends Zend_Controller_Action header('Pragma: no-cache'); header('Expires: 0'); - if($bme->getKcl()){ - $kcl = $bootosmapper->find($bme->getBootosID())->getDefaultkcl(); - + $kcl = $bootosmapper->find($bme->getBootosID())->getDefaultkcl(); + + if($bme->getKcl() && $kcl != null){ $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') . " file=http://".$_SERVER['HTTP_HOST']."/resource/getconfig/alpha/".$this->_request->getParam('alpha')."/file/default.tgz ".$bme->getKclappend(); |