From 9a0c37eb47cde20f532d7dcac583ca95a8cd4d24 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 7 Sep 2014 11:20:06 +0200
Subject: [PATCH] new password mail via notification() new
 include/text.php::deindent() function remove unused templates

---
 include/Emailer.php                    |  2 +-
 include/text.php                       | 19 ++++++
 mod/lostpass.php                       | 83 +++++++++++++++-----------
 view/ca/passchanged_eml.tpl            | 19 ------
 view/ca/smarty3/passchanged_eml.tpl    | 20 -------
 view/cs/passchanged_eml.tpl            | 14 -----
 view/cs/smarty3/passchanged_eml.tpl    | 15 -----
 view/de/passchanged_eml.tpl            | 20 -------
 view/de/smarty3/passchanged_eml.tpl    | 21 -------
 view/en/passchanged_eml.tpl            | 20 -------
 view/en/smarty3/passchanged_eml.tpl    | 21 -------
 view/eo/passchanged_eml.tpl            | 20 -------
 view/eo/smarty3/passchanged_eml.tpl    | 21 -------
 view/es/passchanged_eml.tpl            | 19 ------
 view/es/smarty3/passchanged_eml.tpl    | 20 -------
 view/fr/passchanged_eml.tpl            | 20 -------
 view/fr/smarty3/passchanged_eml.tpl    | 21 -------
 view/is/passchanged_eml.tpl            | 20 -------
 view/is/smarty3/passchanged_eml.tpl    | 21 -------
 view/it/smarty3/passchanged_eml.tpl    | 20 -------
 view/nb-no/passchanged_eml.tpl         | 20 -------
 view/nb-no/smarty3/passchanged_eml.tpl | 21 -------
 view/nl/passchanged_eml.tpl            | 20 -------
 view/pl/passchanged_eml.tpl            | 20 -------
 view/pl/smarty3/passchanged_eml.tpl    | 21 -------
 view/ro/smarty3/passchanged_eml.tpl    | 20 -------
 view/sv/passchanged_eml.tpl            | 18 ------
 view/sv/smarty3/passchanged_eml.tpl    | 19 ------
 view/zh-cn/passchanged_eml.tpl         | 20 -------
 view/zh-cn/smarty3/passchanged_eml.tpl | 21 -------
 30 files changed, 67 insertions(+), 569 deletions(-)
 delete mode 100644 view/ca/passchanged_eml.tpl
 delete mode 100644 view/ca/smarty3/passchanged_eml.tpl
 delete mode 100644 view/cs/passchanged_eml.tpl
 delete mode 100644 view/cs/smarty3/passchanged_eml.tpl
 delete mode 100644 view/de/passchanged_eml.tpl
 delete mode 100644 view/de/smarty3/passchanged_eml.tpl
 delete mode 100644 view/en/passchanged_eml.tpl
 delete mode 100644 view/en/smarty3/passchanged_eml.tpl
 delete mode 100644 view/eo/passchanged_eml.tpl
 delete mode 100644 view/eo/smarty3/passchanged_eml.tpl
 delete mode 100644 view/es/passchanged_eml.tpl
 delete mode 100644 view/es/smarty3/passchanged_eml.tpl
 delete mode 100644 view/fr/passchanged_eml.tpl
 delete mode 100644 view/fr/smarty3/passchanged_eml.tpl
 delete mode 100644 view/is/passchanged_eml.tpl
 delete mode 100644 view/is/smarty3/passchanged_eml.tpl
 delete mode 100644 view/it/smarty3/passchanged_eml.tpl
 delete mode 100644 view/nb-no/passchanged_eml.tpl
 delete mode 100644 view/nb-no/smarty3/passchanged_eml.tpl
 delete mode 100644 view/nl/passchanged_eml.tpl
 delete mode 100644 view/pl/passchanged_eml.tpl
 delete mode 100644 view/pl/smarty3/passchanged_eml.tpl
 delete mode 100644 view/ro/smarty3/passchanged_eml.tpl
 delete mode 100644 view/sv/passchanged_eml.tpl
 delete mode 100644 view/sv/smarty3/passchanged_eml.tpl
 delete mode 100644 view/zh-cn/passchanged_eml.tpl
 delete mode 100644 view/zh-cn/smarty3/passchanged_eml.tpl

