valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc code cleanup

This commit is contained in:
Andrew Dolgov 2011-08-04 16:29:26 +04:00
parent 956cca2a2a
commit b9d54789ba
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
functions.php
View File

@ -4949,12 +4949,12 @@
$subop_split = explode(":", $subop);
if ($subop == "CatchupSelected") {
/* if ($subop == "CatchupSelected") {
$ids = explode(",", db_escape_string($_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
catchupArticlesById($link, $ids, $cmode);
}
} */
if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
update_rss_feed($link, $feed, true);
@ -5006,8 +5006,6 @@
$rtl_content = false;
}
/// START /////////////////////////////////////////////////////////////////////////////////
@$search = db_escape_string($_REQUEST["query"]);
if ($search) {
@ -5021,8 +5019,6 @@
$match_on = "both";
}
//$real_offset = $offset * $limit;
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
$qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view,
@ -5037,12 +5033,11 @@
$vgroup_last_feed = $vgr_last_feed;
/// STOP //////////////////////////////////////////////////////////////////////////////////
if (!$offset) {
if (db_num_rows($result) > 0) {
$reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url, $feed_title,
$reply['toolbar'] = format_headline_subtoolbar($link, $feed_site_url,
$feed_title,
$feed, $cat_view, $search, $match_on, $search_mode, $view_mode,
$last_error);
}
@ -5606,22 +5601,9 @@
}
function get_self_url_prefix() {
/* $url_path = "";
if ($_SERVER['HTTPS'] != "on") {
$url_path = "http://";
} else {
$url_path = "https://";
}
$url_path .= $_SERVER['HTTP_HOST'].dirname($_SERVER['PHP_SELF']);
return $url_path; */
return SELF_URL_PATH;
}
function opml_publish_url($link){
$url_path = get_self_url_prefix();
@ -6360,12 +6342,6 @@
$num_tags = 0;
/* if (get_user_theme($link) == "3pane") {
$tag_limit = 3;
} else {
$tag_limit = 6;
} */
$tag_limit = 6;
$formatted_tags = array();