summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/AuthController.php
diff options
context:
space:
mode:
authormichael pereira2011-04-12 15:13:01 +0200
committermichael pereira2011-04-12 15:13:01 +0200
commit1d6cfed3b0ebd97aff7fa5153200f6f7eea5bf7a (patch)
tree1a32e5a0dfafa86d7abfa7a550e373f74a391d13 /application/modules/user/controllers/AuthController.php
parentdefault tgz in kcl (diff)
parentfehler in sql korrigiert (diff)
downloadpbs2-1d6cfed3b0ebd97aff7fa5153200f6f7eea5bf7a.tar.gz
pbs2-1d6cfed3b0ebd97aff7fa5153200f6f7eea5bf7a.tar.xz
pbs2-1d6cfed3b0ebd97aff7fa5153200f6f7eea5bf7a.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/AuthController.php')
-rw-r--r--application/modules/user/controllers/AuthController.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/application/modules/user/controllers/AuthController.php b/application/modules/user/controllers/AuthController.php
index bb16e94..d1596ae 100644
--- a/application/modules/user/controllers/AuthController.php
+++ b/application/modules/user/controllers/AuthController.php
@@ -133,6 +133,7 @@ class User_AuthController extends Zend_Controller_Action
if (isset($personID)){
$this->personmapper = new Application_Model_PersonMapper();
$person = $this->personmapper->find($personID);
+ print_r($person);
try {
$this->personmapper->delete($person);
}catch(Zend_Exception $e)
@@ -141,10 +142,14 @@ class User_AuthController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $auth->clearIdentity();
- Zend_Session::namespaceUnset('userIDs');
- Zend_Session::forgetMe();
- $this->_helper->redirector('login', 'auth');
+ if($this->_request->getParam('personID')) {
+ $this->_helper->redirector('', 'person');
+ } else {
+ $auth->clearIdentity();
+ Zend_Session::namespaceUnset('userIDs');
+ Zend_Session::forgetMe();
+ $this->_helper->redirector('login', 'auth');
+ }
return;
}
} else {