diff options
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/ResourceController.php | 12 | ||||
| -rw-r--r-- | application/modules/user/controllers/BootmenuController.php | 2 |
2 files changed, 9 insertions, 5 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; diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index ed2239b..a7bfb56 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -125,7 +125,7 @@ class user_BootmenuController extends Zend_Controller_Action $pagination->setPageUrl('/user/bootmenu/index/type/'.$this->type.((isset($this->view->search))?'/search/'.$this->view->search:'')); $bootmenu = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->bootmenulist = $bootmenu; |