diff options
| -rw-r--r-- | classes/opml.php | 4 | ||||
| -rwxr-xr-x | classes/pref/filters.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/classes/opml.php b/classes/opml.php index 9ef963f03..d44ffe32c 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -8,7 +8,7 @@ class Opml extends Handler_Protected { } function export() { - $output_name = "tt-rss_".date("Y-m-d").".opml"; + $output_name = sprintf("tt-rss_%s_%s.opml", $_SESSION["name"], date("Y-m-d")); $include_settings = $_REQUEST["include_settings"] == "1"; $owner_uid = $_SESSION["uid"]; @@ -62,7 +62,7 @@ class Opml extends Handler_Protected { $ttrss_specific_qpart = ""; if ($cat_id) { - $sth = $this->pdo->prepare("SELECT title,order_id + $sth = $this->pdo->prepare("SELECT title,order_id FROM ttrss_feed_categories WHERE id = ? AND owner_uid = ?"); $sth->execute([$cat_id, $owner_uid]); diff --git a/classes/pref/filters.php b/classes/pref/filters.php index dba2568f2..6121e4c14 100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -238,6 +238,7 @@ class Pref_Filters extends Handler_Protected { $root = array(); $root['id'] = 'root'; $root['name'] = __('Filters'); + $root['enabled'] = true; $root['items'] = array(); $filter_search = $_SESSION["prefs_filter_search"]; @@ -302,7 +303,7 @@ class Pref_Filters extends Handler_Protected { $filter['param'] = $name[1]; $filter['checkbox'] = false; $filter['last_triggered'] = $line["last_triggered"] ? make_local_datetime($line["last_triggered"], false) : null; - $filter['enabled'] = $line["enabled"]; + $filter['enabled'] = sql_bool_to_bool($line["enabled"]); $filter['rules'] = $this->getfilterrules_list($line['id']); if (!$filter_search || $match_ok) { @@ -965,7 +966,7 @@ class Pref_Filters extends Handler_Protected { print "<section>"; print "<textarea dojoType='fox.form.ValidationTextArea' - required='true' id='filterDlg_regExp' + required='true' id='filterDlg_regExp' ValidRegExp='true' rows='4' style='font-size : 14px; width : 490px; word-break: break-all' |