Forms Rechte angepasst, Views angepasst

6 files changed, 6 insertions, 30 deletions

diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index 1facf94..10bd53d 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -6,12 +6,8 @@ class user_Form_Bootiso extends Zend_Form
 	private $prebootlist;
 	private $groupdepth;
 	private $action;
-	private $rights;
 	private $page;
 	
-    public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;
     }
@@ -30,7 +26,7 @@ class user_Form_Bootiso extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if ($this->rights == 'meta')
+		if (Pbs_Acl::checkRight('bem'))
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 1aaf808..081904f 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -3,12 +3,8 @@
 class user_Form_Bootmenu extends Zend_Form
 {
 	private $action;
-	private $rights;	
 	private $page;
 	
-    public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;
     	
@@ -27,7 +23,7 @@ class user_Form_Bootmenu extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if ($this->rights == "meta")
+		if (Pbs_Acl::checkRight('booeem'))
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index c31668c..413b09a 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -6,7 +6,6 @@ class user_Form_BootmenuEntries extends Zend_Form
 	private $configlist;
 	private $maxorder;
 	private $action;
-	private $rights;	
 	private $page;
 	private $kcl;
 	
@@ -14,9 +13,6 @@ class user_Form_BootmenuEntries extends Zend_Form
 	public function setKcl($kcl){
     	$this->kcl = $kcl;	
     }
-    public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;
     	
@@ -55,7 +51,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if ($this->rights == "meta")
+		if (Pbs_Acl::checkRight('booeem'))
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 867cfc1..21f674b 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -5,13 +5,9 @@ class user_Form_Bootos extends Zend_Form
 
 	private $configlist;
 	private $action;
-	private $rights;
 	private $groupdepth;
     private $page;
 	
-    public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;
     	
@@ -32,7 +28,7 @@ class user_Form_Bootos extends Zend_Form
         $this->setName("BootOsCreate");
 		$this->setMethod('post');
 		
-		if ($this->rights == "meta")
+		if (Pbs_Acl::checkRight('boem'))
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Config.php b/application/modules/user/forms/Config.php
index bf25fe2..e9bbffb 100644
--- a/application/modules/user/forms/Config.php
+++ b/application/modules/user/forms/Config.php
@@ -4,12 +4,8 @@ class user_Form_Config extends Zend_Form
 {
 
 	private $action;
-	private $rights;
 	private $page;
 	
-	public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;
     }
@@ -22,7 +18,7 @@ class user_Form_Config extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if ($this->rights == 'meta')
+		if (Pbs_Acl::checkRight('cem'))
 			$meta = true;
 		else 
 			$meta = null;
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 2b8ccff..8032a71 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -4,12 +4,8 @@ class user_Form_Preboot extends Zend_Form
 {
 
 	private $action;
-	private $rights;
 	private $page;
 	
-    public function setRights($rights){
-    	$this->rights = $rights;
-    }
     public function setAction($action){
     	$this->action = $action;    	
     }
@@ -22,7 +18,7 @@ class user_Form_Preboot extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 
-		if ($this->rights == 'meta')
+		if (Pbs_Acl::checkRight('prem'))
 			$meta = true;
 		
         $this->addElement('text', 'title', array(