X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Flostpass.php;h=938d1cbb008ada25359cf6a68514760a2d98fc6f;hb=6abeff10c0d7d39674075f88dffefa379c4d2db9;hp=290ebb1b40daf7d6935dbfe17494f809b2772242;hpb=d85bdd8fb0253e7ee6c99901246eb934aed101c6;p=friendica.git

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 290ebb1b40..938d1cbb00 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -2,6 +2,7 @@
 
 require_once('include/email.php');
 require_once('include/enotify.php');
+require_once('include/text.php');
 
 function lostpass_post(&$a) {
 
@@ -38,28 +39,29 @@ function lostpass_post(&$a) {
 	$siteurl = $a->get_baseurl();
 	$resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password;
 
-	$preamble = t('Dear %1$s,
-	A request was recently received at "%2$s" to reset your account
-password. In order to confirm this request, please select the verification link
-below or paste it into your web browser address bar.
+	$preamble = deindent(t('
+		Dear %1$s,
+			A request was recently received at "%2$s" to reset your account
+		password. In order to confirm this request, please select the verification link
+		below or paste it into your web browser address bar.
 
-If you did NOT request this change, please DO NOT follow the link
-provided and ignore and/or delete this email.
+		If you did NOT request this change, please DO NOT follow the link
+		provided and ignore and/or delete this email.
 
-Your password will not be changed unless we can verify that you
-issued this request.');
-	$body = t('Follow this link to verify your identity:
+		Your password will not be changed unless we can verify that you
+		issued this request.'));
+	$body = deindent(t('
+		Follow this link to verify your identity:
 
-%1$s
+		%1$s
 
-You will then receive a follow-up message containing the new password.
+		You will then receive a follow-up message containing the new password.
+		You may change that password from your account settings page after logging in.
 
-You may change that password from your account settings page after logging in.
+		The login details are as follows:
 
-The login details are as follows:
-
-Site Location:	%2$s
-Login Name:	%3$s');
+		Site Location:	%2$s
+		Login Name:	%3$s'));
 
 	$preamble = sprintf($preamble, $username, $sitename);
 	$body = sprintf($body, $resetlink, $siteurl, $email);
@@ -71,7 +73,6 @@ Login Name:	%3$s');
 		'preamble'=> $preamble,
 		'body' => $body));
 
-
 	goaway(z_root());
 
 }
@@ -88,9 +89,8 @@ function lostpass_content(&$a) {
 			dbesc($hash)
 		);
 		if(! count($r)) {
-			notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
-			goaway(z_root());
-			return;
+			$o =  t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
+			return $o;
 		}
 		$uid = $r[0]['uid'];
 		$username = $r[0]['username'];
@@ -119,22 +119,34 @@ function lostpass_content(&$a) {
 				info("Your password has been reset." . EOL);
 
 
-
-			$email_tpl = get_intltext_template("passchanged_eml.tpl");
-			$email_tpl = replace_macros($email_tpl, array(
-			'$sitename' => $a->config['sitename'],
-			'$siteurl' =>  $a->get_baseurl(),
-			'$username' => $username,
-			'$email' => $email,
-			'$new_password' => $new_password,
-			'$uid' => $newuid ));
-
-			$subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']);
-
-			$res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl,
-				'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
-				. 'Content-type: text/plain; charset=UTF-8' . "\n"
-				. 'Content-transfer-encoding: 8bit' );
+			$sitename = $a->config['sitename'];
+			$siteurl = $a->get_baseurl();
+			// $username, $email, $new_password
+			$preamble = deindent(t('
+				Dear %1$s,
+					Your password has been changed as requested. Please retain this
+				information for your records (or change your password immediately to
+				something that you will remember).
+			'));
+			$body = deindent(t('
+				Your login details are as follows:
+
+				Site Location:	%1$s
+				Login Name:	%2$s
+				Password:	%3$s
+
+				You may change that password from your account settings page after logging in.
+			'));
+
+			$preamble = sprintf($preamble, $username);
+			$body = sprintf($body, $siteurl, $email, $new_password);
+
+			notification(array(
+				'type' => "SYSTEM_EMAIL",
+				'to_email' => $email,
+				'subject'=> sprintf( t('Your password has been changed at %s'),$sitename),
+				'preamble'=> $preamble,
+				'body' => $body));
 
 			return $o;
 		}