for consistency, show hotkey-toggleable options relating to headlines list in preferences

[tt-rss.git] / classes / pref / prefs.php

diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index eb84bde997f6ecb708ded3b573faad85cdd5fbbf..45bbba424b6776e3cfd3af9ab40bda76fa3b9951 100644 (file)
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -42,10 +42,16 @@ class Pref_Prefs extends Handler_Protected {
 
                $_SESSION["prefs_cache"] = false;
 
+               $boolean_prefs = explode(",", $_POST["boolean_prefs"]);
+
+               foreach ($boolean_prefs as $pref) {
+                       if (!isset($_POST[$pref])) $_POST[$pref] = 'false';
+               }
+
                foreach (array_keys($_POST) as $pref_name) {
 
-                       $pref_name = db_escape_string($pref_name);
-                       $value = db_escape_string($_POST[$pref_name]);
+                       $pref_name = db_escape_string($this->link, $pref_name);
+                       $value = db_escape_string($this->link, $_POST[$pref_name]);
 
                        if ($pref_name == 'DIGEST_PREFERRED_TIME') {
                                if (get_pref($this->link, 'DIGEST_PREFERRED_TIME') != $value) {
@@ -65,7 +71,7 @@ class Pref_Prefs extends Handler_Protected {
 
        function getHelp() {
 
-               $pref_name = db_escape_string($_REQUEST["pn"]);
+               $pref_name = db_escape_string($this->link, $_REQUEST["pn"]);
 
                $result = db_query($this->link, "SELECT help_text FROM ttrss_prefs
                        WHERE pref_name = '$pref_name'");
@@ -80,8 +86,8 @@ class Pref_Prefs extends Handler_Protected {
 
        function changeemail() {
 
-               $email = db_escape_string($_POST["email"]);
-               $full_name = db_escape_string($_POST["full_name"]);
+               $email = db_escape_string($this->link, $_POST["email"]);
+               $full_name = db_escape_string($this->link, $_POST["full_name"]);
 
                $active_uid = $_SESSION["uid"];
 
@@ -115,8 +121,9 @@ class Pref_Prefs extends Handler_Protected {
 
                global $access_level_names;
 
-               $prefs_blacklist = array("HIDE_READ_FEEDS", "FEEDS_SORT_BY_UNREAD",
-                                       "STRIP_UNSAFE_TAGS");
+               $prefs_blacklist = array("STRIP_UNSAFE_TAGS");
+
+               /* "FEEDS_SORT_BY_UNREAD", "HIDE_READ_FEEDS", "REVERSE_HEADLINES" */
 
                $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
                                        "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
@@ -227,7 +234,7 @@ class Pref_Prefs extends Handler_Protected {
                        </script>";
 
                        if ($otp_enabled) {
-                               print_notice("Changing your current password will disable OTP.");
+                               print_notice(__("Changing your current password will disable OTP."));
                        }
 
                        print "<table width=\"100%\" class=\"prefPrefsList\">";
@@ -260,7 +267,7 @@ class Pref_Prefs extends Handler_Protected {
 
                                if ($otp_enabled) {
 
-                                       print_notice("One time passwords are currently enabled. Enter your current password below to disable.");
+                                       print_notice(__("One time passwords are currently enabled. Enter your current password below to disable."));
 
                                        print "<form dojoType=\"dijit.form.Form\">";
 
@@ -395,7 +402,7 @@ class Pref_Prefs extends Handler_Protected {
                print '<div dojoType="dijit.layout.ContentPane" region="center" style="overflow-y : auto">';
 
                if ($_SESSION["profile"]) {
-                       print_notice("Some preferences are only available in default profile.");
+                       print_notice(__("Some preferences are only available in default profile."));
                }
 
                if ($_SESSION["profile"]) {
@@ -406,10 +413,12 @@ class Pref_Prefs extends Handler_Protected {
                        $profile_qpart = "profile IS NULL";
                }
 
-               if ($_SESSION["prefs_show_advanced"])
+               /* if ($_SESSION["prefs_show_advanced"])
                        $access_query = "true";
                else
-                       $access_query = "(access_level = 0 AND section_id != 3)";
+                       $access_query = "(access_level = 0 AND section_id != 3)"; */
+
+               $access_query = 'true';
 
                $result = db_query($this->link, "SELECT DISTINCT
                        ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name,
@@ -429,6 +438,8 @@ class Pref_Prefs extends Handler_Protected {
 
                $active_section = "";
 
+               $listed_boolean_prefs = array();
+
                while ($line = db_fetch_assoc($result)) {
 
                        if (in_array($line["pref_name"], $prefs_blacklist)) {
@@ -463,7 +474,10 @@ class Pref_Prefs extends Handler_Protected {
                        $def_value = $line["def_value"];
                        $help_text = $line["help_text"];
 
-                       print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">" . __($line["short_desc"]);
+                       print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">";
+                       print "<label for='CB_$pref_name'>";
+                       print __($line["short_desc"]);
+                       print "</label>";
 
                        if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
 
@@ -497,21 +511,19 @@ class Pref_Prefs extends Handler_Protected {
 
                        } else if ($type_name == "bool") {
 
-                               if ($value == "true") {
-                                       $value = __("Yes");
-                               } else {
-                                       $value = __("No");
-                               }
+                               array_push($listed_boolean_prefs, $pref_name);
+
+                               $checked = ($value == "true") ? "checked=\"checked\"" : "";
 
                                if ($pref_name == "PURGE_UNREAD_ARTICLES" && FORCE_ARTICLE_PURGE != 0) {
                                        $disabled = "disabled=\"1\"";
-                                       $value = __("Yes");
+                                       $checked = "checked=\"checked\"";
                                } else {
                                        $disabled = "";
                                }
 
-                               print_radio($pref_name, $value, __("Yes"), array(__("Yes"), __("No")),
-                                       $disabled);
+                               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',
                                        'PURGE_OLD_DAYS', 'LONG_DATE_FORMAT', 'SHORT_DATE_FORMAT')) !== false) {
@@ -568,6 +580,10 @@ class Pref_Prefs extends Handler_Protected {
 
                print "</table>";
 
+               $listed_boolean_prefs = htmlspecialchars(join(",", $listed_boolean_prefs));
+
+               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,
                        "hook_prefs_tab_section", "prefPrefsPrefsInside");
@@ -589,7 +605,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "&nbsp;";
 
-               $checked = $_SESSION["prefs_show_advanced"] ? "checked='1'" : "";
+               /* $checked = $_SESSION["prefs_show_advanced"] ? "checked='1'" : "";
 
                print "<input onclick='toggleAdvancedPrefs()'
                                id='prefs_show_advanced'
@@ -597,7 +613,7 @@ class Pref_Prefs extends Handler_Protected {
                                $checked
                                type=\"checkbox\"></input>
                                <label for='prefs_show_advanced'>" .
-                               __("Show additional preferences") . "</label>";
+                               __("Show additional preferences") . "</label>"; */
 
                global $pluginhost;
                $pluginhost->run_hooks($pluginhost::HOOK_PREFS_TAB_SECTION,
@@ -613,7 +629,7 @@ class Pref_Prefs extends Handler_Protected {
 
                print "<h2>".__("Plugins")."</h2>";
 
-               print_notice("You will need to reload Tiny Tiny RSS for plugin changes to take effect.");
+               print_notice(__("You will need to reload Tiny Tiny RSS for plugin changes to take effect."));
 
                print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">";
 
@@ -785,7 +801,7 @@ class Pref_Prefs extends Handler_Protected {
        }
 
        function otpenable() {
-               $password = db_escape_string($_REQUEST["password"]);
+               $password = db_escape_string($this->link, $_REQUEST["password"]);
                $enable_otp = $_REQUEST["enable_otp"] == "on";
 
                global $pluginhost;
@@ -806,7 +822,7 @@ class Pref_Prefs extends Handler_Protected {
        }
 
        function otpdisable() {
-               $password = db_escape_string($_REQUEST["password"]);
+               $password = db_escape_string($this->link, $_REQUEST["password"]);
 
                global $pluginhost;
                $authenticator = $pluginhost->get_plugin($_SESSION["auth_module"]);
@@ -824,13 +840,16 @@ class Pref_Prefs extends Handler_Protected {
        }
 
        function setplugins() {
-               $plugins = join(",", $_REQUEST["plugins"]);
+               if (is_array($_REQUEST["plugins"]))
+                       $plugins = join(",", $_REQUEST["plugins"]);
+               else
+                       $plugins = "";
 
                set_pref($this->link, "_ENABLED_PLUGINS", $plugins);
        }
 
        function clearplugindata() {
-               $name = db_escape_string($_REQUEST["name"]);
+               $name = db_escape_string($this->link, $_REQUEST["name"]);
 
                global $pluginhost;
                $pluginhost->clear_data($pluginhost->get_plugin($name));