]> git.wh0rd.org - tt-rss.git/blobdiff - classes/pref/prefs.php
git.wh0rd.org / tt-rss.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
remove $link
[tt-rss.git] / classes / pref / prefs.php
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 29541e04dad764bcaf02f791e414f67445064d9c..faab69235504c66097fc3baf1717f91f4ea19ef5 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -103,13 +103,13 @@ class Pref_Prefs extends Handler_Protected {
 
                foreach (array_keys($_POST) as $pref_name) {
 
-                       $pref_name = db_escape_string($this->link, $pref_name);
-                       $value = db_escape_string($this->link, $_POST[$pref_name]);
+                       $pref_name = db_escape_string( $pref_name);
+                       $value = db_escape_string( $_POST[$pref_name]);
 
                        if ($pref_name == 'DIGEST_PREFERRED_TIME') {
-                               if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) {
+                               if (get_pref( 'DIGEST_PREFERRED_TIME') != $value) {
 
-                                       db_query($this->link, "UPDATE ttrss_users SET
+                                       db_query( "UPDATE ttrss_users SET
                                                last_digest_sent = NULL WHERE id = " . $_SESSION['uid']);
 
                                }
@@ -124,7 +124,7 @@ class Pref_Prefs extends Handler_Protected {
                                        $need_reload = true;
                                }
                        } else {
-                               set_pref($this->link, $pref_name, $value);
+                               set_pref( $pref_name, $value);
                        }
 
                }
@@ -138,9 +138,9 @@ class Pref_Prefs extends Handler_Protected {
 
        function getHelp() {
 
-               $pref_name = db_escape_string($this->link, $_REQUEST["pn"]);
+               $pref_name = db_escape_string( $_REQUEST["pn"]);
 
-               $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs
+               $result = db_query( "SELECT help_text FROM ttrss_prefs
                        WHERE pref_name = '$pref_name'");
 
                if (db_num_rows($result) > 0) {
@@ -153,12 +153,12 @@ class Pref_Prefs extends Handler_Protected {
 
        function changeemail() {
 
-               $email = db_escape_string($this->link, $_POST["email"]);
-               $full_name = db_escape_string($this->link, $_POST["full_name"]);
+               $email = db_escape_string( $_POST["email"]);
+               $full_name = db_escape_string( $_POST["full_name"]);
 
                $active_uid = $_SESSION["uid"];
 
-               db_query($this->link, "UPDATE ttrss_users SET email = '$email',
+               db_query( "UPDATE ttrss_users SET email = '$email',
                        full_name = '$full_name' WHERE id = '$active_uid'");
 
                print __("Your personal data has been saved.");
@@ -176,10 +176,10 @@ class Pref_Prefs extends Handler_Protected {
                        $profile_qpart = "profile IS NULL";
                }
 
-               db_query($this->link, "DELETE FROM ttrss_user_prefs
+               db_query( "DELETE FROM ttrss_user_prefs
                        WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
 
-               initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+               initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
 
                echo __("Your preferences are now set to default values.");
        }
@@ -225,7 +225,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<h2>" . __("Personal data") . "</h2>";
 
-               $result = db_query($this->link, "SELECT email,full_name,otp_enabled,
+               $result = db_query( "SELECT email,full_name,otp_enabled,
                        access_level FROM ttrss_users
                        WHERE id = ".$_SESSION["uid"]);
 
@@ -270,7 +270,7 @@ class Pref_Prefs extends Handler_Protected {
 
                        print "<h2>" . __("Password") . "</h2>";
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_users
+                       $result = db_query( "SELECT id FROM ttrss_users
                                WHERE id = ".$_SESSION["uid"]." AND pwd_hash
                                = 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
 
@@ -399,8 +399,8 @@ class Pref_Prefs extends Handler_Protected {
                                                        parameters: dojo.objectToQuery(this.getValues()),
                                                        onComplete: function(transport) {
                                                                notify('');
-                                                               if (transport.responseText.indexOf('ERROR: ') == 0) {
-                                                                       notify_error(transport.responseText.replace('ERROR: ', ''));
+                                                               if (transport.responseText.indexOf('ERROR:') == 0) {
+                                                                       notify_error(transport.responseText.replace('ERROR:', ''));
                                                                } else {
                                                                        window.location.reload();
                                                                }
@@ -416,11 +416,13 @@ class Pref_Prefs extends Handler_Protected {
                                        print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
                                                name=\"password\"></td></tr>";
 
-                                       print "<tr><td colspan=\"2\">";
+                                       print "<tr><td width=\"40%\">".__("Enter the generated one time password")."</td>";
+
+                                       print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" autocomplete=\"off\"
+                                               required=\"1\"
+                                               name=\"otp\"></td></tr>";
 
-                                       print "<input dojoType=\"dijit.form.CheckBox\" required=\"1\"
-                                               type=\"checkbox\" id=\"enable_otp\" name=\"enable_otp\"/> ";
-                                       print "<label for=\"enable_otp\">".__("I have scanned the code and would like to enable OTP")."</label>";
+                                       print "<tr><td colspan=\"2\">";
 
                                        print "</td></tr><tr><td colspan=\"2\">";
 
@@ -478,10 +480,10 @@ class Pref_Prefs extends Handler_Protected {
                }
 
                if ($_SESSION["profile"]) {
-                       initialize_user_prefs($this->link, $_SESSION["uid"], $_SESSION["profile"]);
+                       initialize_user_prefs( $_SESSION["uid"], $_SESSION["profile"]);
                        $profile_qpart = "profile = '" . $_SESSION["profile"] . "'";
                } else {
-                       initialize_user_prefs($this->link, $_SESSION["uid"]);
+                       initialize_user_prefs( $_SESSION["uid"]);
                        $profile_qpart = "profile IS NULL";
                }
 
@@ -492,7 +494,7 @@ class Pref_Prefs extends Handler_Protected {
 
                $access_query = 'true';
 
-               $result = db_query($this->link, "SELECT DISTINCT
+               $result = db_query( "SELECT DISTINCT
                        ttrss_user_prefs.pref_name,value,type_name,
                        ttrss_prefs_sections.order_id,
                        def_value,section_id
@@ -765,9 +767,9 @@ class Pref_Prefs extends Handler_Protected {
                                <td width='10%'>".__('Author')."</td></tr>";
 
                $system_enabled = array_map("trim", explode(",", PLUGINS));
-               $user_enabled = array_map("trim", explode(",", get_pref($this->link, "_ENABLED_PLUGINS")));
+               $user_enabled = array_map("trim", explode(",", get_pref( "_ENABLED_PLUGINS")));
 
-               $tmppluginhost = new PluginHost($this->link);
+               $tmppluginhost = new PluginHost();
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
                $tmppluginhost->load_data(true);
 
@@ -895,7 +897,7 @@ 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,otp_enabled
+               $result = db_query( "SELECT login,salt,otp_enabled
                        FROM ttrss_users
                        WHERE id = ".$_SESSION["uid"]);
 
@@ -912,35 +914,52 @@ class Pref_Prefs extends Handler_Protected {
        }
 
        function otpenable() {
-               $password = db_escape_string($this->link, $_REQUEST["password"]);
-               $enable_otp = $_REQUEST["enable_otp"] == "on";
+               require_once "lib/otphp/vendor/base32.php";
+               require_once "lib/otphp/lib/otp.php";
+               require_once "lib/otphp/lib/totp.php";
+
+               $password = $_REQUEST["password"];
+               $otp = $_REQUEST["otp"];
 
                global $pluginhost;
                $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
                if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-                       if ($enable_otp) {
-                               db_query($this->link, "UPDATE ttrss_users SET otp_enabled = true WHERE
+                       $result = db_query( "SELECT salt
+                               FROM ttrss_users
+                               WHERE id = ".$_SESSION["uid"]);
+
+                       $base32 = new Base32();
+
+                       $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+                       $topt = new \OTPHP\TOTP($secret);
+
+                       $otp_check = $topt->now();
+
+                       if ($otp == $otp_check) {
+                               db_query( "UPDATE ttrss_users SET otp_enabled = true WHERE
                                        id = " . $_SESSION["uid"]);
 
                                print "OK";
+                       } else {
+                               print "ERROR:".__("Incorrect one time password");
                        }
                } else {
-                       print "ERROR: ".__("Incorrect password");
+                       print "ERROR:".__("Incorrect password");
                }
 
        }
 
        function otpdisable() {
-               $password = db_escape_string($this->link, $_REQUEST["password"]);
+               $password = db_escape_string( $_REQUEST["password"]);
 
                global $pluginhost;
                $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
 
                if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-                       db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE
+                       db_query( "UPDATE ttrss_users SET otp_enabled = false WHERE
                                id = " . $_SESSION["uid"]);
 
                        print "OK";
@@ -956,18 +975,18 @@ class Pref_Prefs extends Handler_Protected {
                else
                        $plugins = "";
 
-               set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
+               set_pref( "_ENABLED_PLUGINS", $plugins);
        }
 
        function clearplugindata() {
-               $name = db_escape_string($this->link, $_REQUEST["name"]);
+               $name = db_escape_string( $_REQUEST["name"]);
 
                global $pluginhost;
                $pluginhost->clear_data($pluginhost->get_plugin($name));
        }
 
        function customizeCSS() {
-               $value = get_pref($this->link, "USER_STYLESHEET");
+               $value = get_pref( "USER_STYLESHEET");
 
                $value = str_replace("<br/>", "\n", $value);
 
@@ -1015,7 +1034,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</div>";
 
-               $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
+               $result = db_query( "SELECT title,id FROM ttrss_settings_profiles
                        WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
                print "<div class=\"prefProfileHolder\">";
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/