From e5fcbd73596db87bb5cd24e1ba91cf735549b3c3 Mon Sep 17 00:00:00 2001
From: Björn Geiger
Date: Tue, 12 Apr 2011 14:54:50 +0200
Subject: verschiedene Korrekturen

---
 .../modules/user/controllers/RoleController.php    | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'application/modules/user/controllers/RoleController.php')

diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 74efd70..91357f0 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -61,7 +61,7 @@ class User_RoleController extends Zend_Controller_Action
 	}
 
 	public function searchAction(){
-		if(Pbs_Acl::checkRight('ro')) {
+		if(!Pbs_Acl::checkRight('ro')) {
 			$this->_redirect('/user');
 		}
 		$this->_redirect('/user/role/index/search/'.($_GET['search']));
@@ -157,7 +157,7 @@ class User_RoleController extends Zend_Controller_Action
 				if ($editForm->isValid($_POST)) {
 
 					$role = new Application_Model_Role($_POST);
-					$role->setID($this->_request->getParam('roleID'));
+					$role->setID($roleID);
 					try {
 						$this->roleMapper->save($role);
 					} catch(Zend_Exception $e)
@@ -166,15 +166,7 @@ class User_RoleController extends Zend_Controller_Action
 						echo "Message: " . $e->getMessage() . "<br/>";
 						return;
 					}
-					if($_SERVER['HTTP_REFERER']) {
-						$this->_redirect($_SERVER['HTTP_REFERER']);
-					} else {
-						if(isset($roleID)) {
-							$this->_redirect('/user/role/show/roleID/' . $roleID);
-						} else {
-							$this->_helper->redirector('', 'role');
-						}
-					}
+					$this->_helper->redirector('', 'role');
 					return;
 				}
 			}
@@ -272,8 +264,12 @@ class User_RoleController extends Zend_Controller_Action
 					echo "Message: " . $e->getMessage() . "<br/>";
 					return;
 				}
-				if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show') !== false && strpos($_SERVER['HTTP_REFERER'], '/roleID/') === false) {
-					$this->_helper->redirector('changemembership', 'person');
+				if($_SERVER['HTTP_REFERER']) {
+					if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show') !== false && strpos($_SERVER['HTTP_REFERER'], '/roleID/') === false) {
+						$this->_helper->redirector('changemembership', 'person');
+					} else {
+						$this->_helper->redirector('', 'role');
+					}
 				} else {
 					$this->_helper->redirector('', 'role');
 				}
-- 
cgit v1.2.3-55-g7522