Rechte in Group nächster Teil

2 files changed, 29 insertions, 26 deletions

diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 2d4fc64..e266ad7 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -207,7 +207,7 @@ class User_GroupController extends Zend_Controller_Action
 			}
 		}
 		if($groupID == $this->membership->getGroupID() && !Pbs_Acl::checkRight('gsdo'))
-		$this->_redirect('/user');
+			$this->_redirect('/user');
 
 		$this->view->usergroup = $this->membership->getGroupID();
 		$this->view->requestgroup = $groupID;
@@ -231,7 +231,7 @@ class User_GroupController extends Zend_Controller_Action
 		}
 		# }
 
-		if(Pbs_Acl::checkRight('gsmg')){
+		if(Pbs_Acl::checkRight('gsmg') || Pbs_Acl::checkRight('gsmgo')){			
 			$members = $this->membershipMapper->findBy(array('groupID' => $groupID),true);
 			if(isset($members)) {
 				foreach($members as $member) {
diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index 042b34e..2f4ae4a 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -51,7 +51,7 @@ if($this->usergroup == $this->requestgroup){ ?>
 
 
 // Show Request List
-if(isset($this->groupRequestList)){
+if(isset($this->groupRequestList) && (Pbs_Acl::checkRight('grog') || Pbs_Acl::checkRight('grotg'))){
 	?>
 <br />
 <h2>Requests:</h2>
@@ -60,17 +60,15 @@ foreach($this->groupRequestList as $grouprequest) {
 	$grouprequestID = $grouprequest['grouprequestID'];
 	$person = $grouprequest['person'];
 	?>
-<div class='element'>
-<div class='content'><?php 
-if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs_Acl::checkRight('gdm'))){
-	?>
-<div class='actions'><?php if(Pbs_Acl::checkRight('gam')): ?>
-<form action="/user/group/grantperson" method="post"><input
-	type="hidden" name="grouprequestID"
-	value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
-<input type="image" src='/media/img/save.png' alt='Grant Person'
-	name="confirm" value="confirm" /> <?php endif; ?> <?php if(Pbs_Acl::checkRight('gdm')): ?>&nbsp;<a
-	href="<?php echo $this->url(
+	<div class='element'>
+		<div class='content'><?php 
+		if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs_Acl::checkRight('gdm'))){
+			?>
+		<div class='actions'><?php if(Pbs_Acl::checkRight('gam')): ?>
+			<form action="/user/group/grantperson" method="post">
+				<input	type="hidden" name="grouprequestID" value="<?php echo $grouprequestID; ?>" /> <?php printRoleSelect($this->roleList); ?>
+				<input type="image" src='/media/img/save.png' alt='Grant Person' name="confirm" value="confirm" /> <?php endif; ?> <?php if(Pbs_Acl::checkRight('gdm')): ?>
+				<a href="<?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'group',
@@ -78,18 +76,19 @@ if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs
 							'grouprequestID'   =>  $grouprequestID,
 						),
 						'default',
-						true) ?>"> <img src='/media/img/delete.png'
-	alt='Decline Membership' /></a> <?php endif; ?></form>
-</div>
-						<?php
-}
-?>
+						true) ?>"><img src='/media/img/delete.png' alt='Decline Membership' /></a> <?php endif; ?></form>
+		</div>
+		<?php
+		}
+		?>
 
-<div class='title'><?php echo $person->getTitle(); ?>&nbsp;<?php echo $person->getFirstname(); ?>&nbsp;<?php echo $person->getName(); ?></div>
-<div class='subtitle'><?php echo $person->getCity(); ?></div>
-<div class='details dispnone'><label>Email</label>
-<div class='item'><?php echo $person->getEmail(); ?></div>
-</div>
+		<div class='title'><?php echo $person->getTitle(); ?>&nbsp;<?php echo $person->getFirstname(); ?>&nbsp;<?php echo $person->getName(); ?></div>
+		<div class='subtitle'><?php echo $person->getCity(); ?></div>
+		<div class='details dispnone'>
+			<label>Email</label>
+			<div class='item'><?php echo $person->getEmail(); ?>
+		</div>
+	</div>
 </div>
 </div>
 <?php
@@ -98,7 +97,11 @@ if($this->usergroup == $this->requestgroup && (Pbs_Acl::checkRight('gam') || Pbs
 <?php
 }
 // Show Memberlist
-if(isset($this->membersList) && Pbs_Acl::checkRight('gsmg')){
+if(isset($this->membersList) && 
+	(
+		(Pbs_Acl::checkRight('gsmg') && $this->group->getID() != $this->usergroup) || 
+		(Pbs_Acl::checkRight('gsmgo') && $this->group->getID() == $this->usergroup)
+		)){
 	?>
 <br />
 <h2>Members:</h2>