]> git.wh0rd.org - tt-rss.git/blobdiff - classes/pref/prefs.php
use css nth-child instead of old even/odd class hacks for normal mode
[tt-rss.git] / classes / pref / prefs.php
index cc523092f4af3996110f6582d2d6edea988889b1..ba83a99008d0109d719e6d6058fb3cb01d18f1e0 100644 (file)
@@ -1,12 +1,64 @@
 <?php
+
 class Pref_Prefs extends Handler_Protected {
 
+       private $pref_help = array();
+       private $pref_sections = array();
+
        function csrf_ignore($method) {
                $csrf_ignored = array("index", "updateself", "customizecss", "editprefprofiles");
 
                return array_search($method, $csrf_ignored) !== false;
        }
 
+       function __construct($args) {
+               parent::__construct($args);
+
+               $this->pref_sections = array(
+                       1 => __('General'),
+                       2 => __('Interface'),
+                       3 => __('Advanced'),
+                       4 => __('Digest')
+               );
+
+               $this->pref_help = array(
+                       "ALLOW_DUPLICATE_POSTS" => array(__("Allow duplicate articles"), ""),
+                       "AUTO_ASSIGN_LABELS" => array(__("Assign articles to labels automatically"), ""),
+                       "BLACKLISTED_TAGS" => array(__("Blacklisted tags"), __("When auto-detecting tags in articles these tags will not be applied (comma-separated list).")),
+                       "CDM_AUTO_CATCHUP" => array(__("Automatically mark articles as read"), __("This option enables marking articles as read automatically while you scroll article list.")),
+                       "CDM_EXPANDED" => array(__("Automatically expand articles in combined mode"), ""),
+                       "COMBINED_DISPLAY_MODE" => array(__("Combined feed display"), __("Display expanded list of feed articles, instead of separate displays for headlines and article content")),
+                       "CONFIRM_FEED_CATCHUP" => array(__("Confirm marking feed as read"), ""),
+                       "DEFAULT_ARTICLE_LIMIT" => array(__("Amount of articles to display at once"), ""),
+                       "DEFAULT_UPDATE_INTERVAL" => array(__("Default feed update interval"), __("Shortest interval at which a feed will be checked for updates regardless of update method")),
+                       "DIGEST_CATCHUP" => array(__("Mark articles in e-mail digest as read"), ""),
+                       "DIGEST_ENABLE" => array(__("Enable e-mail digest"), __("This option enables sending daily digest of new (and unread) headlines on your configured e-mail address")),
+                       "DIGEST_PREFERRED_TIME" => array(__("Try to send digests around specified time"), __("Uses UTC timezone")),
+                       "ENABLE_API_ACCESS" => array(__("Enable API access"), __("Allows external clients to access this account through the API")),
+                       "ENABLE_FEED_CATS" => array(__("Enable feed categories"), ""),
+                       "FEEDS_SORT_BY_UNREAD" => array(__("Sort feeds by unread articles count"), ""),
+                       "FRESH_ARTICLE_MAX_AGE" => array(__("Maximum age of fresh articles (in hours)"), ""),
+                       "HIDE_READ_FEEDS" => array(__("Hide feeds with no unread articles"), ""),
+                       "HIDE_READ_SHOWS_SPECIAL" => array(__("Show special feeds when hiding read feeds"), ""),
+                       "LONG_DATE_FORMAT" => array(__("Long date format"), ""),
+                       "ON_CATCHUP_SHOW_NEXT_FEED" => array(__("On catchup show next feed"), __("Automatically open next feed with unread articles after marking one as read")),
+                       "PURGE_OLD_DAYS" => array(__("Purge articles after this number of days (0 - disables)"), ""),
+                       "PURGE_UNREAD_ARTICLES" => array(__("Purge unread articles"), ""),
+                       "REVERSE_HEADLINES" => array(__("Reverse headline order (oldest first)"), ""),
+                       "SHORT_DATE_FORMAT" => array(__("Short date format"), ""),
+                       "SHOW_CONTENT_PREVIEW" => array(__("Show content preview in headlines list"), ""),
+                       "SORT_HEADLINES_BY_FEED_DATE" => array(__("Sort headlines by feed date"), __("Use feed-specified date to sort headlines instead of local import date.")),
+                       "SSL_CERT_SERIAL" => array(__("Login with an SSL certificate"), __("Click to register your SSL client certificate with tt-rss")),
+                       "STRIP_IMAGES" => array(__("Do not embed images in articles"), ""),
+                       "STRIP_UNSAFE_TAGS" => array(__("Strip unsafe tags from articles"), __("Strip all but most common HTML tags when reading articles.")),
+                       "USER_STYLESHEET" => array(__("Customize stylesheet"), __("Customize CSS stylesheet to your liking")),
+                       "USER_TIMEZONE" => array(__("Time zone"), ""),
+                       "VFEED_GROUP_BY_FEED" => array(__("Group headlines in virtual feeds"), __("Special feeds, labels, and categories are grouped by originating feeds")),
+                       "USER_LANGUAGE" => array(__("Language")),
+                       "USER_CSS_THEME" => array(__("Theme"), __("Select one of the available CSS themes"))
+               );
+       }
+
        function changepassword() {
 
                $old_pw = $_POST["old_password"];
@@ -28,8 +80,7 @@ class Pref_Prefs extends Handler_Protected {
                        return;
                }
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
                if (method_exists($authenticator, "change_password")) {
                        print $authenticator->change_password($_SESSION["uid"], $old_pw, $new_pw);
@@ -39,45 +90,53 @@ class Pref_Prefs extends Handler_Protected {
        }
 
        function saveconfig() {
-
-               $_SESSION["prefs_cache"] = false;
-
                $boolean_prefs = explode(",", $_POST["boolean_prefs"]);
 
                foreach ($boolean_prefs as $pref) {
                        if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
                }
 
+               $need_reload = false;
+
                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 = $this->dbh->escape_string($pref_name);
+                       $value = $this->dbh->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
+                                       $this->dbh->query("UPDATE ttrss_users SET
                                                last_digest_sent = NULL WHERE id = " . $_SESSION['uid']);
 
                                }
                        }
 
-                       set_pref($this->link, $pref_name, $value);
+                       if ($pref_name == "USER_LANGUAGE") {
+                               if ($_SESSION["language"] != $value) {
+                                       $need_reload = true;
+                               }
+                       }
 
+                       set_pref($pref_name, $value);
                }
 
-               print __("The configuration was saved.");
+               if ($need_reload) {
+                       print "PREFS_NEED_RELOAD";
+               } else {
+                       print __("The configuration was saved.");
+               }
        }
 
        function getHelp() {
 
-               $pref_name = db_escape_string($this->link, $_REQUEST["pn"]);
+               $pref_name = $this->dbh->escape_string($_REQUEST["pn"]);
 
-               $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs
+               $result = $this->dbh->query("SELECT help_text FROM ttrss_prefs
                        WHERE pref_name = '$pref_name'");
 
-               if (db_num_rows($result) > 0) {
-                       $help_text = db_fetch_result($result, 0, "help_text");
+               if ($this->dbh->num_rows($result) > 0) {
+                       $help_text = $this->dbh->fetch_result($result, 0, "help_text");
                        print $help_text;
                } else {
                        printf(__("Unknown option: %s"), $pref_name);
@@ -86,12 +145,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 = $this->dbh->escape_string($_POST["email"]);
+               $full_name = $this->dbh->escape_string($_POST["full_name"]);
 
                $active_uid = $_SESSION["uid"];
 
-               db_query($this->link, "UPDATE ttrss_users SET email = '$email',
+               $this->dbh->query("UPDATE ttrss_users SET email = '$email',
                        full_name = '$full_name' WHERE id = '$active_uid'");
 
                print __("Your personal data has been saved.");
@@ -109,10 +168,12 @@ class Pref_Prefs extends Handler_Protected {
                        $profile_qpart = "profile IS NULL";
                }
 
-               db_query($this->link, "DELETE FROM ttrss_user_prefs
+               $this->dbh->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.");
        }
 
        function index() {
@@ -120,7 +181,7 @@ class Pref_Prefs extends Handler_Protected {
                global $access_level_names;
 
                $prefs_blacklist = array("STRIP_UNSAFE_TAGS", "REVERSE_HEADLINES",
-                       "SORT_HEADLINES_BY_FEED_DATE");
+                       "SORT_HEADLINES_BY_FEED_DATE", "DEFAULT_ARTICLE_LIMIT");
 
                /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
 
@@ -156,13 +217,13 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<h2>" . __("Personal data") . "</h2>";
 
-               $result = db_query($this->link, "SELECT email,full_name,otp_enabled,
+               $result = $this->dbh->query("SELECT email,full_name,otp_enabled,
                        access_level FROM ttrss_users
                        WHERE id = ".$_SESSION["uid"]);
 
-               $email = htmlspecialchars(db_fetch_result($result, 0, "email"));
-               $full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
-               $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
+               $email = htmlspecialchars($this->dbh->fetch_result($result, 0, "email"));
+               $full_name = htmlspecialchars($this->dbh->fetch_result($result, 0, "full_name"));
+               $otp_enabled = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "otp_enabled"));
 
                print "<tr><td width=\"40%\">".__('Full name')."</td>";
                print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" name=\"full_name\" required=\"1\"
@@ -173,7 +234,7 @@ class Pref_Prefs extends Handler_Protected {
 
                if (!SINGLE_USER_MODE && !$_SESSION["hide_hello"]) {
 
-                       $access_level = db_fetch_result($result, 0, "access_level");
+                       $access_level = $this->dbh->fetch_result($result, 0, "access_level");
                        print "<tr><td width=\"40%\">".__('Access level')."</td>";
                        print "<td>" . $access_level_names[$access_level] . "</td></tr>";
                }
@@ -189,10 +250,7 @@ class Pref_Prefs extends Handler_Protected {
                print "</form>";
 
                if ($_SESSION["auth_module"]) {
-                       global $pluginhost;
-
-                       $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
-
+                       $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
                } else {
                        $authenticator = false;
                }
@@ -201,11 +259,11 @@ class Pref_Prefs extends Handler_Protected {
 
                        print "<h2>" . __("Password") . "</h2>";
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_users
+                       $result = $this->dbh->query("SELECT id FROM ttrss_users
                                WHERE id = ".$_SESSION["uid"]." AND pwd_hash
                                = 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
 
-                       if (db_num_rows($result) != 0) {
+                       if ($this->dbh->num_rows($result) != 0) {
                                print format_warning(__("Your password is at default value, please change it."), "default_pass_warning");
                        }
 
@@ -306,7 +364,7 @@ class Pref_Prefs extends Handler_Protected {
 
                                print "</form>";
 
-                               } else {
+                               } else if (function_exists("imagecreatefromstring")) {
 
                                        print "<p>".__("You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP.") . "</p>";
 
@@ -330,8 +388,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();
                                                                }
@@ -347,11 +405,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 "<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 "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" autocomplete=\"off\"
+                                               required=\"1\"
+                                               name=\"otp\"></td></tr>";
+
+                                       print "<tr><td colspan=\"2\">";
 
                                        print "</td></tr><tr><td colspan=\"2\">";
 
@@ -363,13 +423,16 @@ class Pref_Prefs extends Handler_Protected {
 
                                        print "</form>";
 
+                               } else {
+
+                                       print_notice(__("PHP GD functions are required for OTP support."));
+
                                }
 
                        }
                }
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsAuth");
 
                print "</div>"; #pane
@@ -378,8 +441,8 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<form dojoType=\"dijit.form.Form\" id=\"changeSettingsForm\">";
 
-               print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt\">
-               evt.preventDefault();
+               print "<script type=\"dojo/method\" event=\"onSubmit\" args=\"evt, quit\">
+               if (evt) evt.preventDefault();
                if (this.validate()) {
                        console.log(dojo.objectToQuery(this.getValues()));
 
@@ -387,7 +450,15 @@ class Pref_Prefs extends Handler_Protected {
                                parameters: dojo.objectToQuery(this.getValues()),
                                onComplete: function(transport) {
                                        var msg = transport.responseText;
-                                       notify_info(msg);
+                                       if (quit) {
+                                               gotoMain();
+                                       } else {
+                                               if (msg == 'PREFS_NEED_RELOAD') {
+                                                       window.location.reload();
+                                               } else {
+                                                       notify_info(msg);
+                                               }
+                                       }
                        } });
                }
                </script>";
@@ -401,10 +472,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";
                }
 
@@ -415,19 +486,18 @@ class Pref_Prefs extends Handler_Protected {
 
                $access_query = 'true';
 
-               $result = db_query($this->link, "SELECT DISTINCT
-                       ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name,
+               $result = $this->dbh->query("SELECT DISTINCT
+                       ttrss_user_prefs.pref_name,value,type_name,
                        ttrss_prefs_sections.order_id,
-                       section_name,def_value,section_id
+                       def_value,section_id
                        FROM ttrss_prefs,ttrss_prefs_types,ttrss_prefs_sections,ttrss_user_prefs
                        WHERE type_id = ttrss_prefs_types.id AND
                                $profile_qpart AND
                                section_id = ttrss_prefs_sections.id AND
                                ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND
                                $access_query AND
-                               short_desc != '' AND
                                owner_uid = ".$_SESSION["uid"]."
-                       ORDER BY ttrss_prefs_sections.order_id,short_desc");
+                       ORDER BY ttrss_prefs_sections.order_id,pref_name");
 
                $lnum = 0;
 
@@ -435,18 +505,28 @@ class Pref_Prefs extends Handler_Protected {
 
                $listed_boolean_prefs = array();
 
-               while ($line = db_fetch_assoc($result)) {
+               while ($line = $this->dbh->fetch_assoc($result)) {
 
                        if (in_array($line["pref_name"], $prefs_blacklist)) {
                                continue;
                        }
 
+                       $type_name = $line["type_name"];
+                       $pref_name = $line["pref_name"];
+                       $section_name = $this->getSectionName($line["section_id"]);
+                       $value = $line["value"];
+
+                       $short_desc = $this->getShortDesc($pref_name);
+                       $help_text = $this->getHelpText($pref_name);
+
+                       if (!$short_desc) continue;
+
                        if ($_SESSION["profile"] && in_array($line["pref_name"],
                                        $profile_blacklist)) {
                                continue;
                        }
 
-                       if ($active_section != $line["section_name"]) {
+                       if ($active_section != $line["section_id"]) {
 
                                if ($active_section != "") {
                                        print "</table>";
@@ -454,24 +534,18 @@ class Pref_Prefs extends Handler_Protected {
 
                                print "<table width=\"100%\" class=\"prefPrefsList\">";
 
-                               $active_section = $line["section_name"];
+                               $active_section = $line["section_id"];
 
-                               print "<tr><td colspan=\"3\"><h3>".__($active_section)."</h3></td></tr>";
+                               print "<tr><td colspan=\"3\"><h3>".$section_name."</h3></td></tr>";
 
                                $lnum = 0;
                        }
 
                        print "<tr>";
 
-                       $type_name = $line["type_name"];
-                       $pref_name = $line["pref_name"];
-                       $value = $line["value"];
-                       $def_value = $line["def_value"];
-                       $help_text = $line["help_text"];
-
                        print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">";
                        print "<label for='CB_$pref_name'>";
-                       print __($line["short_desc"]);
+                       print $short_desc;
                        print "</label>";
 
                        if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
@@ -480,7 +554,11 @@ class Pref_Prefs extends Handler_Protected {
 
                        print "<td class=\"prefValue\">";
 
-                       if ($pref_name == "USER_TIMEZONE") {
+                       if ($pref_name == "USER_LANGUAGE") {
+                               print_select_hash($pref_name, $value, get_translations(),
+                                       "style='width : 220px; margin : 0px' dojoType='dijit.form.Select'");
+
+                       } else if ($pref_name == "USER_TIMEZONE") {
 
                                $timezones = explode("\n", file_get_contents("lib/timezones.txt"));
 
@@ -498,13 +576,6 @@ class Pref_Prefs extends Handler_Protected {
                                        'dojoType="dijit.form.Select"');
 
 
-                       } else if ($pref_name == "DEFAULT_ARTICLE_LIMIT") {
-
-                               $limits = array(15, 30, 45, 60);
-
-                               print_select($pref_name, $value, $limits,
-                                       'dojoType="dijit.form.Select"');
-
                        } else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
 
                                global $update_intervals_nodefault;
@@ -528,7 +599,7 @@ class Pref_Prefs extends Handler_Protected {
                                print "<input type='checkbox' name='$pref_name' $checked $disabled
                                        dojoType='dijit.form.CheckBox' id='CB_$pref_name' value='1'>";
 
-                       } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE', 'DEFAULT_ARTICLE_LIMIT',
+                       } else if (array_search($pref_name, array('FRESH_ARTICLE_MAX_AGE',
                                        'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
 
                                $regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
@@ -587,8 +658,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"boolean_prefs\" value=\"$listed_boolean_prefs\">";
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsPrefsInside");
 
                print '</div>'; # inside pane
@@ -597,8 +667,14 @@ class Pref_Prefs extends Handler_Protected {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"saveconfig\">";
 
-               print "<button dojoType=\"dijit.form.Button\" type=\"submit\">".
-                       __('Save configuration')."</button> ";
+               print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\">
+                       <span>".__('Save configuration')."</span>
+                       <div dojoType=\"dijit.DropDownMenu\">
+                               <div dojoType=\"dijit.MenuItem\"
+                                       onclick=\"dijit.byId('changeSettingsForm').onSubmit(null, true)\">".
+                               __("Save and exit preferences")."</div>
+                       </div>
+                       </div>";
 
                print "<button dojoType=\"dijit.form.Button\" onclick=\"return editProfiles()\">".
                        __('Manage profiles')."</button> ";
@@ -618,8 +694,7 @@ class Pref_Prefs extends Handler_Protected {
                                <label for='prefs_show_advanced'>" .
                                __("Show additional preferences") . "</label>"; */
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB_SECTION,
                        "hook_prefs_tab_section", "prefPrefsPrefsOutside");
 
                print "</form>";
@@ -670,9 +745,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(Db::get());
                $tmppluginhost->load_all($tmppluginhost::KIND_ALL, $_SESSION["uid"]);
                $tmppluginhost->load_data(true);
 
@@ -783,8 +858,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</div>"; #pane
 
-               global $pluginhost;
-               $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB,
+               PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TAB,
                        "hook_prefs_tab", "prefPrefs");
 
                print "</div>"; #container
@@ -800,52 +874,67 @@ 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 = $this->dbh->query("SELECT login,salt,otp_enabled
                        FROM ttrss_users
                        WHERE id = ".$_SESSION["uid"]);
 
                $base32 = new Base32();
 
-               $login = db_fetch_result($result, 0, "login");
-               $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
+               $login = $this->dbh->fetch_result($result, 0, "login");
+               $otp_enabled = sql_bool_to_bool($this->dbh->fetch_result($result, 0, "otp_enabled"));
 
                if (!$otp_enabled) {
-                       $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+                       $secret = $base32->encode(sha1($this->dbh->fetch_result($result, 0, "salt")));
                        $topt = new \OTPHP\TOTP($secret);
                        print QRcode::png($topt->provisioning_uri($login));
                }
        }
 
        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";
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $password = $_REQUEST["password"];
+               $otp = $_REQUEST["otp"];
+
+               $authenticator = PluginHost::getInstance()->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 = $this->dbh->query("SELECT salt
+                               FROM ttrss_users
+                               WHERE id = ".$_SESSION["uid"]);
+
+                       $base32 = new Base32();
+
+                       $secret = $base32->encode(sha1($this->dbh->fetch_result($result, 0, "salt")));
+                       $topt = new \OTPHP\TOTP($secret);
+
+                       $otp_check = $topt->now();
+
+                       if ($otp == $otp_check) {
+                               $this->dbh->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 = $this->dbh->escape_string($_REQUEST["password"]);
 
-               global $pluginhost;
-               $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
+               $authenticator = PluginHost::getInstance()->get_plugin($_SESSION["auth_module"]);
 
                if ($authenticator->check_password($_SESSION["uid"], $password)) {
 
-                       db_query($this->link, "UPDATE ttrss_users SET otp_enabled = false WHERE
+                       $this->dbh->query("UPDATE ttrss_users SET otp_enabled = false WHERE
                                id = " . $_SESSION["uid"]);
 
                        print "OK";
@@ -861,18 +950,17 @@ 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 = $this->dbh->escape_string($_REQUEST["name"]);
 
-               global $pluginhost;
-               $pluginhost->clear_data($pluginhost->get_plugin($name));
+               PluginHost::getInstance()->clear_data(PluginHost::getInstance()->get_plugin($name));
        }
 
        function customizeCSS() {
-               $value = get_pref($this->link, "USER_STYLESHEET");
+               $value = get_pref("USER_STYLESHEET");
 
                $value = str_replace("<br/>", "\n", $value);
 
@@ -920,7 +1008,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</div>";
 
-               $result = db_query($this->link, "SELECT title,id FROM ttrss_settings_profiles
+               $result = $this->dbh->query("SELECT title,id FROM ttrss_settings_profiles
                        WHERE owner_uid = ".$_SESSION["uid"]." ORDER BY title");
 
                print "<div class=\"prefProfileHolder\">";
@@ -951,9 +1039,7 @@ class Pref_Prefs extends Handler_Protected {
 
                $lnum = 1;
 
-               while ($line = db_fetch_assoc($result)) {
-
-                       $class = ($lnum % 2) ? "even" : "odd";
+               while ($line = $this->dbh->fetch_assoc($result)) {
 
                        $profile_id = $line["id"];
                        $this_row_id = "id=\"FCATR-$profile_id\"";
@@ -1014,6 +1100,26 @@ class Pref_Prefs extends Handler_Protected {
 
        }
 
+       private function getShortDesc($pref_name) {
+               if (isset($this->pref_help[$pref_name])) {
+                       return $this->pref_help[$pref_name][0];
+               }
+               return "";
+       }
+
+       private function getHelpText($pref_name) {
+               if (isset($this->pref_help[$pref_name])) {
+                       return $this->pref_help[$pref_name][1];
+               }
+               return "";
+       }
 
+       private function getSectionName($id) {
+               if (isset($this->pref_sections[$id])) {
+                       return $this->pref_sections[$id];
+               }
+
+               return "";
+       }
 }
 ?>