public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 09:15:55 +00:00
Code Issues Releases Wiki Activity

update notifications to make them more visible

Browse Source 
cleanup some minor stuff in pref-users
This commit is contained in:
Andrew Dolgov
2019-03-05 20:09:06 +03:00
parent 2b54413599
commit ef6d2b8a4e
10 changed files with 64 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/handler/public.php
View File

@@ -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.");
}

43
classes/pref/users.php
View File

@@ -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));
$message = T_sprintf("Changed password of user %s to %s", "<strong>$login</strong>", "<strong>$tmp_user_pwd</strong>");
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 = "";
$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() {