update notifications to make them more visible

cleanup some minor stuff in pref-users

2 files changed, 8 insertions, 37 deletions

diff --git a/classes/handler/public.php b/classes/handler/public.php
index a8369f440..99c605dee 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -1051,8 +1051,6 @@ class Handler_Public extends Handler {
 
 						$sth->execute([$resetpass_token_full, $login, $email]);
 
-						//Pref_Users::resetUserPassword($id, false);
-
 					} else {
 						print_error("User ID not found.");
 					}
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 9157d3042..8fd09ac4d 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -271,18 +271,16 @@ class Pref_Users extends Handler_Protected {
 			}
 		}
 
-		static function resetUserPassword($uid, $show_password) {
+		static function resetUserPassword($uid, $format_output = false) {
 
 			$pdo = Db::pdo();
 
-			$sth = $pdo->prepare("SELECT login, email
-				FROM ttrss_users WHERE id = ?");
+			$sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
 			$sth->execute([$uid]);
 
 			if ($row = $sth->fetch()) {
 
 				$login = $row["login"];
-				$email = $row["email"];
 
 				$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
 				$tmp_user_pwd = make_password(8);
@@ -294,44 +292,19 @@ class Pref_Users extends Handler_Protected {
 					WHERE id = ?");
 				$sth->execute([$pwd_hash, $new_salt, $uid]);
 
-				if ($show_password) {
-					print_notice(T_sprintf("Changed password of user %s to %s", $login, $tmp_user_pwd));
-				} else {
-					print_notice(T_sprintf("Sending new password of user %s to %s", $login, $email));
-
-					if ($email) {
-						require_once "lib/MiniTemplator.class.php";
-
-						$tpl = new MiniTemplator;
-
-						$tpl->readTemplateFromFile("templates/resetpass_template.txt");
-
-						$tpl->setVariable('LOGIN', $login);
-						$tpl->setVariable('NEWPASS', $tmp_user_pwd);
-
-						$tpl->addBlock('message');
+				$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
 
-						$message = "";
-
-						$tpl->generateOutputToString($message);
-
-						$mailer = new Mailer();
-
-						$rc = $mailer->mail(["to_name" => $login,
-							"to_address" => $email,
-							"subject" => __("[tt-rss] Password change notification"),
-							"message" => $message]);
-
-						if (!$rc) print_error($mailer->error());
-					}
-				}
+				if ($format_output)
+					print_notice($message);
+				else
+					print $message;
 
 			}
 		}
 
 		function resetPass() {
 			$uid = clean($_REQUEST["id"]);
-			Pref_Users::resetUserPassword($uid, true);
+			Pref_Users::resetUserPassword($uid);
 		}
 
 		function index() {