X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Flostpass.php;h=b71398fa4b5b79e7c13619750ec3a6d66e984117;hb=caffb217c1e7227137ac1575af369b34d10519fe;hp=3dcf41be733ef6b735a484008a3cf2deb8e40444;hpb=878bdeccfd66b7b8229fd761c23ba13bc51c7454;p=friendica.git

diff --git a/mod/lostpass.php b/mod/lostpass.php
old mode 100644
new mode 100755
index 3dcf41be73..b71398fa4b
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -5,14 +5,18 @@ function lostpass_post(&$a) {
 
 	$email = notags(trim($_POST['login-name']));
 	if(! $email)
-		goaway($a->get_baseurl());
+		goaway(z_root());
 
-	$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) LIMIT 1",
+	$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1",
 		dbesc($email),
 		dbesc($email)
 	);
-	if(! count($r))
-		goaway($a->get_baseurl());
+
+	if(! count($r)) {
+		notice( t('No valid account found.') . EOL);
+		goaway(z_root());
+	}
+
 	$uid = $r[0]['uid'];
 	$username = $r[0]['username'];
 
@@ -24,9 +28,9 @@ function lostpass_post(&$a) {
 		intval($uid)
 	);
 	if($r)
-		notice("Password reset request issued. Check your email.");
+		info( t('Password reset request issued. Check your email.') . EOL);
 
-	$email_tpl = load_view_file("view/lostpass_eml.tpl");
+	$email_tpl = get_intltext_template("lostpass_eml.tpl");
 	$email_tpl = replace_macros($email_tpl, array(
 			'$sitename' => $a->config['sitename'],
 			'$siteurl' =>  $a->get_baseurl(),
@@ -35,10 +39,14 @@ function lostpass_post(&$a) {
 			'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
 	));
 
-	$res = mail($email, sprintf(t('Password reset requested at %s'),$a->config['sitename']),
-			$email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
+	$res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']),
+			$email_tpl,
+			'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+			. 'Content-type: text/plain; charset=UTF-8' . "\n"
+			. 'Content-transfer-encoding: 8bit' );
 
-	goaway($a->get_baseurl());
+
+	goaway(z_root());
 }
 
 
@@ -53,8 +61,8 @@ function lostpass_content(&$a) {
 			dbesc($hash)
 		);
 		if(! count($r)) {
-			notice("Request could not be verified. (You may have previously submitted it.) Password reset failed." . EOL);
-			goaway($a->get_baseurl());
+			notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL);
+			goaway(z_root());
 			return;
 		}
 		$uid = $r[0]['uid'];
@@ -69,16 +77,23 @@ function lostpass_content(&$a) {
 			intval($uid)
 		);
 		if($r) {
-			$tpl = load_view_file('view/pwdreset.tpl');
+			$tpl = get_markup_template('pwdreset.tpl');
 			$o .= replace_macros($tpl,array(
+				'$lbl1' => t('Password Reset'),
+				'$lbl2' => t('Your password has been reset as requested.'),
+				'$lbl3' => t('Your new password is'),
+				'$lbl4' => t('Save or copy your new password - and then'),
+				'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+				'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 				'$newpass' => $new_password,
 				'$baseurl' => $a->get_baseurl()
+
 			));
-				notice("Your password has been reset." . EOL);
+				info("Your password has been reset." . EOL);
 
 
 
-			$email_tpl = load_view_file("view/passchanged_eml.tpl");
+			$email_tpl = get_intltext_template("passchanged_eml.tpl");
 			$email_tpl = replace_macros($email_tpl, array(
 			'$sitename' => $a->config['sitename'],
 			'$siteurl' =>  $a->get_baseurl(),
@@ -87,18 +102,26 @@ function lostpass_content(&$a) {
 			'$new_password' => $new_password,
 			'$uid' => $newuid ));
 
-			$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
+			$res = mail($email,"Your password has changed at {$a->config['sitename']}",$email_tpl,
+				'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+				. 'Content-type: text/plain; charset=UTF-8' . "\n"
+				. 'Content-transfer-encoding: 8bit' );
 
 			return $o;
 		}
 	
 	}
 	else {
-		$tpl = load_view_file('view/lostpass.tpl');
+		$tpl = get_markup_template('lostpass.tpl');
 
-		$o .= $tpl;
+		$o .= replace_macros($tpl,array(
+			'$title' => t('Forgot your Password?'),
+			'$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'),
+			'$name' => t('Nickname or Email: '),
+			'$submit' => t('Reset') 
+		));
 
 		return $o;
 	}
 
-}
\ No newline at end of file
+}