summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authormichael pereira2011-04-11 14:29:18 +0200
committermichael pereira2011-04-11 14:29:18 +0200
commitd9ed511e80725057ea4eb3f08fec1f2ace325cb3 (patch)
treee24da91f13561141103b2f1b88edb605150c9e6c /application/controllers
parentACL im RoleController (diff)
downloadpbs2-d9ed511e80725057ea4eb3f08fec1f2ace325cb3.tar.gz
pbs2-d9ed511e80725057ea4eb3f08fec1f2ace325cb3.tar.xz
pbs2-d9ed511e80725057ea4eb3f08fec1f2ace325cb3.zip
kcl fix im ressource controller
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/ResourceController.php12
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;