X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fpref%2Fusers.php;h=ad48e7a722a4b5be521a544da2b3fdf353859c25;hb=57932e183745bada9c6183056597cb5276f68d10;hp=fbba5e407436731defa45e5914afeeea63c0c86a;hpb=707ad6ddf7b199e202fc39f61ffd08a4bc5bacc1;p=tt-rss.git
diff --git a/classes/pref/users.php b/classes/pref/users.php
index fbba5e40..ad48e7a7 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -12,253 +12,241 @@ class Pref_Users extends Handler_Protected {
}
function csrf_ignore($method) {
- $csrf_ignored = array("index");
+ $csrf_ignored = array("index", "edit", "userdetails");
return array_search($method, $csrf_ignored) !== false;
}
- function userdetails() {
+ function edit() {
+ global $access_level_names;
- header("Content-Type: text/xml");
- print "";
+ print "";
+ print "";
return;
}
- function edit() {
- global $access_level_names;
-
- header("Content-Type: text/xml");
-
- $id = db_escape_string($this->link, $_REQUEST["id"]);
-
- print "";
- print "".__('User Editor')."";
- print "";
+ function userdetails() {
+ $id = (int) clean($_REQUEST["id"]);
- print "";
- print "";
- print "";
+ $sth = $this->pdo->prepare("SELECT login,
+ ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
+ access_level,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE owner_uid = id) AS stored_articles,
+ ".SUBSTRING_FOR_DATE."(created,1,16) AS created
+ FROM ttrss_users
+ WHERE id = ?");
+ $sth->execute([$id]);
- $result = db_query($this->link, "SELECT * FROM ttrss_users WHERE id = '$id'");
+ if ($row = $sth->fetch()) {
+ print "";
- if (!$sel_disabled) {
- print_select_hash("access_level", $access_level, $access_level_names,
- $sel_disabled);
- } else {
- print_select_hash("", $access_level, $access_level_names,
- $sel_disabled);
- print "";
- }
+ print "".__('Subscribed feeds')."
";
- print "
";
+ $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
+ WHERE owner_uid = ? ORDER BY title");
+ $sth->execute([$id]);
- print __('Change password to') .
- " ";
+ print "";
- print "";
+ while ($line = $sth->fetch()) {
- print "".__("Options")."
";
- print "";
+ $icon_file = ICONS_URL."/".$line["id"].".ico";
- print __('E-mail: ').
- "
";
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "
";
+ } else {
+ $feed_icon = "
";
+ }
- print "
";
+ print "- $feed_icon ".$line["title"]."
";
- print "";
+ }
- print "";
+ print "
";
- print "
-
-
";
- print "]]>";
+ } else {
+ print "
".__('User not found')."
";
+ }
- return;
}
function editSave() {
- $login = db_escape_string($this->link, trim($_REQUEST["login"]));
- $uid = db_escape_string($this->link, $_REQUEST["id"]);
- $access_level = (int) $_REQUEST["access_level"];
- $email = db_escape_string($this->link, trim($_REQUEST["email"]));
- $password = db_escape_string($this->link, trim($_REQUEST["password"]));
+ $login = trim(clean($_REQUEST["login"]));
+ $uid = clean($_REQUEST["id"]);
+ $access_level = (int) clean($_REQUEST["access_level"]);
+ $email = trim(clean($_REQUEST["email"]));
+ $password = clean($_REQUEST["password"]);
if ($password) {
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
- $pass_query_part = "pwd_hash = '$pwd_hash', salt = '$salt',";
+ $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
+ salt = ".$this->pdo->quote($salt).",";
} else {
$pass_query_part = "";
}
- db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
- access_level = '$access_level', email = '$email', otp_enabled = false
- WHERE id = '$uid'");
+ $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
+ access_level = ?, email = ?, otp_enabled = false WHERE id = ?");
+ $sth->execute([$login, $access_level, $email, $uid]);
}
function remove() {
- $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
+ $ids = explode(",", clean($_REQUEST["ids"]));
foreach ($ids as $id) {
if ($id != $_SESSION["uid"] && $id != 1) {
- db_query($this->link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
- db_query($this->link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
- db_query($this->link, "DELETE FROM ttrss_users WHERE id = '$id'");
+ $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
+ $sth->execute([$id]);
+
+ $sth = $this->pdo->prepare("DELETE FROM ttrss_feeds WHERE owner_uid = ?");
+ $sth->execute([$id]);
+
+ $sth = $this->pdo->prepare("DELETE FROM ttrss_users WHERE id = ?");
+ $sth->execute([$id]);
}
}
}
function add() {
- $login = db_escape_string($this->link, trim($_REQUEST["login"]));
+ $login = trim(clean($_REQUEST["login"]));
$tmp_user_pwd = make_password(8);
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
- $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
- login = '$login'");
+ $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+ login = ?");
+ $sth->execute([$login]);
- if (db_num_rows($result) == 0) {
+ if (!$sth->fetch()) {
- db_query($this->link, "INSERT INTO ttrss_users
+ $sth = $this->pdo->prepare("INSERT INTO ttrss_users
(login,pwd_hash,access_level,last_login,created, salt)
- VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
-
+ VALUES (?, ?, 0, null, NOW(), ?)");
+ $sth->execute([$login, $pwd_hash, $salt]);
- $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
- login = '$login' AND pwd_hash = '$pwd_hash'");
+ $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
+ login = ? AND pwd_hash = ?");
+ $sth->execute([$login, $pwd_hash]);
- if (db_num_rows($result) == 1) {
+ if ($row = $sth->fetch()) {
- $new_uid = db_fetch_result($result, 0, "id");
+ $new_uid = $row['id'];
print format_notice(T_sprintf("Added user %s with password %s",
$login, $tmp_user_pwd));
- initialize_user($this->link, $new_uid);
+ initialize_user($new_uid);
} else {
@@ -270,78 +258,66 @@ class Pref_Users extends Handler_Protected {
}
}
- function resetPass() {
-
- $uid = db_escape_string($this->link, $_REQUEST["id"]);
-
- $result = db_query($this->link, "SELECT login,email
- FROM ttrss_users WHERE id = '$uid'");
+ static function resetUserPassword($uid, $show_password) {
- $login = db_fetch_result($result, 0, "login");
- $email = db_fetch_result($result, 0, "email");
- $salt = db_fetch_result($result, 0, "salt");
+ $pdo = Db::pdo();
- $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
- $tmp_user_pwd = make_password(8);
-
- $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
+ $sth = $pdo->prepare("SELECT login, email
+ FROM ttrss_users WHERE id = ?");
+ $sth->execute([$uid]);
- db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
- WHERE id = '$uid'");
+ if ($row = $sth->fetch()) {
- print T_sprintf("Changed password of user %s
- to %s", $login, $tmp_user_pwd);
+ $login = $row["login"];
+ $email = $row["email"];
- require_once 'lib/phpmailer/class.phpmailer.php';
+ $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
+ $tmp_user_pwd = make_password(8);
- if ($email) {
- print " ";
- print T_sprintf("Notifying %s.", $email);
+ $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
- require_once "lib/MiniTemplator.class.php";
+ $sth = $pdo->prepare("UPDATE ttrss_users
+ SET pwd_hash = ?, salt = ?, otp_enabled = false
+ WHERE id = ?");
+ $sth->execute([$pwd_hash, $new_salt, $uid]);
- $tpl = new MiniTemplator;
+ if ($show_password) {
+ print 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));
+ }
- $tpl->readTemplateFromFile("templates/resetpass_template.txt");
+ if ($email) {
+ require_once "lib/MiniTemplator.class.php";
- $tpl->setVariable('LOGIN', $login);
- $tpl->setVariable('NEWPASS', $tmp_user_pwd);
+ $tpl = new MiniTemplator;
- $tpl->addBlock('message');
+ $tpl->readTemplateFromFile("templates/resetpass_template.txt");
- $message = "";
+ $tpl->setVariable('LOGIN', $login);
+ $tpl->setVariable('NEWPASS', $tmp_user_pwd);
- $tpl->generateOutputToString($message);
+ $tpl->addBlock('message');
- $mail = new PHPMailer();
+ $message = "";
- $mail->PluginDir = "lib/phpmailer/";
- $mail->SetLanguage("en", "lib/phpmailer/language/");
+ $tpl->generateOutputToString($message);
- $mail->CharSet = "UTF-8";
+ $mailer = new Mailer();
- $mail->From = SMTP_FROM_ADDRESS;
- $mail->FromName = SMTP_FROM_NAME;
- $mail->AddAddress($email, $login);
+ $rc = $mailer->mail(["to" => "$login <$email>",
+ "subject" => __("[tt-rss] Password change notification"),
+ "message" => $message]);
- if (SMTP_HOST) {
- $mail->Host = SMTP_HOST;
- $mail->Mailer = "smtp";
- $mail->SMTPAuth = SMTP_LOGIN != '';
- $mail->Username = SMTP_LOGIN;
- $mail->Password = SMTP_PASSWORD;
+ if (!$rc) print_error($mailer->error());
}
- $mail->IsHTML(false);
- $mail->Subject = __("[tt-rss] Password change notification");
- $mail->Body = $message;
-
- $rc = $mail->Send();
-
- if (!$rc) print_error($mail->ErrorInfo);
}
+ }
- print "";
+ function resetPass() {
+ $uid = clean($_REQUEST["id"]);
+ Pref_Users::resetUserPassword($uid, true);
}
function index() {
@@ -353,7 +329,7 @@ class Pref_Users extends Handler_Protected {
print "";
print "";
- print "";
+ print "";
print "
-
-