Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2

1 files changed, 17 insertions, 24 deletions

diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index e1b4f7b..12e2d68 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -57,8 +57,8 @@ class user_BootosController extends Zend_Controller_Action
     	
     	$groupID = $this->membership->getGroupID();  
 		
-		//TODO ACL Darf er BootOsMenu sehen?
-    	if(false)
+		//ACL Darf er BootOs sehen?
+    	if(!Pbs_Acl::checkRight('boai') && !Pbs_Acl::checkRight('boui'))
     		$this->_redirect('/user/index');
     		
        	$configMapper = new Application_Model_ConfigMapper();
@@ -71,11 +71,11 @@ class user_BootosController extends Zend_Controller_Action
 		$mySearch = new Pbs_Search();
 		$mySearch->setSearchTerm($search);
 		$mySearch->setModule('bootos');
-		$this->view->searchform = $mySearch->searchForm();
 		if($search != ''){
 			$this->view->search = $mySearch->getSearchTerm();			
 			$this->view->bootoslist = $mySearch->search($this->view->bootoslist);			
 		}
+		$this->view->searchform = $mySearch->searchForm();
     	
     	// Pagination
 	    $pagination = new Pbs_Pagination();	
@@ -110,8 +110,8 @@ class user_BootosController extends Zend_Controller_Action
     public function createbootosAction()
     {
     	
-    	//TODO ACL Darf er BootISOs erstellen?
-    	if(false)
+    	//ACL Darf er BootISOs erstellen?
+    	if(!Pbs_Acl::checkRight('boc'))
     		$this->_redirect('/user/bootos/index/page/'.$this->page.'/addresult/forbidden');
     	
        	$groupID = $this->membership->getGroupID();
@@ -119,7 +119,6 @@ class user_BootosController extends Zend_Controller_Action
     	$groupgroupsMapper = new Application_Model_GroupGroupsMapper();
     	$childgroups = count($groupgroupsMapper->getChildGroups($groupID));
     	
-    	//TODO nur configs von admins
     	$configMapper = new Application_Model_ConfigMapper();   
     	$configlist = $configMapper->findBy(array("groupID" => $groupID)); 	
     	
@@ -128,7 +127,6 @@ class user_BootosController extends Zend_Controller_Action
     	        							'action' => 'createbootos', 
     	        							'groupdepth' => $childgroups, 
     	        							'configlist'=>$configlist, 
-    	        							'rights' => 'all',
     	        							'page' => $this->page));
     	} else {
     			
@@ -136,14 +134,12 @@ class user_BootosController extends Zend_Controller_Action
     	        							'action' => 'createbootos', 
     	        							'groupdepth' => $childgroups, 
     	        							'configlist'=>$configlist, 
-    	        							'rights' => 'all',
     	        							'page' => $this->page),$_POST);
     			    			
     		    if ($bootosForm->isValid($_POST)) {
 
     		    	$bootos = new Application_Model_BootOs($_POST);
     		    	
-    		    	$bootos->setMembershipID($this->membership->getID());
     		    	$bootos->setGroupID($this->membership->getGroupID());
     		        $bootos->setCreated(time());
     		        
@@ -194,8 +190,8 @@ class user_BootosController extends Zend_Controller_Action
     public function checkupdateAction($bootos)
     {
     	
-    	//TODO ACL Is he allowed to update Preboots?
-    	if(false)
+    	//ACL Is he allowed to update Preboots?
+    	if(!Pbs_Acl::checkRight('bou'))
     		$this->_redirect('/user/preboot/index/page/'.$this->page.'/updateresult/forbidden');
     	
     	$bootosID = $bootos->getID();	
@@ -231,8 +227,8 @@ class user_BootosController extends Zend_Controller_Action
     public function updatebootosAction()
     {
     	
-    	//TODO ACL Is he allowed to update Preboots?
-    	if(false)
+    	//ACL Is he allowed to update Preboots?
+    	if(!Pbs_Acl::checkRight('bou'))
     		$this->_redirect('/user/bootiso/index/page/'.$this->page.'/updateresult/forbidden');
     	
     	$bootosID = $this->_request->getParam('bootosID');
@@ -266,8 +262,8 @@ class user_BootosController extends Zend_Controller_Action
     public function editbootosAction()
     {
 		
-    	//TODO ACL Is he allowed to edit Preboots?
-    	if(false)
+    	//ACL Is he allowed to edit Preboots?
+    	if(!Pbs_Acl::checkRight('boe'))
     		$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
     	
     	$bootosID = $this->_request->getParam('bootosID');
@@ -294,7 +290,6 @@ class user_BootosController extends Zend_Controller_Action
     									'action' => 'editbootos', 
     									'groupdepth' => $childgroups, 
     									'configlist'=>$configlist, 
-    									'rights' => 'meta',
     	        						'page' => $this->page));
 
     		$bootosForm->populate($bootos->toArray()); 
@@ -304,7 +299,6 @@ class user_BootosController extends Zend_Controller_Action
     									'action' => 'editbootos', 
     									'groupdepth' => $childgroups, 
     									'configlist'=>$configlist, 
-    									'rights' => 'meta',
     	        						'page' => $this->page),$_POST);
     			    			
     		if ($bootosForm->isValid($_POST)) {
@@ -312,7 +306,6 @@ class user_BootosController extends Zend_Controller_Action
     			$bootosold = $bootos;
 
     			$bootos = new Application_Model_BootOs($_POST);
-    			$bootos->setMembershipID($this->membership->getID());
     			$bootos->setGroupID($this->membership->getGroupID());
     			$bootos->setCreated(time());
     			if($bootos->getConfigID() == '')
@@ -323,14 +316,14 @@ class user_BootosController extends Zend_Controller_Action
     				$bootos->getDefaultkcl() != $bootosold->getDefaultkcl() ||
     				$bootos->getExpires() != $bootosold->getExpires() ||
     				$bootos->getPublic() != $bootosold->getPublic() ){
-    				//TODO ACL Is he allowed to edit this?
-    				if(false)
+    				//ACL Is he allowed to edit this?
+    				if(Pbs_Acl::checkRight('boem'))
     					$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
     			}
     			
     		    if($bootos->getPath_kernel() != $bootosold->getPath_kernel() || $bootos->getPath_init() != $bootosold->getPath_init()){	
-    		       	//TODO ACL Is he allowed to edit the Kernel/Init Path?
-    				if(false)
+    		       	//ACL Is he allowed to edit the Kernel/Init Path?
+    				if(Pbs_Acl::checkRight('boem'))
     					$this->_redirect('/user/bootos/index/page/'.$this->page.'/modifyresult/forbidden');
     					
     				$path_tmp = "../resources/bootos/";
@@ -380,8 +373,8 @@ class user_BootosController extends Zend_Controller_Action
 
     public function deletebootosAction()
     {
-    	//TODO ACL Is he allowed to delete Bootos?
-    	if(false)
+    	//ACL Is he allowed to delete Bootos?
+    	if(!Pbs_Acl::checkRight('bod'))
     		$this->_redirect('/user/bootos/index/page/'.$this->page.'/deleteresult/forbidden');
     	
     	try{