From d5a416be43a2eb5c9b89195370feb0dd9658e5db Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 20 Apr 2012 16:10:27 +0200
Subject: [PATCH] CC-3416 : Create password reset form

---
 .../application/controllers/LoginController.php   |  4 ++--
 airtime_mvc/application/models/Auth.php           |  2 ++
 .../views/scripts/form/password-change.phtml      | 15 +++++++++++++++
 .../views/scripts/form/password-restore.phtml     |  7 +++++++
 .../scripts/login/password-restore-after.phtml    |  2 +-
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index fee77faac..043983ede 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -115,7 +115,7 @@ class LoginController extends Zend_Controller_Action
                 $auth = new Application_Model_Auth();
     
                 $auth->sendPasswordRestoreLink($user, $this->view);
-                $this->_helper->redirector('password-restore-after', 'auth');
+                $this->_helper->redirector('password-restore-after', 'login');
             }
             else {
                 $form->email->addError($this->view->translate("Given email not found."));
@@ -146,7 +146,7 @@ class LoginController extends Zend_Controller_Action
     
         //check validity of token
         if (!$auth->checkToken($user_id, $token, 'password.restore')) {
-            echo "token not valid";
+            Logging::debug("token not valid");
             $this->_helper->redirector('index', 'login');
         }
     
diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php
index 6e5cdb62c..fa2ab8bd3 100644
--- a/airtime_mvc/application/models/Auth.php
+++ b/airtime_mvc/application/models/Auth.php
@@ -16,6 +16,8 @@ class Application_Model_Auth {
 	   $info->setDbCreated(gmdate('Y-m-d H:i:s'));
 	   $info->save();
 	   
+	   Logging::debug("generated token {$token}");
+	   
 	   return $token;
 	}
 	
diff --git a/airtime_mvc/application/views/scripts/form/password-change.phtml b/airtime_mvc/application/views/scripts/form/password-change.phtml
index fdd380884..8214e67a5 100644
--- a/airtime_mvc/application/views/scripts/form/password-change.phtml
+++ b/airtime_mvc/application/views/scripts/form/password-change.phtml
@@ -8,6 +8,14 @@
     <dd id="new-password-element">
       <?php echo $this->element->getElement('password') ?>
     </dd>
+    <?php if($this->element->getElement('password')->hasErrors()): ?>
+        <ul class='errors'>
+            <?php foreach($this->element->getElement('password')->getMessages() as $error): ?>
+                <li><?php echo $error; ?></li>
+            <?php endforeach; ?>
+        </ul>
+    <?php endif; ?>
+    
     <dt id="confirm-password-label">
       <label for="confirm-password" class="required">
           <?php echo $this->element->getElement('password_confirm')->getLabel() ?>
@@ -16,6 +24,13 @@
     <dd id="confirm-password-element">
       <?php echo $this->element->getElement('password_confirm') ?>
     </dd>
+    <?php if($this->element->getElement('password_confirm')->hasErrors()): ?>
+        <ul class='errors'>
+            <?php foreach($this->element->getElement('password_confirm')->getMessages() as $error): ?>
+                <li><?php echo $error; ?></li>
+            <?php endforeach; ?>
+        </ul>
+    <?php endif; ?>
   
     <dt id="submit-label">&nbsp;</dt>
     <dd id="submit-element">
diff --git a/airtime_mvc/application/views/scripts/form/password-restore.phtml b/airtime_mvc/application/views/scripts/form/password-restore.phtml
index ce8d84edd..5c8d099ac 100644
--- a/airtime_mvc/application/views/scripts/form/password-restore.phtml
+++ b/airtime_mvc/application/views/scripts/form/password-restore.phtml
@@ -8,6 +8,13 @@
     <dd id="username-element">
       <?php echo $this->element->getElement('email') ?>
     </dd>
+    <?php if($this->element->getElement('email')->hasErrors()): ?>
+        <ul class='errors'>
+            <?php foreach($this->element->getElement('email')->getMessages() as $error): ?>
+                <li><?php echo $error; ?></li>
+            <?php endforeach; ?>
+        </ul>
+    <?php endif; ?>
 
  
     <dt id="submit-label">&nbsp;</dt>
diff --git a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
index c99394212..5577d3a65 100644
--- a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
@@ -3,6 +3,6 @@
   <h2>Email sent</h2>
   
   <div id="login" class="login-content clearfix">
-    <p class="light">An email has been sent to <?php $this->form->email->getValue() ?></p>
+    <p class="light">An email has been sent</p>
   </div>
 </div>