überschriften hinzugefügt, andere Fehler korrigiert

11 files changed, 43 insertions, 43 deletions

diff --git a/application/modules/user/forms/ConfirmDeleteAccount.php b/application/modules/user/forms/ConfirmDeleteAccount.php
new file mode 100644
index 0000000..7bf5a32
--- /dev/null
+++ b/application/modules/user/forms/ConfirmDeleteAccount.php
@@ -0,0 +1,27 @@
+<?php
+
+class user_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/user/forms/GroupAdd.php b/application/modules/user/forms/GroupAdd.php
index 47855de..ff2b97a 100644
--- a/application/modules/user/forms/GroupAdd.php
+++ b/application/modules/user/forms/GroupAdd.php
@@ -56,7 +56,7 @@ class user_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/user/forms/GroupEdit.php b/application/modules/user/forms/GroupEdit.php
index 0da0f61..4f0d7fc 100644
--- a/application/modules/user/forms/GroupEdit.php
+++ b/application/modules/user/forms/GroupEdit.php
@@ -40,29 +40,11 @@ class user_Form_GroupEdit extends Zend_Form
             'label'    => 'Save',
 		));
 
-		if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show')) {
-			if(strpos($_SERVER['HTTP_REFERER'], '/groupID/')) {
-				$this->addElement('button', 'cancel', array(
+		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/show/groupID/' . $this->groupID . '"',
-				));
-			} else {
-				$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/show/"',
-				));
-			}
-		} else {
-			$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/showall"',
-			));
-		}
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
 	}
 }
\ No newline at end of file
diff --git a/application/modules/user/forms/GroupLink.php b/application/modules/user/forms/GroupLink.php
index d2aafcc..9db7ce4 100644
--- a/application/modules/user/forms/GroupLink.php
+++ b/application/modules/user/forms/GroupLink.php
@@ -46,7 +46,7 @@ class user_Form_GroupLink extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/group/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/GroupRequest.php b/application/modules/user/forms/GroupRequest.php
index 2cdada0..c9ba273 100644
--- a/application/modules/user/forms/GroupRequest.php
+++ b/application/modules/user/forms/GroupRequest.php
@@ -33,14 +33,14 @@ class user_Form_GroupRequest extends Zend_Form
 		$this->addElement('submit', 'request', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Request Membership',
+            'label'    => 'Request',
 		));
 
 		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/person/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 
 	}
diff --git a/application/modules/user/forms/LinkRight.php b/application/modules/user/forms/LinkRight.php
index 139aee4..a7b28b1 100644
--- a/application/modules/user/forms/LinkRight.php
+++ b/application/modules/user/forms/LinkRight.php
@@ -32,14 +32,14 @@ class user_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="/user/role/show/roleID/' . $this->roleID . '"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/MembershipSelect.php b/application/modules/user/forms/MembershipSelect.php
index fe6870a..b4b54c4 100644
--- a/application/modules/user/forms/MembershipSelect.php
+++ b/application/modules/user/forms/MembershipSelect.php
@@ -33,7 +33,7 @@ class user_Form_MembershipSelect extends Zend_Form
 		$this->addElement('submit', 'selectmembership', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Select Membership',
+            'label'    => 'Select',
 		));
 	}
 
diff --git a/application/modules/user/forms/PersonEdit.php b/application/modules/user/forms/PersonEdit.php
index d6c68e7..a6bd123 100644
--- a/application/modules/user/forms/PersonEdit.php
+++ b/application/modules/user/forms/PersonEdit.php
@@ -108,7 +108,7 @@ class user_Form_PersonEdit extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/person/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/RecoverPassword.php b/application/modules/user/forms/RecoverPassword.php
index 90feb87..22a775f 100644
--- a/application/modules/user/forms/RecoverPassword.php
+++ b/application/modules/user/forms/RecoverPassword.php
@@ -19,7 +19,7 @@ class user_Form_RecoverPassword extends Zend_Form
 		$this->addElement('submit', 'recoverPassword', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Recover Password',
+            'label'    => 'Recover',
 		));
 	}
 
diff --git a/application/modules/user/forms/RoleAdd.php b/application/modules/user/forms/RoleAdd.php
index a7e43a7..e8e99a5 100644
--- a/application/modules/user/forms/RoleAdd.php
+++ b/application/modules/user/forms/RoleAdd.php
@@ -45,7 +45,7 @@ class user_Form_RoleAdd extends Zend_Form
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/"',
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
 		));
 	}
 
diff --git a/application/modules/user/forms/RoleEdit.php b/application/modules/user/forms/RoleEdit.php
index 848dba3..0bdc977 100644
--- a/application/modules/user/forms/RoleEdit.php
+++ b/application/modules/user/forms/RoleEdit.php
@@ -54,21 +54,12 @@ class user_Form_RoleEdit extends Zend_Form
             'label'    => 'Save',
 		));
 
-		if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show/roleID')) {
-			$this->addElement('button', 'cancel', array(
+		$this->addElement('button', 'cancel', array(
             'required' => false,
             'ignore'   => true,
             'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/show/roleID/' . $this->roleID . '"',
-			));
-		} else {
-			$this->addElement('button', 'cancel', array(
-            'required' => false,
-            'ignore'   => true,
-            'label'    => 'Cancel',
-			'onclick'   => 'location.href="/user/role/"',
-			));
-		}
+			'onclick'   => 'location.href="' . $_SERVER['HTTP_REFERER'] . '"',
+		));
 	}