summaryrefslogtreecommitdiff
path: root/classes/pref
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2018-11-03 15:08:43 +0300
committerAndrew Dolgov <[email protected]>2018-11-03 15:08:43 +0300
commit3a0292303e453f38204279b5d1c978a4b9c367e9 (patch)
tree2636ec8e8fcb32cd678084d2907bab273bfd3c60 /classes/pref
parent3b9f982ec6398312ba52cc807c53ce8b78fbc649 (diff)
php: remove trailing whitespaces
Diffstat (limited to 'classes/pref')
-rwxr-xr-xclasses/pref/feeds.php10
-rw-r--r--classes/pref/users.php14
2 files changed, 12 insertions, 12 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 817966e11..5127b19c3 100755
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -71,7 +71,7 @@ class Pref_Feeds extends Handler_Protected {
$fsth = $this->pdo->prepare("SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
FROM ttrss_feeds
- WHERE cat_id = :cat AND
+ WHERE cat_id = :cat AND
owner_uid = :uid AND
(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
ORDER BY order_id, title");
@@ -238,9 +238,9 @@ class Pref_Feeds extends Handler_Protected {
$cat['child_unread'] = 0;
$fsth = $this->pdo->prepare("SELECT id, title,last_error,
- ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
+ ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval
FROM ttrss_feeds
- WHERE cat_id IS NULL AND
+ WHERE cat_id IS NULL AND
owner_uid = :uid AND
(:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search))
ORDER BY order_id, title");
@@ -745,7 +745,7 @@ class Pref_Feeds extends Handler_Protected {
</label>
<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
<input type=\"hidden\" name=\"feed_id\" value=\"$feed_id\">
- <input type=\"hidden\" name=\"method\" value=\"uploadicon\">
+ <input type=\"hidden\" name=\"method\" value=\"uploadicon\">
<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button>
<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
@@ -969,7 +969,7 @@ class Pref_Feeds extends Handler_Protected {
$sth = $this->pdo->prepare("UPDATE ttrss_feeds SET
cat_id = :cat_id,
- title = :title,
+ title = :title,
feed_url = :feed_url,
site_url = :site_url,
update_interval = :upd_intl,
diff --git a/classes/pref/users.php b/classes/pref/users.php
index 9728e3bc9..ab8ac775b 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -170,12 +170,12 @@ class Pref_Users extends Handler_Protected {
}
print "</ul>";
-
-
+
+
} else {
print "<h1>".__('User not found')."</h1>";
}
-
+
}
function editSave() {
@@ -188,7 +188,7 @@ class Pref_Users extends Handler_Protected {
if ($password) {
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
- $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
+ $pass_query_part = "pwd_hash = ".$this->pdo->quote($pwd_hash).",
salt = ".$this->pdo->quote($salt).",";
} else {
$pass_query_part = "";
@@ -265,7 +265,7 @@ class Pref_Users extends Handler_Protected {
$sth = $pdo->prepare("SELECT login, email
FROM ttrss_users WHERE id = ?");
$sth->execute([$uid]);
-
+
if ($row = $sth->fetch()) {
$login = $row["login"];
@@ -276,7 +276,7 @@ class Pref_Users extends Handler_Protected {
$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
- $sth = $pdo->prepare("UPDATE ttrss_users
+ $sth = $pdo->prepare("UPDATE ttrss_users
SET pwd_hash = ?, salt = ?, otp_enabled = false
WHERE id = ?");
$sth->execute([$pwd_hash, $new_salt, $uid]);
@@ -313,7 +313,7 @@ class Pref_Users extends Handler_Protected {
if (!$rc) print_error($mail->ErrorInfo);
}
-
+
}
}