diff options
| author | Björn Geiger | 2011-04-11 14:38:16 +0200 |
|---|---|---|
| committer | Björn Geiger | 2011-04-11 14:38:16 +0200 |
| commit | 1f95b2190d1be70f358f6921cd8d2e80bace3ec6 (patch) | |
| tree | 9d46d3525b04a7b433b6c585205f9e4e0615393f /application/controllers | |
| parent | Bessere Fehlerbeschreibung bei Registrierung (diff) | |
| parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
| download | pbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.tar.gz pbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.tar.xz pbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.zip | |
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers')
| -rw-r--r-- | application/controllers/ResourceController.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 64d9885..a60b3c9 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -129,6 +129,7 @@ class ResourceController extends Zend_Controller_Action $bmemapper = new Application_Model_BootMenuEntriesMapper(); $bme = new Application_Model_BootMenuEntries(); + $bootosmapper = new Application_Model_BootOsMapper(); $bmemapper->find($bmeID,$bme); header('Content-Type: text/html'); @@ -137,11 +138,14 @@ class ResourceController extends Zend_Controller_Action header('Pragma: no-cache'); header('Expires: 0'); - if($bme->getKcl() != null) - $result = $bme->getKcl() . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend(); - else + if($bme->getKcl() != null){ + @list($bootos) = $bootosmapper->findBy(array('defaultkcl', $bme->getKcl())); + $kcl = $bootos->getDefaultkcl(); + + $result = $kcl . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend(); + }else{ $result = "alpha=" . $this->_request->getParam('alpha') . " " .$bme->getKclappend(); - + } echo $result; |