selectmembership von auth zu person verschoben fbgui module

3 files changed, 77 insertions, 61 deletions

diff --git a/application/modules/fbgui/controllers/AuthController.php b/application/modules/fbgui/controllers/AuthController.php
index f5c3a27..1b7b5fe 100644
--- a/application/modules/fbgui/controllers/AuthController.php
+++ b/application/modules/fbgui/controllers/AuthController.php
@@ -53,7 +53,7 @@ class Fbgui_AuthController extends Zend_Controller_Action
                                                         		            	$date = new DateTime();
                                                         		            	$person->setLogindate($date->getTimestamp());
                                                         		            	$this->personmapper->save($person);
-                                                        		            	$this->_helper->redirector('selectmembership', 'auth');
+                                                        		            	$this->_helper->redirector('selectmembership', 'person');
                                                         		            	return;
                                                         		            } else {
                                                         		            	echo "Wrong Email or Password.";
@@ -74,66 +74,6 @@ class Fbgui_AuthController extends Zend_Controller_Action
 		$this->_helper->redirector('login', 'auth');
 		return;
 	}
-
-	public function selectmembershipAction()
-	{
-		if (Zend_Auth::getInstance()->hasIdentity()) {
-			$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
-			if(isset($userIDsNamespace['membershipID'])) {
-				$this->_redirect('/fbgui/');
-			} else {
-				$personmapper = new Application_Model_PersonMapper();
-				$result = $personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-				$person = new Application_Model_Person($result[0]);
-				$person->setID($result[0]['personID']);
-				$membershipMapper = new Application_Model_MembershipMapper();
-				$memberships = $membershipMapper->findBy("personID",$person->getID());
-				if(count($memberships) > 0) {
-					if(isset($_POST['selectmembership'])) {
-						$roleSession = new Zend_Session_Namespace('userIDs');
-						$roleSession->membershipID = $_POST['membershipID'];
-						$roleSession->personID = $person->getID();
-						$membership = $membershipMapper->find($_POST['membershipID']);
-						$roleSession->groupID = $membership->getGroupID();
-						$roleSession->roleID = $membership->getRoleID();
-						$this->_redirect('/fbgui/');
-						return;
-					} else {
-						$groupMapper = new Application_Model_GroupMapper();
-						$roleMapper = new Application_Model_RoleMapper();
-						if(isset($memberships)) {
-							foreach($memberships as $membership) {
-								$group = $groupMapper->find($membership['groupID']);
-								$role = $roleMapper->find($membership['roleID']);
-								$membershipList[] = array(
-                							'membershipID' => $membership['membershipID'],
-                							'group' => $group->getTitle(),
-                							'role' => $role->getTitle()
-								);
-							}
-						}
-						$membershipSelectForm = new fbgui_Form_MembershipSelect(array('membershiplist' => $membershipList));
-						$this->view->membershipSelectForm = $membershipSelectForm;
-					}
-				} else {
-					$this->_redirect('/fbgui/');
-				}
-			}
-
-		} else {
-			$this->_helper->redirector('login', 'auth');
-		}
-	}
-
-	public function changemembershipAction()
-	{
-		$this->_helper-> viewRenderer-> setNoRender();
-		Zend_Session::namespaceUnset('userIDs');
-		$this->_helper->redirector('selectmembership', 'auth');
-		return;
-	}
-
-
 }
 
 
diff --git a/application/modules/fbgui/controllers/PersonController.php b/application/modules/fbgui/controllers/PersonController.php
new file mode 100644
index 0000000..06076c5
--- /dev/null
+++ b/application/modules/fbgui/controllers/PersonController.php
@@ -0,0 +1,76 @@
+<?php
+
+class Fbgui_PersonController extends Zend_Controller_Action
+{
+	protected $person;
+	protected $personmapper;
+	protected $membershipMapper;
+	protected $memberships;
+
+	public function init()
+	{
+		if (Zend_Auth::getInstance()->hasIdentity()) {
+			$this->personmapper = new Application_Model_PersonMapper();
+			$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
+			$this->person = new Application_Model_Person($result[0]);
+			$this->person->setID($result[0]['personID']);
+			$this->membershipMapper = new Application_Model_MembershipMapper();
+			$this->memberships = $this->membershipMapper->findBy("personID",$this->person->getID());
+		} else {
+			$this->_helper->redirector('login', 'auth');
+		}
+	}
+
+	public function indexAction()
+	{
+		$this->_helper->redirector('selectmembership', 'person');
+	}
+
+	public function selectmembershipAction()
+	{
+		$userIDsNamespace = Zend_Session::namespaceGet('userIDs');
+		if(isset($userIDsNamespace['membershipID'])) {
+			$this->_redirect('/fbgui/');
+		} else {
+			if(count($this->memberships) > 0) {
+				if(isset($_POST['selectmembership'])) {
+					$roleSession = new Zend_Session_Namespace('userIDs');
+					$roleSession->membershipID = $_POST['membershipID'];
+					$roleSession->personID = $this->person->getID();
+					$membership = $this->membershipMapper->find($_POST['membershipID']);
+					$roleSession->groupID = $membership->getGroupID();
+					$roleSession->roleID = $membership->getRoleID();
+					$this->_redirect('/fbgui/');
+					return;
+				} else {
+					$groupMapper = new Application_Model_GroupMapper();
+					$roleMapper = new Application_Model_RoleMapper();
+					if(isset($this->memberships)) {
+						foreach($this->memberships as $membership) {
+							$group = $groupMapper->find($membership['groupID']);
+							$role = $roleMapper->find($membership['roleID']);
+							$membershipList[] = array(
+                							'membershipID' => $membership['membershipID'],
+                							'group' => $group->getTitle(),
+                							'role' => $role->getTitle()
+							);
+						}
+					}
+					$membershipSelectForm = new fbgui_Form_MembershipSelect(array('membershiplist' => $membershipList));
+					$this->view->membershipSelectForm = $membershipSelectForm;
+				}
+			} else {
+				$this->_redirect('/fbgui/');
+			}
+		}
+	}
+
+	public function changemembershipAction()
+	{
+		$this->_helper-> viewRenderer-> setNoRender();
+		Zend_Session::namespaceUnset('userIDs');
+		$this->_helper->redirector('selectmembership', 'person');
+		return;
+	}
+}
+
diff --git a/application/modules/fbgui/views/scripts/auth/selectmembership.phtml b/application/modules/fbgui/views/scripts/person/selectmembership.phtml
index 5f7e5bf..5f7e5bf 100644
--- a/application/modules/fbgui/views/scripts/auth/selectmembership.phtml
+++ b/application/modules/fbgui/views/scripts/person/selectmembership.phtml