merge

4 files changed, 212 insertions, 135 deletions

diff --git a/application/modules/user/views/scripts/group/show.phtml b/application/modules/user/views/scripts/group/show.phtml
index b2a85ac..b01ade4 100644
--- a/application/modules/user/views/scripts/group/show.phtml
+++ b/application/modules/user/views/scripts/group/show.phtml
@@ -1,6 +1,6 @@
 <h1>Groupdetails - <?php echo $this->group->getTitle();?></h1>
-<?php 
-if($this->usergroup == $this->requestgroup){ 
+<?php
+if($this->usergroup == $this->requestgroup){
 	echo $this->formButton('deletegroup', 'Delete', array(
 							'onclick' => 'self.location="/user/group/delete/"',
 							'class' => 'rightbutton'));
@@ -18,111 +18,105 @@ else{
 }
 ?>
 <div class='listelement'>
-	<div class='element'>
-		<div class='number'>
-			<?php			
-			 if($this->usergroup == $this->requestgroup){ ?>
-				<div class='smallnumber'>Your Group</div>
-			<?php }else{ ?>
-				<div class='smallnumber'>Group</div>
-				<?php echo $this->group->getID(); ?>
-			<?php } ?>			
-		</div>
-		<div class='content'>
-			<div class='title'><?php echo $this->group->getTitle(); ?></div>
-			<div class='subtitle'><?php echo $this->group->getDescription(); ?></div>
-			<?php if(isset($parentGroup) && is_object($parentGroup)): ?>
-			<div class='details'>
-				<label>Superordinated Group:</label><div class='item'><?php echo $this->parentGroup->getTitle(); ?></div>
-			</div>			
-			<?php endif ;?>
-		</div>
-		<div class='clear'></div>
-	</div>
+<div class='element'>
+<div class='number'><?php			
+if($this->usergroup == $this->requestgroup){ ?>
+<div class='smallnumber'>Your Group</div>
+<?php }else{ ?>
+<div class='smallnumber'>Group</div>
+<?php echo $this->group->getID(); ?> <?php } ?></div>
+<div class='content'>
+<div class='title'><?php echo $this->group->getTitle(); ?></div>
+<div class='subtitle'><?php echo $this->group->getDescription(); ?></div>
+<?php if(isset($parentGroup) && is_object($parentGroup)): ?>
+<div class='details'><label>Superordinated Group:</label>
+<div class='item'><?php echo $this->parentGroup->getTitle(); ?></div>
+</div>
+<?php endif ;?></div>
+<div class='clear'></div>
+</div>
 </div>
 <?php
 
 
 // Show Request List
 if(isset($this->groupRequestList)){
-?>
+	?>
 <br />
 <h2>Requests:</h2>
-<div class='listelement'>
-	<?php
-	foreach($this->groupRequestList as $grouprequest) {
+<div class='listelement'><?php
+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" />
-				</form>
-				<?php endif; ?>
-				<?php if(Pbs_Acl::checkRight('gdm')): ?>
-					TODO
-				<?php endif; ?>
-			</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>
-	</div>
-	<?php 
-	}
+<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(
+						array(
+							'module'	=> 'user',
+							'controller' => 'group',
+							'action'     => 'decline',
+							'grouprequestID'   =>  $grouprequestID,
+						),
+						'default',
+						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>
+</div>
+<?php
+}
+?></div>
 <?php
 }
 // Show Memberlist
 if(isset($this->membersList) && Pbs_Acl::checkRight('gsmg')){
-?>
+	?>
 <br />
 <h2>Members:</h2>
-<div class='listelement'>
-<?php 
+<div class='listelement'><?php 
 if(count($this->membersList)==0)
-	echo "This hroup has no members."
+echo "This hroup has no members."
+?> <?php foreach ($this->membersList as $k => $member): ?> <?php
+$membershipID = $member['membershipID'];
+$suspended = $member['suspended'];
+$person = $member['person'];
+$role = $member['role'];
+$class='';
+if($person->getID() == $this->userIDsNamespace['personID'])
+$class= 'highlight checked';
 ?>
-<?php foreach ($this->membersList as $k => $member): ?>
-	<?php
-	$membershipID = $member['membershipID'];
-	$person = $member['person'];
-	$role = $member['role'];
-	$class='';
-	if($person->getID() == $this->userIDsNamespace['personID'])
-	$class= 'highlight checked';
+<div class='element<?php echo " $class";?>'><?php
+if($person->getID() != $this->userIDsNamespace['personID']) {
 	?>
-	<div class='element<?php echo " $class";?>'>
-		<?php
-		if($person->getID() != $this->userIDsNamespace['personID']) {
-			?>
-			<div class='number'>
-				<div class='smallnumber'>Person</div>
-				<?php echo $k+1; ?>
-			</div>
-		<?php
-		}
-		?>
-		<div class='content'>
-			<div class='actions'>
-				<?php
-				if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (Pbs_Acl::checkRight('gdmog') && $this->usergroup != $this->requestgroup)):
-				?>
-				<a href="<?php echo $this->url(
+<div class='number'>
+<div class='smallnumber'>Person</div>
+	<?php echo $k+1; ?></div>
+	<?php
+}
+?>
+<div class='content'>
+<div class='actions'><?php
+if((Pbs_Acl::checkRight('gdmo') && $this->usergroup == $this->requestgroup) || (Pbs_Acl::checkRight('gdmog') && $this->usergroup != $this->requestgroup)):
+?> <a
+	href="<?php echo $this->url(
 						array(
 							'module'	=> 'user',
 							'controller' => 'group',
@@ -130,26 +124,57 @@ if(count($this->membersList)==0)
 							'membershipID'   =>  $membershipID,
 						),
 						'default',
-						true) ?>"> <img src='/media/img/delete.png' alt='Revoke Membership' /></a>
-				<?php
-				endif;
-				?>
-			</div>
-			<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
-			<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
-			<div class='details dispnone'>
-				<label>Email</label>
-				<div class='item'><?php echo $person->getEmail(); ?></div>
-				<label>City</label>
-				<div class='item'><?php echo $person->getCity(); ?></div>
-			</div>
-		</div>
-		<div class='clear'></div>
-	</div>
-<?php endforeach ?>
+						true) ?>"> <img src='/media/img/delete.png'
+	alt='Revoke Membership' /></a> <?php
+	endif;
+	if(Pbs_Acl::checkRight('gsm')) {
+		if($suspended == 1)
+		{
+			?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'group',
+							'action'     => 'resumemembership',
+							'membershipID'   =>  $membershipID
+						),
+						'default',
+						true); ?>"> <img src='/media/img/resume.png'
+	alt='Resume Membership' /></a> <?php
+		} else {
+			?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'group',
+							'action'     => 'suspendmembership',
+							'membershipID'   =>  $membershipID
+						),
+						'default',
+						true); ?>"> <img src='/media/img/suspend.png'
+	alt='Suspend Membership' /></a> <?php
+		}
+	}
+	?></div>
+<div class='title'><?php echo $person->getFirstname(); ?> <?php echo $person->getName(); ?></div>
+<div class='subtitle'>Role: <?php echo $role->getTitle(); ?></div>
+<div class='details dispnone'><label>Email</label>
+<div class='item'><?php echo $person->getEmail(); ?></div>
+<label>City</label>
+<div class='item'><?php echo $person->getCity(); ?></div>
+	<?php
+	if(Pbs_Acl::checkRight('gsm')) {
+		?> <label>Membership suspended</label>
+<div class='item'><?php if($suspended == 1) echo "yes"; else echo "no"; ?></div>
+		<?php
+	}
+	?></div>
 </div>
