A bit more refactoring.

[timetracker.git] / password_reset.php

diff --git a/password_reset.php b/password_reset.php
index de0a02c..f1780bc 100644 (file)
--- a/password_reset.php
+++ b/password_reset.php
@@ -40,13 +40,13 @@ $form = new Form('resetPasswordForm');
 $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;'));
 $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.reset_password')));
 
-if ($request->getMethod() == 'POST') {
+if ($request->isPost()) {
   $cl_login = $request->getParameter('login');
 
   // Validate user input.
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_login)) $err->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
 
-  if ($errors->IsEmpty()) {
+  if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {
       // User with a specified login was not found.
       // In this case, if login looks like email, try finding user by email.
@@ -55,13 +55,13 @@ if ($request->getMethod() == 'POST') {
         if ($login)
           $cl_login = $login;
         else
-          $errors->add($i18n->getKey('error.no_login'));
+          $err->add($i18n->getKey('error.no_login'));
       } else
-        $errors->add($i18n->getKey('error.no_login'));
+        $err->add($i18n->getKey('error.no_login'));
     }
   }
 
-  if ($errors->IsEmpty()) {
+  if ($err->no()) {
     $user = new ttUser($cl_login); // Note: reusing $user from initialize.php here.
 
     // Prepare and save a temporary reference for user.
@@ -83,7 +83,7 @@ if ($request->getMethod() == 'POST') {
       if (ttValidEmail($cl_login))
         $receiver = $cl_login;
       else
-        $errors->add($i18n->getKey('error.no_email')); 
+        $err->add($i18n->getKey('error.no_email'));
     }
 
     if ($receiver) {
@@ -105,12 +105,12 @@ if ($request->getMethod() == 'POST') {
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
 
-      $sender->setSendType(MAIL_MODE);
+      $sender->setMailMode(MAIL_MODE);
       $res = $sender->send($cl_subject, sprintf($user_i18n->getKey('form.reset_password.email_body'), $pass_edit_url));
       $smarty->assign('result_message', $res ? $i18n->getKey('form.reset_password.message') : $i18n->getKey('error.mail_send'));
     }
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.resetPasswordForm.login.focus()"');