summaryrefslogtreecommitdiffstats
path: root/application/modules/dev/forms
diff options
context:
space:
mode:
Diffstat (limited to 'application/modules/dev/forms')
-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
11 files changed, 58 insertions, 16 deletions
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'] . '"',
));
- }
+ }
}