-<?php echo $this->memberPagination; ?>
-<?php
+<div class='clear'></div>
+</div>
+	<?php endforeach ?></div>
+	<?php echo $this->memberPagination; ?>
+	<?php
 
 }
 
diff --git a/application/modules/user/views/scripts/person/index.phtml b/application/modules/user/views/scripts/person/index.phtml
index 1304299..93dfd78 100644
--- a/application/modules/user/views/scripts/person/index.phtml
+++ b/application/modules/user/views/scripts/person/index.phtml
@@ -15,14 +15,12 @@ $class='';
 if($person->getID() == $this->userIDsNamespace['personID'])
 $class= 'highlight checked';
 ?>
-<div class='element<?php echo " $class";?>'>
-<?php if($person->getID() != $this->userIDsNamespace['personID']) {
+<div class='element<?php echo " $class";?>'><?php if($person->getID() != $this->userIDsNamespace['personID']) {
 	?>
-	<div class='number'>
-		<div class='smallnumber'>Person</div>
-		<?php echo $k+1; ?>
-	</div>
-<?php
+<div class='number'>
+<div class='smallnumber'>Person</div>
+	<?php echo $k+1; ?></div>
+	<?php
 }
 ?>
 <div class='content'>
@@ -103,6 +101,33 @@ if($person->getID() == $this->userIDsNamespace['personID']) {
 						<?php
 	}
 }
+if($this->suspendRight === true) {
+	if($person->getSuspended() == 1) {
+		?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'resume',
+							'personID'   =>  $person->getID()
+						),
+						'default',
+						true); ?>"> <img src='/media/img/resume.png' alt='Resume Account' /></a>
+						<?php
+	} else {
+		?> <a
+	href=" <?php echo $this->url(
+						array(
+							'module'	=> 'user',
+							'controller' => 'person',
+							'action'     => 'suspend',
+							'personID'   =>  $person->getID()
+						),
+						'default',
+						true); ?>"> <img src='/media/img/suspend.png'
+	alt='Suspend Account' /></a> <?php
+	}
+}
 ?></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->getEmail(); ?></div>
diff --git a/application/modules/user/views/scripts/person/owndetails.phtml b/application/modules/user/views/scripts/person/owndetails.phtml
index 88f124f..4547e23 100644
--- a/application/modules/user/views/scripts/person/owndetails.phtml
+++ b/application/modules/user/views/scripts/person/owndetails.phtml
@@ -1,27 +1,42 @@
 <h1>Own Details</h1>
 <style>
