diff --git a/classes/pref/labels.php b/classes/pref/labels.php
index 5bc094d55..2cdb919ce 100644
--- a/classes/pref/labels.php
+++ b/classes/pref/labels.php
@@ -8,14 +8,12 @@ class Pref_Labels extends Handler_Protected {
}
function edit() {
- $label_id = clean($_REQUEST['id']);
+ $label = ORM::for_table('ttrss_labels2')
+ ->where('owner_uid', $_SESSION['uid'])
+ ->find_one($_REQUEST['id']);
- $sth = $this->pdo->prepare("SELECT id, caption, fg_color, bg_color FROM ttrss_labels2 WHERE
- id = ? AND owner_uid = ?");
- $sth->execute([$label_id, $_SESSION['uid']]);
-
- if ($line = $sth->fetch(PDO::FETCH_ASSOC)) {
- print json_encode($line);
+ if ($label) {
+ print json_encode($label->as_array());
}
}
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index f61f0f038..a81093021 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1366,23 +1366,25 @@ class Pref_Prefs extends Handler_Protected {
= __("Last used") ?> |
pdo->prepare("SELECT id, title, created, last_used
- FROM ttrss_app_passwords WHERE owner_uid = ?");
- $sth->execute([$_SESSION['uid']]);
- while ($row = $sth->fetch()) { ?>
- '>
+ $passwords = ORM::for_table('ttrss_app_passwords')
+ ->where('owner_uid', $_SESSION['uid'])
+ ->order_by_asc('title')
+ ->find_many();
+
+ foreach ($passwords as $pass) { ?>
+
'>
|
- = htmlspecialchars($row["title"]) ?>
+ = htmlspecialchars($pass["title"]) ?>
|
- = TimeHelper::make_local_datetime($row['created'], false) ?>
+ = TimeHelper::make_local_datetime($pass['created'], false) ?>
|
- = TimeHelper::make_local_datetime($row['last_used'], false) ?>
+ = TimeHelper::make_local_datetime($pass['last_used'], false) ?>
|
@@ -1391,12 +1393,11 @@ class Pref_Prefs extends Handler_Protected {
pdo->prepare("DELETE FROM ttrss_app_passwords WHERE id IN ($ids_qmarks) AND owner_uid = ?");
- $sth->execute(array_merge($ids, [$_SESSION['uid']]));
+ function deleteAppPasswords() {
+ $passwords = ORM::for_table('ttrss_app_passwords')
+ ->where('owner_uid', $_SESSION['uid'])
+ ->where_in('id', $_REQUEST['ids'] ?? [])
+ ->delete_many();
$this->appPasswordList();
}
@@ -1409,12 +1410,15 @@ class Pref_Prefs extends Handler_Protected {
print_warning(T_sprintf("Generated password %s for %s. Please remember it for future reference.", $new_password, $title));
- $sth = $this->pdo->prepare("INSERT INTO ttrss_app_passwords
- (title, pwd_hash, service, created, owner_uid)
- VALUES
- (?, ?, ?, NOW(), ?)");
+ $password = ORM::for_table('ttrss_app_passwords')->create();
- $sth->execute([$title, "$new_password_hash:$new_salt", Auth_Base::AUTH_SERVICE_API, $_SESSION['uid']]);
+ $password->title = $title;
+ $password->owner_uid = $_SESSION['uid'];
+ $password->pwd_hash = "$new_password_hash:$new_salt";
+ $password->service = Auth_Base::AUTH_SERVICE_API;
+ $password->created = Db::NOW();
+
+ $password->save();
$this->appPasswordList();
}
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index d2f74d421..fb1689879 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -19,7 +19,7 @@ const Helpers = {
alert("No passwords selected.");
} else if (confirm(__("Remove selected app passwords?"))) {
- xhr.post("backend.php", {op: "pref-prefs", method: "deleteAppPassword", ids: rows.toString()}, (reply) => {
+ xhr.post("backend.php", {op: "pref-prefs", method: "deleteAppPasswords", "ids[]": rows}, (reply) => {
this.updateContent(reply);
Notify.close();
});