valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pref-users: PDO

This commit is contained in:
Andrew Dolgov 2017-12-02 12:23:41 +03:00
parent 93ca6c95b8
commit c2418a559b
1 changed files with 158 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
classes/pref/users.php
View File

@ -25,17 +25,20 @@ class Pref_Users extends Handler_Protected {
print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">"; print "<form id=\"user_edit_form\" onsubmit='return false' dojoType=\"dijit.form.Form\">";
$id = (int) $this->dbh->escape_string($_REQUEST["id"]); $id = (int) $_REQUEST["id"];
print_hidden("id", "$id"); print_hidden("id", "$id");
print_hidden("op", "pref-users"); print_hidden("op", "pref-users");
print_hidden("method", "editSave"); print_hidden("method", "editSave");
$result = $this->dbh->query("SELECT * FROM ttrss_users WHERE id = '$id'"); $sth = $this->pdo->prepare("SELECT * FROM ttrss_users WHERE id = ?");
$sth->execute([$id]);
$login = $this->dbh->fetch_result($result, 0, "login"); if ($row = $sth->fetch()) {
$access_level = $this->dbh->fetch_result($result, 0, "access_level");
$email = $this->dbh->fetch_result($result, 0, "email"); $login = $row["login"];
$access_level = $row["access_level"];
$email = $row["email"];
$sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : ""; $sel_disabled = ($id == $_SESSION["uid"] || $login == "admin") ? "disabled" : "";
@ -86,6 +89,8 @@ class Pref_Users extends Handler_Protected {
print "</form>"; print "</form>";
}
print '</div>'; #tab print '</div>'; #tab
print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\" print "<div href=\"backend.php?op=pref-users&method=userdetails&id=$id\"
dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">"; dojoType=\"dijit.layout.ContentPane\" title=\"".__('User details')."\">";
@ -103,39 +108,37 @@ class Pref_Users extends Handler_Protected {
} }
function userdetails() { function userdetails() {
$id = (int) $this->dbh->escape_string($_REQUEST["id"]); $id = (int) $_REQUEST["id"];
$result = $this->dbh->query("SELECT login, $sth = $this->pdo->prepare("SELECT login,
".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login, ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
access_level, access_level,
(SELECT COUNT(int_id) FROM ttrss_user_entries (SELECT COUNT(int_id) FROM ttrss_user_entries
WHERE owner_uid = id) AS stored_articles, WHERE owner_uid = id) AS stored_articles,
".SUBSTRING_FOR_DATE."(created,1,16) AS created ".SUBSTRING_FOR_DATE."(created,1,16) AS created
FROM ttrss_users FROM ttrss_users
WHERE id = '$id'"); WHERE id = ?");
$sth->execute([$id]);
if ($this->dbh->num_rows($result) == 0) {
print "<h1>".__('User not found')."</h1>";
return;
}
if ($row = $sth->fetch()) {
print "<table width='100%'>"; print "<table width='100%'>";
$last_login = make_local_datetime( $last_login = make_local_datetime(
$this->dbh->fetch_result($result, 0, "last_login"), true); $row["last_login"], true);
$created = make_local_datetime( $created = make_local_datetime(
$this->dbh->fetch_result($result, 0, "created"), true); $row["created"], true);
$stored_articles = $this->dbh->fetch_result($result, 0, "stored_articles"); $stored_articles = $row["stored_articles"];
print "<tr><td>".__('Registered')."</td><td>$created</td></tr>"; print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>"; print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
$result = $this->dbh->query("SELECT COUNT(id) as num_feeds FROM ttrss_feeds $sth = $this->pdo->prepare("SELECT COUNT(id) as num_feeds FROM ttrss_feeds
WHERE owner_uid = '$id'"); WHERE owner_uid = ?");
$sth->execute([$id]);
$num_feeds = $this->dbh->fetch_result($result, 0, "num_feeds"); $row = $sth->fetch();
$num_feeds = $row["num_feeds"];
print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>"; print "<tr><td>".__('Subscribed feeds count')."</td><td>$num_feeds</td></tr>";
print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>"; print "<tr><td>".__('Stored articles')."</td><td>$stored_articles</td></tr>";
@ -144,12 +147,13 @@ class Pref_Users extends Handler_Protected {
print "<h1>".__('Subscribed feeds')."</h1>"; print "<h1>".__('Subscribed feeds')."</h1>";
$result = $this->dbh->query("SELECT id,title,site_url FROM ttrss_feeds $sth = $this->pdo->prepare("SELECT id,title,site_url FROM ttrss_feeds
WHERE owner_uid = '$id' ORDER BY title"); WHERE owner_uid = ? ORDER BY title");
$sth->execute([$id]);
print "<ul class=\"userFeedList\">"; print "<ul class=\"userFeedList\">";
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $sth->fetch()) {
$icon_file = ICONS_URL."/".$line["id"].".ico"; $icon_file = ICONS_URL."/".$line["id"].".ico";
@ -163,71 +167,79 @@ class Pref_Users extends Handler_Protected {
} }
if ($this->dbh->num_rows($result) < $num_feeds) { print "</ul>";
// FIXME - add link to show ALL subscribed feeds here somewhere
print "<li><img
class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">&nbsp;...</li>"; } else {
print "<h1>".__('User not found')."</h1>";
} }
print "</ul>";
} }
function editSave() { function editSave() {
$login = $this->dbh->escape_string(trim($_REQUEST["login"])); $login = trim($_REQUEST["login"]);
$uid = $this->dbh->escape_string($_REQUEST["id"]); $uid = $_REQUEST["id"];
$access_level = (int) $_REQUEST["access_level"]; $access_level = (int) $_REQUEST["access_level"];
$email = $this->dbh->escape_string(trim($_REQUEST["email"])); $email = trim($_REQUEST["email"]);
$password = $_REQUEST["password"]; $password = $_REQUEST["password"];
if ($password) { if ($password) {
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true); $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 { } else {
$pass_query_part = ""; $pass_query_part = "";
} }
$this->dbh->query("UPDATE ttrss_users SET $pass_query_part login = '$login', $sth = $this->pdo->prepare("UPDATE ttrss_users SET $pass_query_part login = ?,
access_level = '$access_level', email = '$email', otp_enabled = false access_level = ?, email = ?, otp_enabled = false WHERE id = ?");
WHERE id = '$uid'"); $sth->execute([$login, $access_level, $email, $uid]);
} }
function remove() { function remove() {
$ids = explode(",", $this->dbh->escape_string($_REQUEST["ids"])); $ids = explode(",", $_REQUEST["ids"]);
foreach ($ids as $id) { foreach ($ids as $id) {
if ($id != $_SESSION["uid"] && $id != 1) { if ($id != $_SESSION["uid"] && $id != 1) {
$this->dbh->query("DELETE FROM ttrss_tags WHERE owner_uid = '$id'"); $sth = $this->pdo->prepare("DELETE FROM ttrss_tags WHERE owner_uid = ?");
$this->dbh->query("DELETE FROM ttrss_feeds WHERE owner_uid = '$id'"); $sth->execute([$id]);
$this->dbh->query("DELETE FROM ttrss_users WHERE id = '$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() { function add() {
$login = $this->dbh->escape_string(trim($_REQUEST["login"])); $login = trim($_REQUEST["login"]);
$tmp_user_pwd = make_password(8); $tmp_user_pwd = make_password(8);
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250); $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($tmp_user_pwd, $salt, true); $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE $sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
login = '$login'"); login = ?");
$sth->execute([$login]);
if ($this->dbh->num_rows($result) == 0) { if (!$sth->fetch()) {
$this->dbh->query("INSERT INTO ttrss_users $sth = $this->pdo->prepare("INSERT INTO ttrss_users
(login,pwd_hash,access_level,last_login,created, salt) (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]);
$sth = $this->pdo->prepare("SELECT id FROM ttrss_users WHERE
login = ? AND pwd_hash = ?");
$sth->execute([$login, $pwd_hash]);
$result = $this->dbh->query("SELECT id FROM ttrss_users WHERE if ($row = $sth->fetch()) {
login = '$login' AND pwd_hash = '$pwd_hash'");
if ($this->dbh->num_rows($result) == 1) { $new_uid = $row['id'];
$new_uid = $this->dbh->fetch_result($result, 0, "id");
print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>", print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
$login, $tmp_user_pwd)); $login, $tmp_user_pwd));
@ -246,19 +258,26 @@ class Pref_Users extends Handler_Protected {
static function resetUserPassword($uid, $show_password) { static function resetUserPassword($uid, $show_password) {
$result = db_query("SELECT login,email $pdo = Db::pdo();
FROM ttrss_users WHERE id = '$uid'");
$login = db_fetch_result($result, 0, "login"); $sth = $pdo->prepare("SELECT login, email
$email = db_fetch_result($result, 0, "email"); 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); $new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$tmp_user_pwd = make_password(8); $tmp_user_pwd = make_password(8);
$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true); $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
db_query("UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt', otp_enabled = false $sth = $pdo->prepare("UPDATE ttrss_users
WHERE id = '$uid'"); SET pwd_hash = ?, salt = ?, otp_enabled = false
WHERE id = ?");
$sth->execute([$pwd_hash, $new_salt, $uid]);
if ($show_password) { if ($show_password) {
print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd); print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd);
@ -292,10 +311,12 @@ class Pref_Users extends Handler_Protected {
if (!$rc) print_error($mail->ErrorInfo); if (!$rc) print_error($mail->ErrorInfo);
} }
}
} }
function resetPass() { function resetPass() {
$uid = $this->dbh->escape_string($_REQUEST["id"]); $uid = $_REQUEST["id"];
Pref_Users::resetUserPassword($uid, true); Pref_Users::resetUserPassword($uid, true);
} }
@ -308,7 +329,7 @@ class Pref_Users extends Handler_Protected {
print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">"; print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
$user_search = $this->dbh->escape_string($_REQUEST["search"]); $user_search = trim($_REQUEST["search"]);
if (array_key_exists("search", $_REQUEST)) { if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_user_search"] = $user_search; $_SESSION["prefs_user_search"] = $user_search;
@ -323,7 +344,7 @@ class Pref_Users extends Handler_Protected {
__('Search')."</button> __('Search')."</button>
</div>"; </div>";
$sort = $this->dbh->escape_string($_REQUEST["sort"]); $sort = $_REQUEST["sort"];
if (!$sort || $sort == "undefined") { if (!$sort || $sort == "undefined") {
$sort = "login"; $sort = "login";
@ -357,23 +378,7 @@ class Pref_Users extends Handler_Protected {
print "<div id=\"sticky-status-msg\"></div>"; print "<div id=\"sticky-status-msg\"></div>";
if ($user_search) { $sth = $this->pdo->prepare("SELECT
$user_search = explode(" ", $user_search);
$tokens = array();
foreach ($user_search as $token) {
$token = trim($token);
array_push($tokens, "(UPPER(login) LIKE UPPER('%$token%'))");
}
$user_search_query = "(" . join($tokens, " AND ") . ") AND ";
} else {
$user_search_query = "";
}
$result = $this->dbh->query("SELECT
tu.id, tu.id,
login,access_level,email, login,access_level,email,
".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login, ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
@ -382,11 +387,9 @@ class Pref_Users extends Handler_Protected {
FROM FROM
ttrss_users tu ttrss_users tu
WHERE WHERE
$user_search_query (:search = '' OR login LIKE :search) AND tu.id > 0
tu.id > 0 ORDER BY :sort");
ORDER BY $sort"); $sth->execute([":search" => $user_search ? "%$user_search%" : "", ":sort" => $sort]);
if ($this->dbh->num_rows($result) > 0) {
print "<p><table width=\"100%\" cellspacing=\"0\" print "<p><table width=\"100%\" cellspacing=\"0\"
class=\"prefUserList\" id=\"prefUserList\">"; class=\"prefUserList\" id=\"prefUserList\">";
@ -401,7 +404,7 @@ class Pref_Users extends Handler_Protected {
$lnum = 0; $lnum = 0;
while ($line = $this->dbh->fetch_assoc($result)) { while ($line = $sth->fetch()) {
$uid = $line["id"]; $uid = $line["id"];
@ -434,15 +437,12 @@ class Pref_Users extends Handler_Protected {
print "</table>"; print "</table>";
} else { if ($lnum == 0) {
print "<p>";
if (!$user_search) { if (!$user_search) {
print_warning(__('No users defined.')); print_warning(__('No users defined.'));
} else { } else {
print_warning(__('No matching users found.')); print_warning(__('No matching users found.'));
} }
print "</p>";
} }
print "</div>"; #pane print "</div>"; #pane