diff options
Diffstat (limited to 'application/modules/dev')
26 files changed, 81 insertions, 30 deletions
diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php index 0edb78c..078a4cf 100644 --- a/application/modules/dev/controllers/AuthController.php +++ b/application/modules/dev/controllers/AuthController.php @@ -207,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/forms/AuthRecoverPassword.php b/application/modules/dev/forms/AuthRecoverPassword.php index a1de7ea..35779fc 100644 --- a/application/modules/dev/forms/AuthRecoverPassword.php +++ b/application/modules/dev/forms/AuthRecoverPassword.php @@ -19,7 +19,7 @@ class dev_Form_AuthRecoverPassword extends Zend_Form $this->addElement('submit', 'recoverPassword', array( 'required' => false, 'ignore' => true, - 'label' => 'Recover Password', + 'label' => 'Recover', )); } diff --git a/application/modules/dev/forms/ConfirmDeleteAccount.php b/application/modules/dev/forms/ConfirmDeleteAccount.php new file mode 100644 index 0000000..c093996 --- /dev/null +++ b/application/modules/dev/forms/ConfirmDeleteAccount.php @@ -0,0 +1,27 @@ +<?php + +class dev_Form_ConfirmDeleteAccount extends Zend_Form +{ + + public function init() + { + $this->setName("ConfirmDeleteAccount"); + $this->setMethod('post'); + + $this->addElement('submit', 'confirmdelete', array( + 'required' => false, + 'ignore' => true, + 'label' => 'Confirm', + )); + + $this->addElement('button', 'cancel', array( + 'required' => false, + 'ignore' => true, + 'label' => 'Cancel', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', + )); + } + + +} + diff --git a/application/modules/dev/forms/GroupAdd.php b/application/modules/dev/forms/GroupAdd.php index a235b56..8132f3a 100644 --- a/application/modules/dev/forms/GroupAdd.php +++ b/application/modules/dev/forms/GroupAdd.php @@ -56,7 +56,7 @@ class dev_Form_GroupAdd extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/group/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/GroupEdit.php b/application/modules/dev/forms/GroupEdit.php index f2f51a4..96784de 100644 --- a/application/modules/dev/forms/GroupEdit.php +++ b/application/modules/dev/forms/GroupEdit.php @@ -39,7 +39,7 @@ class dev_Form_GroupEdit extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/group/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/GroupLink.php b/application/modules/dev/forms/GroupLink.php index 81c2dbe..8a65e77 100644 --- a/application/modules/dev/forms/GroupLink.php +++ b/application/modules/dev/forms/GroupLink.php @@ -24,7 +24,7 @@ class dev_Form_GroupLink extends Zend_Form } $groupfield->setRegisterInArrayValidator(false); $this->addElement($groupfield); - + $groupfield1 = $this->createElement('select','superordinatedGroupID'); $groupfield1 ->setLabel('superordinated Group:'); @@ -46,7 +46,7 @@ class dev_Form_GroupLink extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/group/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/GroupRequest.php b/application/modules/dev/forms/GroupRequest.php index efaafaf..2c12aaf 100644 --- a/application/modules/dev/forms/GroupRequest.php +++ b/application/modules/dev/forms/GroupRequest.php @@ -33,7 +33,7 @@ class dev_Form_GroupRequest extends Zend_Form $this->addElement('submit', 'request', array( 'required' => false, 'ignore' => true, - 'label' => 'Request Membership', + 'label' => 'Request', )); } diff --git a/application/modules/dev/forms/GroupSelect.php b/application/modules/dev/forms/GroupSelect.php index 1eaf455..be28997 100644 --- a/application/modules/dev/forms/GroupSelect.php +++ b/application/modules/dev/forms/GroupSelect.php @@ -33,7 +33,7 @@ class dev_Form_GroupSelect extends Zend_Form $this->addElement('submit', 'selectgroup', array( 'required' => false, 'ignore' => true, - 'label' => 'Select Group', + 'label' => 'Select', )); } diff --git a/application/modules/dev/forms/LinkRight.php b/application/modules/dev/forms/LinkRight.php index 8b9c3a9..0745791 100644 --- a/application/modules/dev/forms/LinkRight.php +++ b/application/modules/dev/forms/LinkRight.php @@ -32,14 +32,14 @@ class dev_Form_LinkRight extends Zend_Form $this->addElement('submit', 'link', array( 'required' => false, 'ignore' => true, - 'label' => 'Add Right', + 'label' => 'Add', )); $this->addElement('button', 'cancel', array( 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/role/show/roleID/' . $this->roleID . '"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/PersonEdit.php b/application/modules/dev/forms/PersonEdit.php index aa39c34..c04f418 100644 --- a/application/modules/dev/forms/PersonEdit.php +++ b/application/modules/dev/forms/PersonEdit.php @@ -108,7 +108,7 @@ class dev_Form_PersonEdit extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/person/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/RoleAdd.php b/application/modules/dev/forms/RoleAdd.php index 7aae426..6d43904 100644 --- a/application/modules/dev/forms/RoleAdd.php +++ b/application/modules/dev/forms/RoleAdd.php @@ -45,7 +45,7 @@ class dev_Form_RoleAdd extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/role/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/forms/RoleEdit.php b/application/modules/dev/forms/RoleEdit.php index c0617b7..1a9afc5 100644 --- a/application/modules/dev/forms/RoleEdit.php +++ b/application/modules/dev/forms/RoleEdit.php @@ -53,7 +53,7 @@ class dev_Form_RoleEdit extends Zend_Form 'required' => false, 'ignore' => true, 'label' => 'Cancel', - 'onclick' => 'location.href="/dev/role/"', + 'onclick' => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"', )); } diff --git a/application/modules/dev/layouts/dev.phtml b/application/modules/dev/layouts/dev.phtml index b9bd27a..944c617 100644 --- a/application/modules/dev/layouts/dev.phtml +++ b/application/modules/dev/layouts/dev.phtml @@ -43,7 +43,7 @@ echo $this->headScript()."\n"; <li class='navTreeItem'><a href='/dev/auth/register'>Register</a></li> <?php } else {?> - <li class='navTreeItem'><a href='/dev/auth/delete'>Account Löschen</a></li> + <li class='navTreeItem'><a href='/dev/auth/delete'>Delete Account</a></li> <li class='navTreeItem'><a href='/dev/auth/logout'>Logout</a></li> <?php } diff --git a/application/modules/dev/views/scripts/auth/delete.phtml b/application/modules/dev/views/scripts/auth/delete.phtml new file mode 100644 index 0000000..62bf24e --- /dev/null +++ b/application/modules/dev/views/scripts/auth/delete.phtml @@ -0,0 +1,6 @@ +<h1>Delete Account</h1> +Do you really want to delete this account? +<?php +$this->deleteconfirmform->setAction($this->url()); +echo $this->deleteconfirmform; +?>
\ No newline at end of file diff --git a/application/modules/dev/views/scripts/auth/login.phtml b/application/modules/dev/views/scripts/auth/login.phtml index 815cda4..e22bd0b 100644 --- a/application/modules/dev/views/scripts/auth/login.phtml +++ b/application/modules/dev/views/scripts/auth/login.phtml @@ -1,3 +1,4 @@ +<h1>Login</h1> <?php $this->loginForm->setAction($this->url()); echo $this->loginForm; diff --git a/application/modules/dev/views/scripts/auth/recoverpassword.phtml b/application/modules/dev/views/scripts/auth/recoverpassword.phtml index 881e00e..089aec3 100644 --- a/application/modules/dev/views/scripts/auth/recoverpassword.phtml +++ b/application/modules/dev/views/scripts/auth/recoverpassword.phtml @@ -1,3 +1,4 @@ +<h1>Recover Password</h1> <?php $this->recoverPasswordForm->setAction($this->url()); echo $this->recoverPasswordForm; diff --git a/application/modules/dev/views/scripts/auth/register.phtml b/application/modules/dev/views/scripts/auth/register.phtml index 5196738..74c7df5 100644 --- a/application/modules/dev/views/scripts/auth/register.phtml +++ b/application/modules/dev/views/scripts/auth/register.phtml @@ -1,3 +1,4 @@ +<h1>New Account</h1> <?php $this->registerForm->setAction($this->url()); echo $this->registerForm; diff --git a/application/modules/dev/views/scripts/group/add.phtml b/application/modules/dev/views/scripts/group/add.phtml index 4f96cf0..588ce31 100644 --- a/application/modules/dev/views/scripts/group/add.phtml +++ b/application/modules/dev/views/scripts/group/add.phtml @@ -1,3 +1,4 @@ +<h1>Add Group</h1> <?php $this->addForm->setAction($this->url()); echo $this->addForm; diff --git a/application/modules/dev/views/scripts/group/edit.phtml b/application/modules/dev/views/scripts/group/edit.phtml index a0f9b32..6b042e1 100644 --- a/application/modules/dev/views/scripts/group/edit.phtml +++ b/application/modules/dev/views/scripts/group/edit.phtml @@ -1,3 +1,4 @@ +<h1>Edit Group</h1> <?php if(isset($this->addForm)) { $this->addForm->setAction('/dev/group/add'); diff --git a/application/modules/dev/views/scripts/group/link.phtml b/application/modules/dev/views/scripts/group/link.phtml index 94ad343..5bb2a9d 100644 --- a/application/modules/dev/views/scripts/group/link.phtml +++ b/application/modules/dev/views/scripts/group/link.phtml @@ -1,3 +1,4 @@ +<h1>Link Groups</h1> <?php $this->linkForm->setAction($this->url()); echo $this->linkForm; diff --git a/application/modules/dev/views/scripts/person/edit.phtml b/application/modules/dev/views/scripts/person/edit.phtml index 955ed35..3e666d4 100644 --- a/application/modules/dev/views/scripts/person/edit.phtml +++ b/application/modules/dev/views/scripts/person/edit.phtml @@ -1,3 +1,4 @@ +<h1>Edit Person</h1> <?php $this->editForm->setAction($this->url()); echo $this->editForm; diff --git a/application/modules/dev/views/scripts/person/request.phtml b/application/modules/dev/views/scripts/person/request.phtml index 2da570f..91a625b 100644 --- a/application/modules/dev/views/scripts/person/request.phtml +++ b/application/modules/dev/views/scripts/person/request.phtml @@ -1,3 +1,4 @@ +<h1>Request Membership</h1> <?php if(count($this->requestForm->getGrouplist())>0) { $this->requestForm->setAction($this->url()); diff --git a/application/modules/dev/views/scripts/role/add.phtml b/application/modules/dev/views/scripts/role/add.phtml index 4f96cf0..23d4c55 100644 --- a/application/modules/dev/views/scripts/role/add.phtml +++ b/application/modules/dev/views/scripts/role/add.phtml @@ -1,3 +1,4 @@ +<h1>Add Role</h1> <?php $this->addForm->setAction($this->url()); echo $this->addForm; diff --git a/application/modules/dev/views/scripts/role/edit.phtml b/application/modules/dev/views/scripts/role/edit.phtml index c976a90..59482f0 100644 --- a/application/modules/dev/views/scripts/role/edit.phtml +++ b/application/modules/dev/views/scripts/role/edit.phtml @@ -1,3 +1,4 @@ +<h1>Edit Role</h1> <?php if(isset($this->addForm)) { $this->addForm->setAction('/etc/role/add'); diff --git a/application/modules/dev/views/scripts/role/groupselect.phtml b/application/modules/dev/views/scripts/role/groupselect.phtml index fe81758..d1c08fd 100644 --- a/application/modules/dev/views/scripts/role/groupselect.phtml +++ b/application/modules/dev/views/scripts/role/groupselect.phtml @@ -1,3 +1,4 @@ +<h1>Select Group</h1> <?php $this->groupSelectForm->setAction($this->url()); echo $this->groupSelectForm; diff --git a/application/modules/dev/views/scripts/role/linkright.phtml b/application/modules/dev/views/scripts/role/linkright.phtml index 94ad343..38c0d45 100644 --- a/application/modules/dev/views/scripts/role/linkright.phtml +++ b/application/modules/dev/views/scripts/role/linkright.phtml @@ -1,3 +1,4 @@ +<h1>Add Right</h1> <?php $this->linkForm->setAction($this->url()); echo $this->linkForm; |