update notifications to make them more visible
cleanup some minor stuff in pref-users
This commit is contained in:
Andrew Dolgov
parent
2b54413599
commit
ef6d2b8a4e
|
|
@ -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.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -127,30 +127,32 @@ body.ttrss_main a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
body.ttrss_main #notify.visible {
|
||||
transform: translate(0, -45px);
|
||||
opacity: 100;
|
||||
}
|
||||
body.ttrss_main #notify {
|
||||
bottom: -45px;
|
||||
right: 0px;
|
||||
height: 30px;
|
||||
left: 0px;
|
||||
border-width: 1px 0px 0px 0px;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
min-width: 200px;
|
||||
max-width: 350px;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
position: fixed;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
opacity: 0;
|
||||
align-items: center;
|
||||
transition: all 0.5s ease-in-out;
|
||||
}
|
||||
body.ttrss_main #notify > * {
|
||||
padding: 4px;
|
||||
padding: 10px;
|
||||
transition: opacity 0.2s linear;
|
||||
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
body.ttrss_main #notify img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
body.ttrss_main #notify .msg {
|
||||
flex-grow: 2;
|
||||
padding: 0 10px;
|
||||
line-height: 20px;
|
||||
}
|
||||
body.ttrss_main #notify .icon-close {
|
||||
cursor: pointer;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -142,26 +142,25 @@ body.ttrss_main {
|
|||
}
|
||||
|
||||
#notify.visible {
|
||||
transform: translate(0, -45px);
|
||||
opacity: 100;
|
||||
}
|
||||
|
||||
#notify {
|
||||
bottom : -45px;
|
||||
right : 0px;
|
||||
height : 30px;
|
||||
left : 0px;
|
||||
border-width : 1px 0px 0px 0px;
|
||||
bottom : 20px;
|
||||
right : 20px;
|
||||
min-width : 200px;
|
||||
max-width : 350px;
|
||||
border-width : 1px;
|
||||
border-style : solid;
|
||||
position : fixed;
|
||||
font-size : 13px;
|
||||
font-size : 14px;
|
||||
z-index : 99;
|
||||
display : flex;
|
||||
opacity: 0;
|
||||
align-items : center;
|
||||
transition: all 0.5s ease-in-out;
|
||||
|
||||
> * {
|
||||
padding : 4px;
|
||||
}
|
||||
padding : 10px;
|
||||
transition: opacity 0.2s linear;
|
||||
box-shadow : 0px 0px 8px rgba(0,0,0,0.1);
|
||||
|
||||
img {
|
||||
vertical-align : middle;
|
||||
|
|
@ -169,6 +168,8 @@ body.ttrss_main {
|
|||
|
||||
.msg {
|
||||
flex-grow : 2;
|
||||
padding : 0 10px;
|
||||
line-height : 20px;
|
||||
}
|
||||
|
||||
.icon-close {
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ define(["dojo/_base/declare"], function (declare) {
|
|||
|
||||
xhrPost("backend.php", {op: "pref-users", method: "resetPass", id: id}, (transport) => {
|
||||
Notify.close();
|
||||
alert(transport.responseText);
|
||||
Notify.info(transport.responseText, true);
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,30 +128,32 @@ body.ttrss_main a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
body.ttrss_main #notify.visible {
|
||||
transform: translate(0, -45px);
|
||||
opacity: 100;
|
||||
}
|
||||
body.ttrss_main #notify {
|
||||
bottom: -45px;
|
||||
right: 0px;
|
||||
height: 30px;
|
||||
left: 0px;
|
||||
border-width: 1px 0px 0px 0px;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
min-width: 200px;
|
||||
max-width: 350px;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
position: fixed;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
opacity: 0;
|
||||
align-items: center;
|
||||
transition: all 0.5s ease-in-out;
|
||||
}
|
||||
body.ttrss_main #notify > * {
|
||||
padding: 4px;
|
||||
padding: 10px;
|
||||
transition: opacity 0.2s linear;
|
||||
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
body.ttrss_main #notify img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
body.ttrss_main #notify .msg {
|
||||
flex-grow: 2;
|
||||
padding: 0 10px;
|
||||
line-height: 20px;
|
||||
}
|
||||
body.ttrss_main #notify .icon-close {
|
||||
cursor: pointer;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -128,30 +128,32 @@ body.ttrss_main a:hover {
|
|||
text-decoration: underline;
|
||||
}
|
||||
body.ttrss_main #notify.visible {
|
||||
transform: translate(0, -45px);
|
||||
opacity: 100;
|
||||
}
|
||||
body.ttrss_main #notify {
|
||||
bottom: -45px;
|
||||
right: 0px;
|
||||
height: 30px;
|
||||
left: 0px;
|
||||
border-width: 1px 0px 0px 0px;
|
||||
bottom: 20px;
|
||||
right: 20px;
|
||||
min-width: 200px;
|
||||
max-width: 350px;
|
||||
border-width: 1px;
|
||||
border-style: solid;
|
||||
position: fixed;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
z-index: 99;
|
||||
display: flex;
|
||||
opacity: 0;
|
||||
align-items: center;
|
||||
transition: all 0.5s ease-in-out;
|
||||
}
|
||||
body.ttrss_main #notify > * {
|
||||
padding: 4px;
|
||||
padding: 10px;
|
||||
transition: opacity 0.2s linear;
|
||||
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
body.ttrss_main #notify img {
|
||||
vertical-align: middle;
|
||||
}
|
||||
body.ttrss_main #notify .msg {
|
||||
flex-grow: 2;
|
||||
padding: 0 10px;
|
||||
line-height: 20px;
|
||||
}
|
||||
body.ttrss_main #notify .icon-close {
|
||||
cursor: pointer;
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue