X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=password_reset.php;h=4d4e2486770576d3a03512905ac92f9132c46415;hb=e23ea8f905bd9122e5c52a3457d05ebb20f6570b;hp=de0a02c1a35a51066b4f9af67ae089ee9fb23146;hpb=d26c95718cac0a2994ab4e9633b59f420a0816b4;p=timetracker.git

diff --git a/password_reset.php b/password_reset.php
index de0a02c1..4d4e2486 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -36,17 +36,17 @@ if ($auth->isPasswordExternal()) {
   exit();
 }
 
-$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')));
+$cl_login = $request->getParameter('login');
 
-if ($request->getMethod() == 'POST') {
-  $cl_login = $request->getParameter('login');
+$form = new Form('resetPasswordForm');
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'login','style'=>'width: 300px;','value'=>$cl_login));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.reset_password')));
 
+if ($request->isPost()) {
   // Validate user input.
-  if (!ttValidString($cl_login)) $errors->add($i18n->getKey('error.field'), $i18n->getKey('label.login'));
+  if (!ttValidString($cl_login)) $err->add($i18n->get('error.field'), $i18n->get('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->get('error.no_login'));
       } else
-        $errors->add($i18n->getKey('error.no_login'));
+        $err->add($i18n->get('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->get('error.no_email'));
     }
 
     if ($receiver) {
@@ -99,21 +99,21 @@ if ($request->getMethod() == 'POST') {
       else
         $http = 'http';
 
-      $cl_subject = $user_i18n->getKey('form.reset_password.email_subject');
+      $cl_subject = $user_i18n->get('form.reset_password.email_subject');
       if (APP_NAME)
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/'.APP_NAME.'/password_change.php?ref='.$temp_ref;
       else
         $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
 
-      $sender->setSendType(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'));
+      $sender->setMailMode(MAIL_MODE);
+      $res = $sender->send($cl_subject, sprintf($user_i18n->get('form.reset_password.email_body'), $_SERVER['REMOTE_ADDR'], $pass_edit_url));
+      $smarty->assign('result_message', $res ? $i18n->get('form.reset_password.message') : $i18n->get('error.mail_send'));
     }
   }
-}
+} // isPost
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="document.resetPasswordForm.login.focus()"');
-$smarty->assign('title', $i18n->getKey('title.reset_password'));
+$smarty->assign('title', $i18n->get('title.reset_password'));
 $smarty->assign('content_page_name', 'password_reset.tpl');
 $smarty->display('index.tpl');