From 4ab3be484d93b93f17b30753b69a53b691b2a4fb Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 11 Apr 2011 12:19:28 +0200
Subject: Recht um als neu registrierter Benutzer Gruppen beizutreten

---
 application/modules/user/controllers/PersonController.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index ff5517c..41f7122 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -46,9 +46,9 @@ class user_PersonController extends Zend_Controller_Action
 
 	public function indexAction()
 	{
-		if(!Pbs_Acl::checkRight('psod')) {
-			$this->_redirect('/user');
-		}
+		#if(!Pbs_Acl::checkRight('psod')) {
+		#	$this->_redirect('/user');
+		#}
 		$this->view->person = $this->person;
 		// Pagination
 		$pagination = new Pbs_Pagination();
@@ -60,7 +60,8 @@ class user_PersonController extends Zend_Controller_Action
 		$this->view->groups = $pagination->getElements();
 		$this->view->pagination = $pagination->pagination($pageurl);
 		$this->view->page 		= $pagination->getRequestPage();
-		$this->view->groupRequestRight = Pbs_Acl::checkRight('grm');
+		// This should be activated in case the person has no membership and no rights.
+		$this->view->groupRequestRight = true;
 		$this->view->editRight = Pbs_Acl::checkRight('peoa');
 		$this->view->leaveRight = Pbs_Acl::checkRight('gl');
 		$this->view->userIDsNamespace = Zend_Session::namespaceGet('userIDs');
@@ -129,9 +130,9 @@ class user_PersonController extends Zend_Controller_Action
 
 	public function requestAction()
 	{
-		if(!Pbs_Acl::checkRight('grm')) {
-			$this->_redirect('/user');
-		}
+		#if(!Pbs_Acl::checkRight('grm')) {
+		#	$this->_redirect('/user');
+		#}
 		$this->view->person = $this->person;
 		$allgroups = $this->groupMapper->fetchAll();
 		$groupRequests = $this->groupRequestMapper->findBy(array('personID' => $this->person->getID()),true);
-- 
cgit v1.2.3-55-g7522