zfconf

2 files changed, 26 insertions, 18 deletions

diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php
index 41952a2..078a4cf 100644
--- a/application/modules/dev/controllers/AuthController.php
+++ b/application/modules/dev/controllers/AuthController.php
@@ -110,8 +110,9 @@ class dev_AuthController extends Zend_Controller_Action
 		$this->_helper-> viewRenderer-> setNoRender();
 		$auth = Zend_Auth::getInstance();
 		$auth->clearIdentity();
-		$this->_helper->redirector('login', 'auth');
+		Zend_Session::namespaceUnset('userIDs');
 		Zend_Session::forgetMe();
+		$this->_helper->redirector('login', 'auth');
 		return;
 	}
 
@@ -206,25 +207,31 @@ class dev_AuthController extends Zend_Controller_Action
 
 	public function deleteAction()
 	{
-		$this->_helper-> viewRenderer-> setNoRender();
-		$result = $this->personmapper->findBy('email', Zend_Auth::getInstance()->getIdentity());
-		$person = $result[0];
-		$personID = $person["personID"];
-		if (isset($personID)){
-			$this->personmapper = new Application_Model_PersonMapper();
-			$person = $this->personmapper->find($personID);
-			try {
-				$this->personmapper->delete($person);
-			}catch(Zend_Exception $e)
-			{
-				echo "Caught exception: " . get_class($e) . "<br/>";
-				echo "Message: " . $e->getMessage() . "<br/>";
+		if($_POST['confirmdelete']) {
+			$auth = Zend_Auth::getInstance();
+			$result = $this->personmapper->findBy('email', $auth->getIdentity());
+			$person = $result[0];
+			$personID = $person["personID"];
+			if (isset($personID)){
+				$this->personmapper = new Application_Model_PersonMapper();
+				$person = $this->personmapper->find($personID);
+				try {
+					$this->personmapper->delete($person);
+				}catch(Zend_Exception $e)
+				{
+					echo "Caught exception: " . get_class($e) . "<br/>";
+					echo "Message: " . $e->getMessage() . "<br/>";
+					return;
+				}
+				$auth->clearIdentity();
+				Zend_Session::namespaceUnset('userIDs');
+				Zend_Session::forgetMe();
+				$this->_helper->redirector('login', 'auth');
 				return;
 			}
-			$auth = Zend_Auth::getInstance();
-			$auth->clearIdentity();
-			$this->_helper->redirector('login', 'auth');
-			return;
+		} else {
+			$deleteconfirmform = new dev_Form_ConfirmDeleteAccount();
+			$this->view->deleteconfirmform = $deleteconfirmform;
 		}
 	}
 }
diff --git a/application/modules/dev/controllers/RoleController.php b/application/modules/dev/controllers/RoleController.php
index 709d623..65989b6 100644
--- a/application/modules/dev/controllers/RoleController.php
+++ b/application/modules/dev/controllers/RoleController.php
@@ -75,6 +75,7 @@ class dev_RoleController extends Zend_Controller_Action
 			$_POST['title'] = $role->getTitle();
 			$_POST['description'] = $role->getDescription();
 			$_POST['groupID'] = $role->getGroupID();
+			$_POST['inheritance'] = $role->getInheritance();
 			$editForm = new dev_Form_RoleEdit();
 		} else {
 			$editForm = new dev_Form_RoleEdit($_POST);