From 2f20dd58d277d0ec5e4898feed0f530479a0c831 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 10 Jul 2013 13:09:12 +0400
Subject: integrate silk icons by Mark James

---
 classes/pref/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/pref/users.php')

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 8a0202483..6db7d558b 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -418,7 +418,7 @@ class Pref_Users extends Handler_Protected {
 
 				$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
 
-				print "<td $onclick>" . $line["login"] . "</td>";
+				print "<td $onclick><img src='images/user.png' class='markedPic' alt=''> " . $line["login"] . "</td>";
 
 				if (!$line["email"]) $line["email"] = "&nbsp;";
 
-- 
cgit v1.2.3-54-g00ecf


From b41c5741fef5a3dc93dcf4540c6ee6c1d6fb17e3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 9 Mar 2014 10:33:41 +0400
Subject: disable OTP on user password reset

---
 classes/pref/users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/pref/users.php')

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 6db7d558b..a5d48ac96 100644
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -258,7 +258,7 @@ class Pref_Users extends Handler_Protected {
 
 			$pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-			db_query("UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
+			db_query("UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt', otp_enabled = false
 				WHERE id = '$uid'");
 
 			if ($show_password) {
-- 
cgit v1.2.3-54-g00ecf