diff --git a/include/Emailer.php b/include/Emailer.php
index a5b600e36f..2baa279802 100644
--- a/include/Emailer.php
+++ b/include/Emailer.php
@@ -56,7 +56,7 @@ class Emailer {
 			$messageHeader									// message headers
 		);
 		logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
-		logger("return value " . $res, LOGGER_DEBUG);
+		logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);
 	}
 }
 ?>
diff --git a/include/text.php b/include/text.php
index 84195b0362..00cbc2b592 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2229,3 +2229,22 @@ function is_a_date_arg($s) {
 	}
 	return false;
 }
+
+/**
+ * remove intentation from a text
+ */
+function deindent($text, $chr="[\t ]", $count=NULL) {
+	$text = fix_mce_lf($text);
+	$lines = explode("\n", $text);
+	if (is_null($count)) {
+		$m = array();
+		$k=0; while($k<count($lines) && strlen($lines[$k])==0) $k++;
+		preg_match("|^".$chr."*|", $lines[$k], $m);
+		$count = strlen($m[0]);
+	}
+	for ($k=0; $k<count($lines); $k++){
+		$lines[$k] = preg_replace("|^".$chr."{".$count."}|", "", $lines[$k]);
+	}
+
+	return implode("\n", $lines);
+}
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 290ebb1b40..f955c020e4 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -38,28 +38,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 +72,6 @@ Login Name:	%3$s');
 		'preamble'=> $preamble,
 		'body' => $body));
 
-
 	goaway(z_root());
 
 }
@@ -88,9 +88,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 +118,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;
 		}
diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl
deleted file mode 100644
index 22e54b8c08..0000000000
--- a/view/ca/passchanged_eml.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Apreciat/da $username,
-
-    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
-(o canvía immediatament la contrasenya amb quelcom que recordis).
-
-
-Les teves dades d'accés son les següents:
-
-Lloc:	$siteurl
-Nom:	$email
-Contrasenya:	$new_password
-
-Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
-
-
-	$sitename
-
- 
diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 43063fc818..0000000000
--- a/view/ca/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Apreciat/da {{$username}},
-
-    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
-(o canvía immediatament la contrasenya amb quelcom que recordis).
-
-
-Les teves dades d'accés son les següents:
-
-Lloc:	{{$siteurl}}
-Nom:	{{$email}}
-Contrasenya:	{{$new_password}}
-
-Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
-
-
-	{{$sitename}}
-
- 
diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl
deleted file mode 100644
index 5447d2e804..0000000000
--- a/view/cs/passchanged_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Milý/Milá $username,
-        Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
- 
-Vaše přihlašovací údaje jsou tato:
-
-Adresa webu:	    $siteurl
-Přihlašovací jméno: $email
-Heslo:	 	    $new_password
-
-Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte.
-
-S pozdravem,
-        $sitename administrátor
diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl
deleted file mode 100644
index cfc71356dc..0000000000
--- a/view/cs/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-Milý/Milá {{$username}},
-        Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
- 
-Vaše přihlašovací údaje jsou tato:
-
-Adresa webu:	    {{$siteurl}}
-Přihlašovací jméno: {{$email}}
-Heslo:	 	    {{$new_password}}
-
-Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte.
-
-S pozdravem,
-        {{$sitename}} administrátor
diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
deleted file mode 100644
index dcabbbe491..0000000000
--- a/view/de/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Hallo $[username],
-	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
-Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
-in etwas, was du dir merken kannst).
-
-
-Deine Login Daten wurden wie folgt geändert:
-
-Adresse der Seite:	$[siteurl]
-Login Name:	$[email]
-Passwort:	$[new_password]
-
-Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
-
-
-Beste Grüße,
-	$[sitename] Administrator
-
- 
\ No newline at end of file
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 2c4576f0db..0000000000
--- a/view/de/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Hallo {{$username}},
-	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
-Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
-in etwas, was du dir merken kannst).
-
-
-Deine Login Daten wurden wie folgt geändert:
-
-Adresse der Seite:	{{$siteurl}}
-Login Name:	{{$email}}
-Passwort:	{{$new_password}}
-
-Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
-
-
-Beste Grüße,
-	{{$sitename}} Administrator
-
- 
\ No newline at end of file
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
deleted file mode 100644
index e7cc0e2dc1..0000000000
--- a/view/en/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Dear $[username],
-	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).
-
-
-Your login details are as follows:
-
-Site Location:	$[siteurl]
-Login Name:	$[email]
-Password:	$[new_password]
-
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-	$[sitename] Administrator
-
- 
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
deleted file mode 100644
index fb931387b5..0000000000
--- a/view/en/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Dear {{$username}},
-	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).
-
-
-Your login details are as follows:
-
-Site Location:	{{$siteurl}}
-Login Name:	{{$email}}
-Password:	{{$new_password}}
-
-You may change that password from your account settings page after logging in.
-
-
-Sincerely,
-	{{$sitename}} Administrator
-
- 
diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl
deleted file mode 100644
index ee775d5dd3..0000000000
--- a/view/eo/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Kara $[username],
-	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
-informon (aŭ tuj ŝanĝu vian pasvorton al 
-iu kiun vi povas memori).
-
-
-Jen viaj legitimaĵoj:
-
-Retejo:»$[siteurl]
-Salutnomo:»$[email]
-Pasvorto:»$[new_password]
-
-Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
-
-
-Salutoj,
-	$[sitename] administranto
-
- 
\ No newline at end of file
diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl
deleted file mode 100644
index f348aaf706..0000000000
--- a/view/eo/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Kara {{$username}},
-	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
-informon (aŭ tuj ŝanĝu vian pasvorton al 
-iu kiun vi povas memori).
-
-
-Jen viaj legitimaĵoj:
-
-Retejo:»{{$siteurl}}
-Salutnomo:»{{$email}}
-Pasvorto:»{{$new_password}}
-
-Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
-
-
-Salutoj,
-	{{$sitename}} administranto
-
- 
\ No newline at end of file
diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl
deleted file mode 100644
index 7959846b71..0000000000
--- a/view/es/passchanged_eml.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Estimado/a $username,
-
-    Tu contraseña ha sido modificada como has solicitado. Anota esta información
-(o cambia inmediatamente la contraseña con algo que recuerdes).
-
-
-Tus datos de acceso son los siguientes:
-
-Sitio:	$siteurl
-Nombre:	$email
-Contraseña:	$new_password
-
-Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
-
-
-	$sitename
-
- 
diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl
deleted file mode 100644
index c3003b2ce0..0000000000
--- a/view/es/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-Estimado/a {{$username}},
-
-    Tu contraseña ha sido modificada como has solicitado. Anota esta información
-(o cambia inmediatamente la contraseña con algo que recuerdes).
-
-
-Tus datos de acceso son los siguientes:
-
-Sitio:	{{$siteurl}}
-Nombre:	{{$email}}
-Contraseña:	{{$new_password}}
-
-Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
-
-
-	{{$sitename}}
-
- 
diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl
deleted file mode 100644
index ff518670e1..0000000000
--- a/view/fr/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Cher/Chère $[username],
-	Votre mot de passe a été changé comme demandé. Merci de 
-mémoriser cette information (ou de changer immédiatement pour un 
-mot de passe que vous retiendrez).
-
-
-Vos identifiants sont comme suit :
-
-Adresse du site:	$[siteurl]
-Utilisateur:	$[email]
-Mot de passe:	$[new_password]
-
-Vous pouvez changer ce mot de passe depuis vos 'Réglages' une fois connecté.
-
-
-Sincèrement,
-	l'administrateur de $[sitename]
-
- 
\ No newline at end of file
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
deleted file mode 100644
index a7a4bd306d..0000000000
--- a/view/fr/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Cher(e) {{$username}},
-
-	Votre mot de passe a été modifié comme demandé. Merci de conserver
-cette information pour un usage ultérieur (ou bien de changer votre mot de 
-passe immédiatement en quelque chose dont vous vous souviendrez).
-
-Vos informations de connexion sont désormais :
-
-Site :			{{$siteurl}}
-Pseudo/Courriel :	{{$email}}
-Mot de passe :		{{$new_password}}
-
-Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, 
-après connexion
-
-Sincèrement votre,
-	l'administrateur de {{$sitename}}
-
- 
diff --git a/view/is/passchanged_eml.tpl b/view/is/passchanged_eml.tpl
deleted file mode 100644
index d2aa68797e..0000000000
--- a/view/is/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Góðan daginn $[username],
-	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
-upplýsingar (eða skiptu strax um aðgangsorð 
-yfir í eitthvað sem þú mannst).
-
-
-Innskráningar upplýsingar þínar eru:
-
-Vefþjónn:	$[siteurl]
-Notendanafn:	$[email]
-Aðgangsorð:	$[new_password]
-
-Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig.
-
-
-Bestu kveðjur,
-	Kerfisstjóri $[sitename]
-
- 
\ No newline at end of file
diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 8574b8278d..0000000000
--- a/view/is/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Góðan daginn {{$username}},
-	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
-upplýsingar (eða skiptu strax um aðgangsorð 
-yfir í eitthvað sem þú mannst).
-
-
-Innskráningar upplýsingar þínar eru:
-
-Vefþjónn:	{{$siteurl}}
-Notendanafn:	{{$email}}
-Aðgangsorð:	{{$new_password}}
-
-Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig.
-
-
-Bestu kveðjur,
-	Kerfisstjóri {{$sitename}}
-
- 
\ No newline at end of file
diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl
deleted file mode 100644
index fccc0928f2..0000000000
--- a/view/it/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Ciao {{$username}},
-	La tua password è stata cambiata, come hai richiesto. Conserva queste 
-informazioni (oppure cambia immediatamente la password con 
-qualcosa che ti è più facile ricordare).
-
-
-I tuoi dati di accesso sono i seguenti:
-
-Sito:»{{$siteurl}}
-Soprannome:»{{$email}}
-Password:»{{$new_password}}
-
-Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
-
-
-Saluti,
-	l'amministratore di {{$sitename}}
-
- 
\ No newline at end of file
diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl
deleted file mode 100644
index 6f153d38c4..0000000000
--- a/view/nb-no/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Kjære $[username],
-	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
-meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til 
-noe du husker).
-
-
-Dine logg inn-detaljer er som følger:
-
-Nettsted:»$[siteurl]
-Brukernavn:»$[email]
-Passord:»$[new_password]
-
-Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging.
-
-
-Med vennlig hilsen,
-	$[sitename] administrator
-
- 
\ No newline at end of file
diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl
deleted file mode 100644
index bc9c7e4f5e..0000000000
--- a/view/nb-no/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Kjære {{$username}},
-	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
-meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til 
-noe du husker).
-
-
-Dine logg inn-detaljer er som følger:
-
-Nettsted:»{{$siteurl}}
-Brukernavn:»{{$email}}
-Passord:»{{$new_password}}
-
-Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging.
-
-
-Med vennlig hilsen,
-	{{$sitename}} administrator
-
- 
\ No newline at end of file
diff --git a/view/nl/passchanged_eml.tpl b/view/nl/passchanged_eml.tpl
deleted file mode 100644
index 463753ce87..0000000000
--- a/view/nl/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Beste $[username],
-	Uw wachtwoord is veranderd op uw verzoek. Onthou dit 
-wachtwoord goed (of verander het wachtwoord naar een 
-die u beter kunt onthouden).
-
-
-Uw inloginformatie is als volgt:
-
-Friendica-site:»$[siteurl]
-Inlognaam:$[email]
-Wachtwoord:»$[new_password]
-
-U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent ingelogd.
-
-
-Vriendelijke groet,
-	Beheerder: $[sitename]
-
- 
\ No newline at end of file
diff --git a/view/pl/passchanged_eml.tpl b/view/pl/passchanged_eml.tpl
deleted file mode 100644
index 4ff6a98758..0000000000
--- a/view/pl/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Drogi $[username],
-	Twoje hasło zostało zmienione. Zachowaj tę 
-Informację dla dokumentacji (lub zmień swoje hasło 
-na takie, które zapamiętasz).
-
-
-Dane do logowania:
-
-Strona:»$[siteurl]
-Twój login:»$[email]
-Twoje nowe hasło:»$[new_password]
-
-Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta
-
-
-Z poważaniem,
-	$[sitename] Administrator
-
- 
\ No newline at end of file
diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl
deleted file mode 100644
index aa3163c605..0000000000
--- a/view/pl/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-Drogi {{$username}},
-	Twoje hasło zostało zmienione. Zachowaj tę 
-Informację dla dokumentacji (lub zmień swoje hasło 
-na takie, które zapamiętasz).
-
-
-Dane do logowania:
-
-Strona:»{{$siteurl}}
-Twój login:»{{$email}}
-Twoje nowe hasło:»{{$new_password}}
-
-Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta
-
-
-Z poważaniem,
-	{{$sitename}} Administrator
-
- 
\ No newline at end of file
diff --git a/view/ro/smarty3/passchanged_eml.tpl b/view/ro/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 5b35f3f2c3..0000000000
--- a/view/ro/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Dragă $[username],
-	Parola dvs. a fost schimbată așa cum a solicitat. Vă rugăm să păstrați aceste 
-Informații pentru evidența dvs. (sau schimbaţi imediat parola  
-cu ceva care iti vei reaminti).
-
-
-Detaliile dvs. de login sunt următoarele ;
-
-Locaţie Site»$[siteurl]
-Login Name:	$[email]
-Parolă:»$[new_password]
-
-Puteți schimba această parolă de la pagina setări cont după logare.
-
-
-Cu stimă,
-	$[sitename] Administrator
-
- 
\ No newline at end of file
diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl
deleted file mode 100644
index 590462468b..0000000000
--- a/view/sv/passchanged_eml.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$username,
-
-Lösenordet har ändrats enligt din begäran. Behåll den här 
-informationen om den skulle behövas i framtiden. (eller ändra lösenord 
-på en gång till något som du kommer ihåg).
-
-
-Här är dina inloggningsuppgifter:
-
-Webbplats:	$siteurl
-Användarnamn:	$email
-Lösenord:	$new_password
-
-När du loggat in kan du byta lösenord bland inställningarna.
-
-Hälsningar,
-$sitename admin
diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 8b724f7fcc..0000000000
--- a/view/sv/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-{{$username}},
-
-Lösenordet har ändrats enligt din begäran. Behåll den här 
-informationen om den skulle behövas i framtiden. (eller ändra lösenord 
-på en gång till något som du kommer ihåg).
-
-
-Här är dina inloggningsuppgifter:
-
-Webbplats:	{{$siteurl}}
-Användarnamn:	{{$email}}
-Lösenord:	{{$new_password}}
-
-När du loggat in kan du byta lösenord bland inställningarna.
-
-Hälsningar,
-{{$sitename}} admin
diff --git a/view/zh-cn/passchanged_eml.tpl b/view/zh-cn/passchanged_eml.tpl
deleted file mode 100644
index 1c6e7655ba..0000000000
--- a/view/zh-cn/passchanged_eml.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-
-尊敬的$[username]。
-	您的随您要求密码变化了。请保持这 
-信息为您的备案(或立即变化您的密码成 
-什么容易记住)。
-
-
-您的登记信息是：
-
-网站位置:	$[siteurl]
-登记名:	$[email]
-密码:	$[new_password]
-
-您会变化这个密码在您的账户设置页登记后。
-
-
-谨上，
-	$[sitename]行政人员
-
- 
\ No newline at end of file
diff --git a/view/zh-cn/smarty3/passchanged_eml.tpl b/view/zh-cn/smarty3/passchanged_eml.tpl
deleted file mode 100644
index 321f5eef25..0000000000
--- a/view/zh-cn/smarty3/passchanged_eml.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-尊敬的{{$username}}。
-	您的随您要求密码变化了。请保持这 
-信息为您的备案(或立即变化您的密码成 
-什么容易记住)。
-
-
-您的登记信息是：
-
-网站位置:	{{$siteurl}}
-登记名:	{{$email}}
-密码:	{{$new_password}}
-
-您会变化这个密码在您的账户设置页登记后。
-
-
-谨上，
-	{{$sitename}}行政人员
-
- 
\ No newline at end of file
-- 
2.39.5