if ($highlight_words && count($highlight_words) > 0) {
foreach ($highlight_words as $word) {
- $line["title"] = preg_replace("/(\Q$word\E)/i",
+ $word = preg_quote($word, "/");
+
+ $line["title"] = preg_replace("/($word)/i",
"<span class=\"highlight\">$1</span>", $line["title"]);
}
}
}
function quickAddFeed() {
+ print "<form onsubmit='return false'>";
+
print_hidden("op", "rpc");
print_hidden("method", "addfeed");
<label for=\"feedDlg_loginCheck\">".
__('This feed requires authentication.')."</div>";
- print "</form>";
-
print "<div class=\"dlgButtons\">
- <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
+ <button dojoType=\"dijit.form.Button\" class=\"btn-primary\" type=\"submit\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return feedBrowser()\">".__('More feeds')."</button>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedAddDlg').hide()\">".__('Cancel')."</button>
</div>";
+ print "</form>";
+
//return;
}
</div>";
}
- print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
+ print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
</div>";
if ($feed > 0) {
$children = Feeds::getChildCategories($feed, $owner_uid);
array_push($children, $feed);
+ $children = array_map("intval", $children);
$children = join(",", $children);
} else if ($n_feed >= 0) {
if ($n_feed != 0) {
- $match_part = "feed_id = '$n_feed'";
+ $match_part = "feed_id = " . (int)$n_feed;
} else {
$match_part = "feed_id IS NULL";
}
$cat_feeds = array();
while ($line = $sth->fetch()) {
- array_push($cat_feeds, "feed_id = " . $line["id"]);
+ array_push($cat_feeds, "feed_id = " . (int)$line["id"]);
}
if (count($cat_feeds) == 0) return 0;
if ($include_children) {
# sub-cats
$subcats = Feeds::getChildCategories($feed, $owner_uid);
-
array_push($subcats, $feed);
+ $subcats = array_map("intval", $subcats);
+
$query_strategy_part = "cat_id IN (".
implode(",", $subcats).")";
$sanity_interval_qpart
$first_id_query_strategy_part ORDER BY $order_by LIMIT 1";
- if ($_REQUEST["debug"]) {
+ /*if ($_REQUEST["debug"]) {
print $query;
- }
+ }*/
$res = $pdo->query($query);
$query_strategy_part ORDER BY $order_by
$limit_query_part $offset_query_part";
- if ($_REQUEST["debug"]) print $query;
+ //if ($_REQUEST["debug"]) print $query;
$res = $pdo->query($query);