[dev] [commit] r1040 - wwwbase/auth

[automailer at dexonline.ro]

Author: cata
Date: Sat Nov 30 11:10:29 2013
New Revision: 1040

Log:
Fix blank page error on the password recovery page.

Modified:
   wwwbase/auth/parola-uitata.php

Modified: wwwbase/auth/parola-uitata.php
==============================================================================
--- wwwbase/auth/parola-uitata.php	Mon Nov 25 15:24:11 2013	(r1039)
+++ wwwbase/auth/parola-uitata.php	Sat Nov 30 11:10:29 2013	(r1040)
@@ -13,31 +13,39 @@
 SmartyWrap::assign('page_title', 'Parolă uitată');
 SmartyWrap::assign('suggestHiddenSearchForm', true);
 
-if (!$submitButton) {
-  SmartyWrap::displayCommonPageWithSkin('auth/parola-uitata.ihtml');
-} else if (!$email) {
-  FlashMessage::add('Trebuie să introduceți o adresă de e-mail.');
-} else {
-  $user = User::get_by_email($email);
-  if ($user) {
-    log_userLog("Password recovery requested for $email from " . $_SERVER['REMOTE_ADDR']);
-    
-    // Create the token
-    $pt = Model::factory('PasswordToken')->create();
-    $pt->userId = $user->id;
-    $pt->token = util_randomCapitalLetterString(20);
-    $pt->save();
-    
-    // Send email
-    SmartyWrap::assign('homePage', util_getFullServerUrl());
-    SmartyWrap::assign('token', $pt->token);
-    $body = SmartyWrap::fetch('email/resetPassword.ihtml');
-    $ourEmail = Config::get('global.contact');
-    $result = mail($email, "Schimbarea parolei pentru DEX online", $body, "From: DEX online <$ourEmail>\r\nReply-To: $ourEmail");
-    
-    // Display a confirmation even for incorrect addresses.
-    SmartyWrap::displayCommonPageWithSkin('auth/passwordRecoveryEmailSent.ihtml');
+if ($submitButton) {
+  if (!$email) {
+    FlashMessage::add('Trebuie să introduceți o adresă de e-mail.');
+    SmartyWrap::displayCommonPageWithSkin('auth/parola-uitata.ihtml');
+  } else {
+    $user = User::get_by_email($email);
+    if ($user) {
+      log_userLog("Password recovery requested for $email from " . $_SERVER['REMOTE_ADDR']);
+
+      // Create the token
+      $pt = Model::factory('PasswordToken')->create();
+      $pt->userId = $user->id;
+      $pt->token = util_randomCapitalLetterString(20);
+      $pt->save();
+
+      // Send email
+      SmartyWrap::assign('homePage', util_getFullServerUrl());
+      SmartyWrap::assign('token', $pt->token);
+      $body = SmartyWrap::fetch('email/resetPassword.ihtml');
+      $ourEmail = Config::get('global.contact');
+      $headers = array("From: DEX online <$ourEmail>", "Reply-To: $ourEmail", 'Content-Type: text/plain; charset=UTF-8');
+      $result = mail($email, "Schimbarea parolei pentru DEX online", $body, implode("\r\n", $headers));
+
+      // Display a confirmation even for incorrect addresses.
+      SmartyWrap::displayCommonPageWithSkin('auth/passwordRecoveryEmailSent.ihtml');
+    } else {
+      FlashMessage::add('Nu există niciun utilizator cu e-mailul introdus.');
+      SmartyWrap::displayCommonPageWithSkin('auth/parola-uitata.ihtml');
+    }
   }
+} else {
+  SmartyWrap::displayCommonPageWithSkin('auth/parola-uitata.ihtml');
 }
 
+
 ?>