From 973392b9f55fa9a70cdcde42adeed10467dd5ba1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 3 Sep 2012 18:42:17 +0400 Subject: [PATCH] pref-prefs/otpqrcode: do not show image if otp is enabled --- classes/pref/prefs.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index c6b109877..3e93ee4d6 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -632,18 +632,20 @@ class Pref_Prefs extends Handler_Protected { require_once "lib/otphp/lib/totp.php"; require_once "lib/phpqrcode/phpqrcode.php"; - $result = db_query($this->link, "SELECT login,salt + $result = db_query($this->link, "SELECT login,salt,otp_enabled FROM ttrss_users WHERE id = ".$_SESSION["uid"]); $base32 = new Base32(); $login = db_fetch_result($result, 0, "login"); - $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt"))); + $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled")); - $topt = new \OTPHP\TOTP($secret); - - print QRcode::png($topt->provisioning_uri($login)); + if (!$otp_enabled) { + $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt"))); + $topt = new \OTPHP\TOTP($secret); + print QRcode::png($topt->provisioning_uri($login)); + } } function changeotp() {