summaryrefslogtreecommitdiffstats
path: root/application/modules/dev
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/dev')
-rw-r--r--application/modules/dev/controllers/AuthController.php43
-rw-r--r--application/modules/dev/controllers/RoleController.php1
-rw-r--r--application/modules/dev/forms/AuthRecoverPassword.php2
-rw-r--r--application/modules/dev/forms/ConfirmDeleteAccount.php27
-rw-r--r--application/modules/dev/forms/GroupAdd.php2
-rw-r--r--application/modules/dev/forms/GroupEdit.php2
-rw-r--r--application/modules/dev/forms/GroupLink.php4
-rw-r--r--application/modules/dev/forms/GroupRequest.php2
-rw-r--r--application/modules/dev/forms/GroupSelect.php2
-rw-r--r--application/modules/dev/forms/LinkRight.php4
-rw-r--r--application/modules/dev/forms/PersonEdit.php2
-rw-r--r--application/modules/dev/forms/RoleAdd.php6
-rw-r--r--application/modules/dev/forms/RoleEdit.php21
-rw-r--r--application/modules/dev/layouts/dev.phtml21
-rw-r--r--application/modules/dev/views/scripts/auth/delete.phtml6
-rw-r--r--application/modules/dev/views/scripts/auth/login.phtml1
-rw-r--r--application/modules/dev/views/scripts/auth/recoverpassword.phtml1
-rw-r--r--application/modules/dev/views/scripts/auth/register.phtml1
-rw-r--r--application/modules/dev/views/scripts/group/add.phtml1
-rw-r--r--application/modules/dev/views/scripts/group/edit.phtml3
-rw-r--r--application/modules/dev/views/scripts/group/link.phtml1
-rw-r--r--application/modules/dev/views/scripts/person/edit.phtml1
-rw-r--r--application/modules/dev/views/scripts/person/request.phtml1
-rw-r--r--application/modules/dev/views/scripts/role/add.phtml1
-rw-r--r--application/modules/dev/views/scripts/role/edit.phtml1
-rw-r--r--application/modules/dev/views/scripts/role/groupselect.phtml1
-rw-r--r--application/modules/dev/views/scripts/role/linkright.phtml1
-rw-r--r--application/modules/dev/views/scripts/role/show.phtml2
28 files changed, 116 insertions, 45 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);
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 d773b17..6d43904 100644
--- a/application/modules/dev/forms/RoleAdd.php
+++ b/application/modules/dev/forms/RoleAdd.php
@@ -31,6 +31,10 @@ class dev_Form_RoleAdd extends Zend_Form
'label' => 'Description:',
));
+ $this->addElement('checkbox', 'inheritance', array(
+ 'label' => 'Inheritance:',
+ ));
+
$this->addElement('submit', 'add', array(
'required' => false,
'ignore' => true,
@@ -41,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 2c79050..1a9afc5 100644
--- a/application/modules/dev/forms/RoleEdit.php
+++ b/application/modules/dev/forms/RoleEdit.php
@@ -3,9 +3,9 @@
class dev_Form_RoleEdit extends Zend_Form
{
- public function init()
- {
- $this->setName("RoleEdit");
+ public function init()
+ {
+ $this->setName("RoleEdit");
$this->setMethod('post');
$this->addElement('text', 'title', array(
@@ -28,6 +28,17 @@ class dev_Form_RoleEdit extends Zend_Form
'value' => $_POST['description'],
));
+ if($_POST['inheritance'] == 1) {
+ $this->addElement('checkbox', 'inheritance', array(
+ 'label' => 'Inheritance:',
+ 'checked' => 'checked',
+ ));
+ } else {
+ $this->addElement('checkbox', 'inheritance', array(
+ 'label' => 'Inheritance:',
+ ));
+ }
+
$this->addElement('hidden', 'groupID', array(
'value' => $_POST['groupID'],
));
@@ -42,9 +53,9 @@ 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 29b5306..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
}
@@ -70,15 +70,16 @@ echo $this->headScript()."\n";
<div id="content">
<?php echo $this->layout()->content; ?>
</div>
-</div>
-
-<div id="footer" class="footer flexbox flex">
- <div style='padding:5px;'>
- <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> //
- <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> //
- <i>version: 0.1.1</i>
- </div>
-</div>
+
+ <div id="footer" class="footer flexbox flex">
+ <div style='padding:5px;'>
+ <a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">display Debug</a> //
+ <i>last edit: <?php echo date("m\/Y",filectime('index.php'));?></i> //
+ <i>version: 0.1.1</i>
+ </div>
+ </div>
+</div>
+
<div id='debug'>
<div class='v1'>
<a onclick="$('#debug .v1').toggle();$('#debug .v2').toggle();">
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 dd3acbe..6b042e1 100644
--- a/application/modules/dev/views/scripts/group/edit.phtml
+++ b/application/modules/dev/views/scripts/group/edit.phtml
@@ -1,6 +1,7 @@
+<h1>Edit Group</h1>
<?php
if(isset($this->addForm)) {
- $this->addForm->setAction('/etc/group/add');
+ $this->addForm->setAction('/dev/group/add');
echo $this->addForm;
}
else {
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;
diff --git a/application/modules/dev/views/scripts/role/show.phtml b/application/modules/dev/views/scripts/role/show.phtml
index 93f2782..38e6023 100644
--- a/application/modules/dev/views/scripts/role/show.phtml
+++ b/application/modules/dev/views/scripts/role/show.phtml
@@ -13,10 +13,12 @@ if($this->roleID) {
<tr>
<th>Title</th>
<th>Description</th>
+ <th>Inheritance</th>
</tr>
<tr class="entry">
<td><?php echo $this->role->getTitle(); ?></td>
<td><?php echo $this->role->getDescription(); ?></td>
+ <td><?php if($this->role->getInheritance() == 1) echo "yes"; else echo "no"; ?></td>
</tr>
</table>
<br />
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2024-07-11 02:43:00 +0200