-label{width:150px !important;}
+label {
+	width: 150px !important;
+}
 </style>
 <?php if($this->editRight === true) echo $this->formButton('editperson', 'Edit', array(
 							'onclick' => 'self.location="/user/person/edit/"',
 							'class' => 'rightbutton'))?>
 <div class='listelement'>
-<div class='element'>
-	<div class='content'>
-		<div class='title'><?php echo $this->person->getTitle()." ".$this->person->getFirstname()." ".$this->person->getName(); ?></div>
-		<div class='subtitle'><?php echo $this->person->getEmail(); ?></div>
-		<div class='details'>			
-			<label>Street:</label><div class='item'><?php echo $this->person->getStreet(); ?>&nbsp;</div>
-			<label>Housenumber:</label><div class='item'><?php echo $this->person->getHousenumber(); ?>&nbsp;</div>
-			<label>City:</label><div class='item'><?php echo $this->person->getCity(); ?>&nbsp;</div>
-			<label>Postalcode:</label><div class='item'><?php echo $this->person->getPostalcode(); ?>&nbsp;</div>
-			<label>Email:</label><div class='item'><?php echo $this->person->getEmail(); ?>&nbsp;</div>
-			<label>Last Login:</label><div class='item'><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>&nbsp;</div>
-			<label>Register Date:</label><div class='item'><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?>&nbsp;</div>
+	<div class='element'>
+		<div class='content'>
+			<div class='title'><?php echo $this->person->getTitle()." ".$this->person->getFirstname()." ".$this->person->getName(); ?></div>
+			<div class='subtitle'><?php echo $this->person->getEmail(); ?></div>
+		<div class='details'><label>Street:</label>
+			<div class='item'><?php echo $this->person->getStreet(); ?>&nbsp;</div>
+			<label>Housenumber:</label>
+			<div class='item'><?php echo $this->person->getHousenumber(); ?>&nbsp;</div>
+			<label>City:</label>
+			<div class='item'><?php echo $this->person->getCity(); ?>&nbsp;</div>
+			<label>Postalcode:</label>
+			<div class='item'><?php echo $this->person->getPostalcode(); ?>&nbsp;</div>
+			<label>Email:</label>
+			<div class='item'><?php echo $this->person->getEmail(); ?>&nbsp;</div>
+			<label>Last Login:</label>
+			<div class='item'><?php if( $this->person->getLogindate()) echo date ('d. F Y - H:i', $this->person->getLogindate()) . " Uhr"; ?>&nbsp;</div>
+			<label>Register Date:</label>
+			<div class='item'><?php echo date ('d. F Y - H:i', $this->person->getRegisterdate()) . ' Uhr'; ?>&nbsp;</div>
+			<?php if($this->suspendRight === true)
+			{
+				?> <label>Suspended:</label>
+			<div class='item'><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></div>
+				<?php
+			}
+		?>
 		</div>
 	</div>
-	<div class='clear'>
-</div>
+	<div class='clear'></div>
+	</div>
 </div>
 <br />
 <h2>Member in the following Groups:</h2>
@@ -66,6 +81,7 @@ if(count($this->groups)==0)
 if(isset($this->groupRequestList)) {
 ?>
 <br />
+
 <h2>Requests:</h2>
 <div class='listelement'>
 <?php
diff --git a/application/modules/user/views/scripts/person/show.phtml b/application/modules/user/views/scripts/person/show.phtml
index c43bde3..2f2ef56 100644
--- a/application/modules/user/views/scripts/person/show.phtml
+++ b/application/modules/user/views/scripts/person/show.phtml
@@ -66,7 +66,18 @@
 </div>
 <div class='clear'></div>
 </div>
+<?php if($this->suspendRight === true)
+{
+	?>
+<div class='element'>
+<div class='content'>
+<div class="title">Suspended:&nbsp;<span class="noBold"><?php if($this->person->getSuspended() == 1) echo "yes"; else echo "no"; ?></span></div>
+</div>
+<div class='clear'></div>
 </div>
+	<?php
+}
+?></div>
 <br />
 <h2>Member in the following Groups:</h2>
 <div class='listelement'><?php if(count($this->groups)==0)
@@ -105,18 +116,18 @@ foreach($this->groupRequestList as $grouprequest) {
 <div class='element'>
 <div class='content'>
 <div class='title'><?php echo $group->getTitle(); ?></div>
-							<?php if($group->getDescription()) {
-								?>
+	<?php if($group->getDescription()) {
+		?>
 <div class='subtitle'><?php echo $group->getDescription(); ?></div>
-								<?php
-							} else {
-								?>
+		<?php
+	} else {
+		?>
 <div class='subtitle'>&nbsp;</div>
-								<?php
-							}
-							?></div>
+		<?php
+	}
+	?></div>
 </div>
-							<?php
+	<?php
 }
 ?></div>
 <?php