From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 3 Sep 2012 14:42:17 +0000 (+0400)
Subject: pref-prefs/otpqrcode: do not show image if otp is enabled
X-Git-Tag: 1.6.0~75
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=973392b9f55fa9a70cdcde42adeed10467dd5ba1;p=tt-rss.git

pref-prefs/otpqrcode: do not show image if otp is enabled
---

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index c6b10987..3e93ee4d 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")));
-
-		$topt = new \OTPHP\TOTP($secret);
+		$otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
 
-		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() {