Passwort Recovery, Mailversand funktioniert wahrscheinlich nicht

2 files changed, 118 insertions, 23 deletions

diff --git a/application/modules/dev/controllers/AuthController.php b/application/modules/dev/controllers/AuthController.php
index b237e38..41952a2 100644
--- a/application/modules/dev/controllers/AuthController.php
+++ b/application/modules/dev/controllers/AuthController.php
@@ -117,31 +117,89 @@ class dev_AuthController extends Zend_Controller_Action
 
 	public function recoverpasswordAction()
 	{
-		if (!isset($_POST["recoverPassword"])){
-			$recoverPasswordForm = new dev_Form_AuthRecoverPassword();
+		if (isset($_POST["savePassword"])){
+			$personID = $_POST['personID'];
+			$recoverPasswordForm = new dev_Form_NewPassword(array("personID" => $personID, $_POST));
+			if ($recoverPasswordForm->isValid($_POST)) {
+				$this->personmapper = new Application_Model_PersonMapper();
+				$person = $this->personmapper->find($personID);
+				$date = new DateTime();
+				$person->setPassword($_POST['password']);
+				$person->setPasswordSalt(MD5($date->getTimestamp()));
+				$person->setPassword(MD5($person->getPassword() . $person->getPasswordSalt()));
+				try {
+					$this->personmapper->save($person);
+				} catch(Zend_Exception $e)
+				{
+					echo "Caught exception: " . get_class($e) . "<br/>";
+					echo "Message: " . $e->getMessage() . "<br/>";
+					echo "Email Address already existing.";
+					return;
+				}
+				$this->_helper->redirector('login', 'auth');
+				return;
+			}
+		} else if(isset($_GET['recoveryid'])) {
+			$recoveryid = $_GET['recoveryid'];
+			$passwordRecoveryMapper = new Application_Model_PasswordRecoveryMapper();
+			$passwordRecovery = $passwordRecoveryMapper->findBy("recoveryID", $recoveryid);
+			if(count($passwordRecovery) > 0) {
+				$passwordRecoveryObject = new Application_Model_PasswordRecovery();
+				$passwordRecoveryObject->setID($passwordRecovery[0]['personID']);
+				$passwordRecoveryObject->setRecoveryID($passwordRecovery[0]['recoveryID']);
+				$personID = $passwordRecoveryObject->getID();
+				$recoverPasswordForm = new dev_Form_NewPassword(array("personID" => $personID));
+				try {
+					$passwordRecoveryMapper->delete($passwordRecoveryObject);
+				} catch(Zend_Exception $e)
+				{
+					echo "Caught exception: " . get_class($e) . "<br/>";
+					echo "Message: " . $e->getMessage() . "<br/>";
+					return;
+				}
+			} else {
+				$this->_helper->redirector('login', 'auth');
+				return;
+			}
 		} else {
-			$recoverPasswordForm = new dev_Form_AuthRecoverPassword($_POST);
-			# Wiederherstellung funktioniert noch nicht!!!
-			/*if ($recoverPasswordForm->isValid($_POST)) {
-			$recoverPasswordForm->getView()->url();
-			$person = new Application_Model_Person($_POST);
-			$this->personmapper = new Application_Model_PersonMapper();
-
-			$result = $this->personmapper->findBy('email', $_POST['email']);
-			$email = $result[0]['email'];
-			$name = $result[0]['firstname'] . ' ' . $result[0]['name'];
-			$url = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->view->url();
-			$recoverid = $this->random(100);
-			$mailbody = 'Um das Passwort zu ändern klicken Sie auf folgenden Link<br /><br /><a href="'. $url . '/auth/recoverpassword/?recoverid='. $recoverid . '">Passwort ändern</a>';		
-			$mail = new Zend_Mail();
-			$mail->setBodyHtml($mailbody, 'utf8');
-			$mail->getBodyHtml()->getContent();
-			$mail->setFrom('admin@local', 'Admin');
-			$mail->addTo($email, $name);
-			$mail->setSubject('Password Wiederherstellung Preboot Server');
-			$mail->send();
+			if (!isset($_POST["recoverPassword"])){
+				$recoverPasswordForm = new dev_Form_AuthRecoverPassword();
+			} else {
+				$recoverPasswordForm = new dev_Form_AuthRecoverPassword($_POST);
+				if ($recoverPasswordForm->isValid($_POST)) {
+					$recoverPasswordForm->getView()->url();
+					$this->personmapper = new Application_Model_PersonMapper();
+					$result = $this->personmapper->findBy('email', $_POST['email']);
+					$person = new Application_Model_Person($result[0]);
+					$person->setID($result[0]['personID']);
+					$email = $person->getEmail();
+					$name = $person->getFirstname() . ' ' . $person->getName();
+					$url = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->view->url();
+					$recoveryid = randomString(100);
+					$mailbody = 'Um das Passwort zu ändern klicken Sie auf folgenden Link<br /><br /><a href="'. $url . '/auth/recoverpassword/?recoveryid='. $recoveryid . '">Passwort ändern</a>';		
+					$mail = new Zend_Mail();
+					$mail->setBodyHtml($mailbody, 'utf8');
+					$mail->getBodyHtml()->getContent();
+					$mail->setFrom('admin@local', 'Admin');
+					$mail->addTo($email, $name);
+					$mail->setSubject('Password Wiederherstellung Preboot Server');
+					$passwordRecoveryMapper = new Application_Model_PasswordRecoveryMapper();
+					$passwordRecoveryObject = new Application_Model_PasswordRecovery();
+					$passwordRecoveryObject->setID($person->getID());
+					$passwordRecoveryObject->setRecoveryID($recoveryid);
+					try {
+						$passwordRecoveryMapper->save($passwordRecoveryObject);
+						$mail->send();
+					}catch(Zend_Exception $e)
+					{
+						echo "Caught exception: " . get_class($e) . "<br/>";
+						echo "Message: " . $e->getMessage() . "<br/>";
+						return;
+					}
+					$this->_helper->redirector('login', 'auth');
+					return;
+				}
 			}
-			*/
 		}
 		$this->view->recoverPasswordForm = $recoverPasswordForm;
 	}
diff --git a/application/modules/dev/forms/NewPassword.php b/application/modules/dev/forms/NewPassword.php
new file mode 100644
index 0000000..1023708
--- /dev/null
+++ b/application/modules/dev/forms/NewPassword.php
@@ -0,0 +1,37 @@
+<?php
+
+class dev_Form_NewPassword extends Zend_Form
+{
+	private $personID;
+
+	public function setPersonID($personID){
+		$this->personID = $personID;
+	}
+
+	public function init()
+	{
+		$this->setName("NewPassword");
+		$this->setMethod('post');
+
+		$this->addElement('hidden', 'personID', array(
+            'value' => $this->personID
+		));
+
+		$this->addElement('password', 'password', array(
+            'filters'    => array('StringTrim'),
+            'validators' => array(
+		array('StringLength', false, array(0, 50)),
+		),
+            'required'   => true,
+            'label'      => 'Password:',
+		));
+
+		$this->addElement('submit', 'savePassword', array(
+            'required' => false,
+            'ignore'   => true,
+            'label'    => 'Save',
+		));
+	}
+
+
+}
\ No newline at end of file