diff options
author | Andrew Dolgov <[email protected]> | 2015-09-09 22:09:03 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-09-09 22:09:03 +0300 |
commit | 261226a3a50c598fcf385c336246e8a97934329c (patch) | |
tree | 56f15ee82b4530878b8b0fa99d4c2fb183ffe158 /classes/pref | |
parent | a007c18dffddbe2fcfafe3dca9acf48487085b6c (diff) |
mostly implement async filter test dialog
Diffstat (limited to 'classes/pref')
-rwxr-xr-x[-rw-r--r--] | classes/pref/filters.php | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/classes/pref/filters.php b/classes/pref/filters.php index ec0c3862a..6170f7a08 100644..100755 --- a/classes/pref/filters.php +++ b/classes/pref/filters.php @@ -47,6 +47,7 @@ class Pref_Filters extends Handler_Protected { require_once "include/rssfuncs.php"; $offset = (int) db_escape_string($_REQUEST["offset"]); + $limit = (int) db_escape_string($_REQUEST["limit"]); $filter = array(); @@ -112,6 +113,7 @@ class Pref_Filters extends Handler_Protected { ttrss_feeds.title AS feed_title, ttrss_feed_categories.id AS cat_id, content, + date_entered, link, author, tag_cache @@ -123,7 +125,7 @@ class Pref_Filters extends Handler_Protected { ref_id = ttrss_entries.id AND ($scope_qpart) AND ttrss_user_entries.owner_uid = " . $_SESSION["uid"] . " - ORDER BY date_entered DESC LIMIT 30 OFFSET $offset"); + ORDER BY date_entered DESC LIMIT $limit OFFSET $offset"); while ($line = db_fetch_assoc($result)) { @@ -142,10 +144,10 @@ class Pref_Filters extends Handler_Protected { if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")"; - $line = "<td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\" + $tmp = "<tr><td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\" checked=\"1\" disabled=\"1\" type=\"checkbox\"></td><td>"; - /*foreach ($filter['rules'] as $rule) { + foreach ($filter['rules'] as $rule) { $reg_exp = str_replace('/', '\/', $rule["reg_exp"]); $line["title"] = preg_replace("/($reg_exp)/i", @@ -153,16 +155,21 @@ class Pref_Filters extends Handler_Protected { $content_preview = preg_replace("/($reg_exp)/i", "<span class=\"highlight\">$1</span>", $content_preview); - }*/ + } + + $tmp .= "<strong>" . $line["title"] . "</strong>"; + $tmp .= "<div class='small' style='float : right'>" . $feed_title . "</div>"; + $tmp .= "<div class=\"insensitive\">" . $content_preview . "</div>"; + $tmp .= " " . mb_substr($line["date_entered"], 0, 16); + $tmp .= "</td></tr>"; - $line .= $line["title"]; - $line .= "<div class='small' style='float : right'>" . $feed_title . "</div>"; - $line .= "<div class=\"insensitive\">" . $content_preview . "</div>"; - $line .= " " . mb_substr($line["date_entered"], 0, 16); + array_push($rv, $tmp); - $line .= "</td></tr>"; + /*array_push($rv, array("title" => $line["title"], + "content" => $content_preview, + "date" => $line["date_entered"], + "feed" => $line["feed_title"])); */ - array_push($rv, $line); } } @@ -183,7 +190,7 @@ class Pref_Filters extends Handler_Protected { //print __("Articles matching this filter:"); - print "<div><img src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>"; + print "<div><img id='prefFilterLoadingIndicator' src='images/indicator_tiny.gif'> <span id='prefFilterProgressMsg'>Looking for articles...</span></div>"; print "<br/><div class=\"filterTestHolder\">"; print "<table width=\"100%\" cellspacing=\"0\" id=\"prefFilterTestResultList\">"; |