fixes

8 files changed, 35 insertions, 21 deletions

diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index e60679a..deea70d 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -147,10 +147,10 @@ class user_BootmenuController extends Zend_Controller_Action
     		$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden');
     		    	
         if (!isset($_POST["createbootmenu"])){
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page));
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type));
     	} else {
     			
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page),$_POST);
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -192,11 +192,11 @@ class user_BootmenuController extends Zend_Controller_Action
     		
     	if (!isset($_POST["editbootmenu"])){
 
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page));
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type));
     		$bootmenuForm->populate($bootmenu->toArray()); 
     		
     	}else{
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page),$_POST);
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -451,7 +451,8 @@ class user_BootmenuController extends Zend_Controller_Action
 	    }
     	
     	if (!isset($_POST["editbootmenuentry"])){
-	   	
+	   		if(!isset($_POST['bootosID']))
+	   			$_POST['bootosID'] = $bootmenuentry->getBootosID();
     		if(!isset($_POST['kcl']))
     			$_POST['kcl'] = $bootmenuentry->getKcl();
     			
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index a38af00..2491c0e 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -30,7 +30,8 @@ class user_ConfigController extends Zend_Controller_Action
 		} else {
 			$this->_helper->redirector('login', 'auth');
 		}
-		$this->page = $this->_request->getParam('page');   	}
+		$this->page = $this->_request->getParam('page');   	
+    }
 
     public function indexAction()
     {
@@ -106,9 +107,9 @@ class user_ConfigController extends Zend_Controller_Action
     		$this->_redirect('/user/config/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden');
     		
         if (!isset($_POST["createconfig"])){
-    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page));
+    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type));
     		} else {
-    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page),$_POST);
+    	        $configForm = new user_Form_Config(array('action' => 'createconfig','page'=>$this->page, 'type'=>$this->type),$_POST);
     			    			
     		    if ($configForm->isValid($_POST)) {
 
@@ -162,11 +163,11 @@ class user_ConfigController extends Zend_Controller_Action
     	        
     	if (!isset($_POST["editconfig"])){
 
-    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page));
+    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type));
     		$configForm->populate($config->toArray()); 
     	
     	}else{
-    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page),$_POST);
+    		$configForm = new user_Form_Config(array('action' => 'editconfig','page'=>$this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($configForm->isValid($_POST)) {
 
diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index 7a3547e..3f5431c 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -26,7 +26,7 @@ class user_Form_Bootiso extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if (!Pbs_Acl::checkRight('be'))
+		if (!Pbs_Acl::checkRight('be') && $this->action == 'editbootiso')
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 8389fa8..73791fd 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -4,6 +4,7 @@ class user_Form_Bootmenu extends Zend_Form
 {
 	private $action;
 	private $page;
+	private $type;	
 	
     public function setAction($action){
     	$this->action = $action;
@@ -17,13 +18,16 @@ class user_Form_Bootmenu extends Zend_Form
 	public function setPage($page){
 		$this->page = $page;
 	}
-    
+	public function setType($type){
+		$this->type = $type;
+	}
+	
     public function init()
     {
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('booee'))
+		if (!Pbs_Acl::checkRight('booee') && $this->action == 'editbootmenu')
 			$meta = true;
 		else 
 			$meta = null;
@@ -49,7 +53,7 @@ class user_Form_Bootmenu extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index 58a2820..3168bee 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -8,6 +8,7 @@ class user_Form_BootmenuEntries extends Zend_Form
 	private $maxorder;
 	private $action;
 	private $page;	
+	private $type;	
 	
     public function setAction($action){
     	$this->action = $action;
@@ -30,6 +31,10 @@ class user_Form_BootmenuEntries extends Zend_Form
     	$this->configlist = $configlist;    	
     }
     
+	public function setType($type){
+		$this->type = $type;
+	}
+    
 	public function setPage($page){
 		$this->page = $page;
 	}
@@ -48,7 +53,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('booee'))
+		if (!Pbs_Acl::checkRight('booee') && $this->action == 'editbootmenuentry')
 			$meta = true;
 		else 
 			$meta = null;
@@ -152,7 +157,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 6edc7eb..5420a83 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -28,7 +28,7 @@ class user_Form_Bootos extends Zend_Form
         $this->setName("BootOsCreate");
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('boe'))
+		if (!Pbs_Acl::checkRight('boe') && $this->action == 'editbootos')
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Config.php b/application/modules/user/forms/Config.php
index 2ee221d..a9f4c62 100644
--- a/application/modules/user/forms/Config.php
+++ b/application/modules/user/forms/Config.php
@@ -5,6 +5,7 @@ class user_Form_Config extends Zend_Form
 
 	private $action;
 	private $page;
+	private $type;
 	
     public function setAction($action){
     	$this->action = $action;
@@ -12,13 +13,15 @@ class user_Form_Config extends Zend_Form
 	public function setPage($p){
     	$this->page = $p;	
     }    
-    
+	public function setType($type){
+		$this->type = $type;
+	}
     public function init()
     {
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('ce'))
+		if (!Pbs_Acl::checkRight('ce') && $this->action == 'editconfig')
 			$meta = true;
 		else 
 			$meta = null;
@@ -57,7 +60,7 @@ class user_Form_Config extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/config/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/config/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 9d2f3aa..404a559 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -18,7 +18,7 @@ class user_Form_Preboot extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if ((!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot'))
+		if (!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot')
 			$meta = true;
 		else 
 			$meta = null;