From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 15 Sep 2012 13:17:44 +0000 (+0400)
Subject: Revert "only enable OTPHP on php version 5.3+"
X-Git-Tag: 1.6.0~38
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d1e31c7a747bdfe91a565d6c9dabdd923bdfd8d3;p=tt-rss.git

Revert "only enable OTPHP on php version 5.3+"

This reverts commit 1835f145a8f4d450e33b15faf7d50437731a8793.
---

diff --git a/classes/auth/internal.php b/classes/auth/internal.php
index 92c19eb6..37014ce4 100644
--- a/classes/auth/internal.php
+++ b/classes/auth/internal.php
@@ -9,7 +9,7 @@ class Auth_Internal extends Auth_Base {
 		$otp = db_escape_string($_REQUEST["otp"]);
 
 		if (get_schema_version($this->link) > 96) {
-			if (version_compare(PHP_VERSION, '5.3.0') >= 0 && !defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
+			if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
 				$result = db_query($this->link, "SELECT otp_enabled,salt FROM ttrss_users WHERE
 					login = '$login'");
 
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index f4a663db..e9f42077 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -258,7 +258,7 @@ class Pref_Prefs extends Handler_Protected {
 
 			print "</form>";
 
-			if (version_compare(PHP_VERSION, '5.3.0') >= 0 && $_SESSION["auth_module"] == "internal") {
+			if ($_SESSION["auth_module"] == "internal") {
 
 				print "<h2>" . __("One time passwords / Authenticator") . "</h2>";