diff options
Diffstat (limited to 'classes/pref')
| -rwxr-xr-x | classes/pref/feeds.php | 6 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 11 | ||||
| -rw-r--r-- | classes/pref/prefs.php | 16 | ||||
| -rw-r--r-- | classes/pref/system.php | 2 | ||||
| -rw-r--r-- | classes/pref/users.php | 12 |
5 files changed, 28 insertions, 19 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 6cbf15a58..c55affd77 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1166,7 +1166,7 @@ class Pref_Feeds extends Handler_Protected { function addCat() { $feed_cat = trim(clean($_REQUEST["cat"])); - add_feed_category($feed_cat); + Feeds::add_feed_category($feed_cat); } function index() { @@ -1708,7 +1708,7 @@ class Pref_Feeds extends Handler_Protected { foreach ($feeds as $feed) { $feed = trim($feed); - if (validate_feed_url($feed)) { + if (Feeds::validate_feed_url($feed)) { $this->pdo->beginTransaction(); @@ -1750,7 +1750,7 @@ class Pref_Feeds extends Handler_Protected { WHERE feed_id = ? AND is_cat = ? AND owner_uid = ?"); $sth->execute([$feed_id, bool_to_sql_bool($is_cat), $owner_uid]); - return get_feed_access_key($feed_id, $is_cat, $owner_uid); + return Feeds::get_feed_access_key($feed_id, $is_cat, $owner_uid); } // Silent diff --git a/classes/pref/filters.php b/classes/pref/filters.php index 041951b35..a3a0ce77f 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -976,13 +976,14 @@ class Pref_Filters extends Handler_Protected { print "<section>"; print "<input dojoType=\"dijit.form.ValidationTextBox\" - required=\"true\" id=\"filterDlg_regExp\" - style=\"font-size : 16px; width : 20em;\" + required=\"true\" id=\"filterDlg_regExp\" + onchange='Filters.filterDlgCheckRegExp(this)' + onblur='Filters.filterDlgCheckRegExp(this)' + onfocus='Filters.filterDlgCheckRegExp(this)' + style=\"font-size : 16px; width : 500px\" name=\"reg_exp\" value=\"$reg_exp\"/>"; - print "<div dojoType=\"dijit.Tooltip\" connectId=\"filterDlg_regExp\" position=\"below\"> - ".__("Regular expression, without outer delimiters (i.e. slashes)")." - </div>"; + print "<div dojoType='dijit.Tooltip' id='filterDlg_regExp_tip' connectId='filterDlg_regExp' position='below'></div>"; print "<fieldset>"; print "<label class='checkbox'><input id=\"filterDlg_inverse\" dojoType=\"dijit.form.CheckBox\" diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index cb19998ce..e7e7a365e 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -224,7 +224,7 @@ class Pref_Prefs extends Handler_Protected { $_SESSION["prefs_op_result"] = ""; print "<div dojoType='dijit.layout.AccordionContainer' region='center'>"; - print "<div dojoType='dijit.layout.AccordionPane' + print "<div dojoType='dijit.layout.AccordionPane' title=\"<i class='material-icons'>person</i> ".__('Personal data / Authentication')."\">"; print "<div dojoType='dijit.layout.TabContainer'>"; @@ -373,7 +373,7 @@ class Pref_Prefs extends Handler_Protected { evt.preventDefault(); if (this.validate()) { Notify.progress('Disabling OTP', true); - + new Ajax.Request('backend.php', { parameters: dojo.objectToQuery(this.getValues()), onComplete: function(transport) { @@ -469,7 +469,7 @@ class Pref_Prefs extends Handler_Protected { print "</div>"; #pane - print "<div dojoType='dijit.layout.AccordionPane' selected='true' + print "<div dojoType='dijit.layout.AccordionPane' selected='true' title=\"<i class='material-icons'>settings</i> ".__('Preferences')."\">"; print "<form dojoType='dijit.form.Form' id='changeSettingsForm'>"; @@ -678,8 +678,8 @@ class Pref_Prefs extends Handler_Protected { onclick=\"dijit.byId('SSL_CERT_SERIAL').attr('value', '')\">" . __('Clear') . "</button>"; - print "<button dojoType='dijit.form.Button' class='alt-info' - onclick='window.open(\"https://tt-rss.org/wiki/SSL+Certificate+Authentication\")'> + print "<button dojoType='dijit.form.Button' class='alt-info' + onclick='window.open(\"https://tt-rss.org/wiki/SSL%20Certificate%20Authentication\")'> <i class='material-icons'>help</i> ".__("More info...")."</button>"; } else if ($pref_name == 'DIGEST_PREFERRED_TIME') { @@ -741,7 +741,7 @@ class Pref_Prefs extends Handler_Protected { print "</div>"; #pane - print "<div dojoType=\"dijit.layout.AccordionPane\" + print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"<i class='material-icons'>extension</i> ".__('Plugins')."\">"; print "<form dojoType=\"dijit.form.Form\" id=\"changePluginsForm\">"; @@ -801,7 +801,7 @@ class Pref_Prefs extends Handler_Protected { ".htmlspecialchars($about[1]). "</label>"; if (@$about[4]) { - print "<button dojoType='dijit.form.Button' class='alt-info' + print "<button dojoType='dijit.form.Button' class='alt-info' onclick='window.open(\"".htmlspecialchars($about[4])."\")'> <i class='material-icons'>open_in_new</i> ".__("More info...")."</button>"; } @@ -840,7 +840,7 @@ class Pref_Prefs extends Handler_Protected { if (count($tmppluginhost->get_all($plugin)) > 0) { if (in_array($name, $system_enabled) || in_array($name, $user_enabled)) { - print " <button dojoType='dijit.form.Button' + print " <button dojoType='dijit.form.Button' onclick=\"Helpers.clearPluginData('$name')\"> <i class='material-icons'>clear</i> ".__("Clear data")."</button>"; } diff --git a/classes/pref/system.php b/classes/pref/system.php index f36fd07bb..d0f8a8273 100644 --- a/classes/pref/system.php +++ b/classes/pref/system.php @@ -54,7 +54,7 @@ class Pref_System extends Handler_Protected { </tr>"; while ($line = $res->fetch()) { - print "<tr class=\"errrow\">"; + print "<tr>"; foreach ($line as $k => $v) { $line[$k] = htmlspecialchars($v); diff --git a/classes/pref/users.php b/classes/pref/users.php index 680290b74..851d4fa9e 100644 --- a/classes/pref/users.php +++ b/classes/pref/users.php @@ -362,7 +362,7 @@ class Pref_Users extends Handler_Protected { print "</div>"; #pane print "<div style='padding : 0px' dojoType='dijit.layout.ContentPane' region='center'>"; - $sort = validate_field($sort, + $sort = $this->validate_field($sort, ["login", "access_level", "created", "num_feeds", "created", "last_login"], "login"); if ($sort != "login") $sort = "$sort DESC"; @@ -435,4 +435,12 @@ class Pref_Users extends Handler_Protected { print "</div>"; #container } - } + + function validate_field($string, $allowed, $default = "") { + if (in_array($string, $allowed)) + return $string; + else + return $default; + } + +} |