summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/modules/user/controllers/BootosController.php4
-rw-r--r--application/modules/user/controllers/PrebootController.php13
-rw-r--r--application/modules/user/views/scripts/preboot/index.phtml2
3 files changed, 12 insertions, 7 deletions
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index 917441a..b4801f6 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -1,4 +1,4 @@
-<?php
+v<?php
class user_BootosController extends Zend_Controller_Action
{
@@ -84,6 +84,8 @@ class user_BootosController extends Zend_Controller_Action
if(count($this->view->bootoslist)>0){
foreach ($this->view->bootoslist as $bootos){
$this->view->update[$bootos->getID()] = $update && $this->checkupdateAction($bootos);
+ if($bootos->getDefaultkcl() == null)
+ $bootos->setDefaultkcl("none (edit Bootos to set KCL)");
$bootos->setGroupID("[".$bootos->getGroupID()."] ".$groupMapper->find($bootos->getGroupID())->getTitle());
$bootos->setConfigID("[".$bootos->getConfigID()."] ".$configMapper->find($bootos->getConfigID())->getTitle());
$bootos->setCreated(date(Zend_Registry::get('dateformat'),$bootos->getCreated()));
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index e74dd3f..0a1432c 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -1,4 +1,4 @@
-<?php
+l<?php
class User_PrebootController extends Zend_Controller_Action
{
@@ -25,7 +25,7 @@ class User_PrebootController extends Zend_Controller_Action
$this->db = Zend_Db_Table::getDefaultAdapter();
} else {
$this->_helper->redirector('login', 'auth');
- }
+ }
$this->page = $this->_request->getParam('page');
}
@@ -170,10 +170,13 @@ class User_PrebootController extends Zend_Controller_Action
$prebootdate = strtotime(trim(str_replace('Last-Modified:', '', array_pop($prebootdate))));
- if(is_file("../resources/bootmedium/$prebootID/preboot.zip"))
+ if(is_file("../resources/bootmedium/$prebootID/preboot.zip")){
$prebootolddate = filemtime("../resources/bootmedium/".$prebootID."/preboot.zip");
- else
- $prebootolddate = false;
+ }else{
+ $pbsNotifier = new Pbs_Notifier();
+ $this->view->notification = $pbsNotifier->notify('There are updates available','ok');
+ return true;
+ }
//print_a($prebootname,$prebootdate,$prebootolddate);
diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml
index dd9faba..620fb4f 100644
--- a/application/modules/user/views/scripts/preboot/index.phtml
+++ b/application/modules/user/views/scripts/preboot/index.phtml
@@ -4,7 +4,7 @@
<?php if(Pbs_Acl::checkRight('pru')): ?>
<?php echo $this->formButton('checkupdate', 'Check for Updates', array(
- 'onclick' => 'self.location="/user/preboot/index/checkupdate/true"',
+ 'onclick' => 'self.location="/user/preboot/index/checkupdate/true/page/'.$this->page.'"',
'class' => 'updatebutton',
))?>
<?php endif;?>