Person und Gruppen, Fehler korrigiert + Layout

1 files changed, 27 insertions, 23 deletions

diff --git a/application/modules/dev/controllers/PersonController.php b/application/modules/dev/controllers/PersonController.php
index b7e050f..e422870 100644
--- a/application/modules/dev/controllers/PersonController.php
+++ b/application/modules/dev/controllers/PersonController.php
@@ -24,19 +24,24 @@ class dev_PersonController extends Zend_Controller_Action
 				foreach($this->memberships as $membership) {
 					$group = $this->groupMapper->find($membership['groupID']);
 					$this->groups[] = array (
-					'id'  => $group->getID(),	
-					'title' => $group->getTitle()
+					'groupID'  => $group->getID(),	
+					'title' => $group->getTitle(),
+					'description' => $group->getDescription(),
+					'membershipID' => $membership['membershipID']
 					);
 				}
 			}
 		} else {
-			$this->_redirect('/dev/auth/login');
+			$this->_helper->redirector('login', 'auth');
+			return;
 		}
 	}
 
 	public function indexAction()
 	{
-		$this->_redirect('/dev/person/show');
+		$this->_helper-> viewRenderer-> setNoRender();
+		$this->_helper->redirector('show', 'person');
+		return;
 	}
 
 	public function showAction()
@@ -69,10 +74,10 @@ class dev_PersonController extends Zend_Controller_Action
 					echo "Email Address already existing.";
 					return;
 				}
-				echo "Successfully saved. <br/>";
+				$this->_helper->redirector('show', 'person');
+				return;
 			}
 		}
-
 		$this->view->editForm = $editForm;
 	}
 
@@ -112,7 +117,8 @@ class dev_PersonController extends Zend_Controller_Action
 					echo "Message: " . $e->getMessage() . "<br/>";
 					return;
 				}
-				echo "Successfully requested. <br />";
+				$this->_helper->redirector('show', 'person');
+				return;
 			}
 		}
 		$this->view->requestForm = $requestForm;
@@ -120,24 +126,21 @@ class dev_PersonController extends Zend_Controller_Action
 
 	public function leaveAction()
 	{
+		$this->_helper-> viewRenderer-> setNoRender();
 		$this->view->person = $this->person;
-		if(isset($_POST['groupID'])) {
-			if(isset($this->memberships)) {
-				foreach($this->memberships as $membership) {
-					if($membership['groupID'] == $_POST['groupID']) {
-						$membershipObject = $this->membershipMapper->find($membership['membershipID']);
-						try {
-							$this->membershipMapper->delete($membershipObject);
-						} catch(Zend_Exception $e)
-						{
-							echo "Caught exception: " . get_class($e) . "<br/>";
-							echo "Message: " . $e->getMessage() . "<br/>";
-							return;
-						}
-						echo "You have been successfully removed from the chosen group. <br />";
-					}
-				}
+		$membershipID = $this->_request->getParam('membershipID');
+		if(isset($membershipID)) {
+			$membership = $this->membershipMapper->find($membershipID);
+			try {
+				$this->membershipMapper->delete($membership);
+			} catch(Zend_Exception $e)
+			{
+				echo "Caught exception: " . get_class($e) . "<br/>";
+				echo "Message: " . $e->getMessage() . "<br/>";
+				return;
 			}
+			$this->_helper->redirector('show', 'person');
+			return;
 		}
 	}
 }
@@ -152,3 +155,4 @@ class dev_PersonController extends Zend_Controller_Action
 
 
 
+