X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=password_reset.php;h=1ee4711ed60bec70588386ecbf5316601f79c036;hb=d5f3d27d84a808f8333822de5662b2cd3a2e322c;hp=ccb1960693b5b02e365a23bc8262a3940e4d1485;hpb=098a79f0819ebb89b7d48df4a6b154af4560f68e;p=timetracker.git

diff --git a/password_reset.php b/password_reset.php
index ccb19606..1ee4711e 100644
--- a/password_reset.php
+++ b/password_reset.php
@@ -38,32 +38,32 @@ if ($auth->isPasswordExternal()) {
 
 $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')));
+$form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('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->get('error.field'), $i18n->get('label.login'));
 
-  if ($errors->IsEmpty()) {
-  	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.
-  	  if (ttValidEmail($cl_login)) {
+  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.
+      if (ttValidEmail($cl_login)) {
         $login = ttUserHelper::getUserByEmail($cl_login);
         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.
     $temp_ref = md5(uniqid());
     ttUserHelper::saveTmpRef($temp_ref, $user->id);
@@ -71,10 +71,10 @@ if ($request->getMethod() == 'POST') {
     $user_i18n = null;
     if ($user->lang != $i18n->lang) {
       $user_i18n = new I18n();
-      $user_i18n->load($user->lang);	
+      $user_i18n->load($user->lang);
     } else
       $user_i18n = &$i18n;
-      
+
     // Where do we email to?
     $receiver = null;
     if ($user->email)
@@ -83,13 +83,13 @@ 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) {
       import('mail.Mailer');
       $sender = new Mailer();
-  	  $sender->setCharSet(CHARSET);
+      $sender->setCharSet(CHARSET);
       $sender->setSender(SENDER);
       $sender->setReceiver("$receiver");
       if ((!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) || ($_SERVER['SERVER_PORT'] == 443))
@@ -99,22 +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;
+        $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'));
-	}
+        $pass_edit_url = $http.'://'.$_SERVER['HTTP_HOST'].'/password_change.php?ref='.$temp_ref;
+
+      $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');
-?>
\ No newline at end of file