";
@@ -1522,14 +1522,14 @@ class Pref_Feeds extends Handler_Protected {
$cat_id = (int) $cat_id;
if ($cat_id > 0) {
- $cat_unread = ccache_find($this->link, $cat_id, $_SESSION["uid"], true);
+ $cat_unread = ccache_find( $cat_id, $_SESSION["uid"], true);
} else if ($cat_id == 0 || $cat_id == -2) {
- $cat_unread = getCategoryUnread($this->link, $cat_id);
+ $cat_unread = getCategoryUnread( $cat_id);
}
$obj['id'] = 'CAT:' . $cat_id;
$obj['items'] = array();
- $obj['name'] = getCategoryTitle($this->link, $cat_id);
+ $obj['name'] = getCategoryTitle( $cat_id);
$obj['type'] = 'category';
$obj['unread'] = (int) $cat_unread;
$obj['bare_id'] = $cat_id;
@@ -1542,10 +1542,10 @@ class Pref_Feeds extends Handler_Protected {
$feed_id = (int) $feed_id;
if (!$title)
- $title = getFeedTitle($this->link, $feed_id, false);
+ $title = getFeedTitle( $feed_id, false);
if ($unread === false)
- $unread = getFeedUnread($this->link, $feed_id, false);
+ $unread = getFeedUnread( $feed_id, false);
$obj['id'] = 'FEED:' . $feed_id;
$obj['name'] = $title;
@@ -1567,7 +1567,7 @@ class Pref_Feeds extends Handler_Protected {
$interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
}
- $result = db_query($this->link, "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
+ $result = db_query( "SELECT ttrss_feeds.title, ttrss_feeds.site_url,
ttrss_feeds.feed_url, ttrss_feeds.id, MAX(updated) AS last_article
FROM ttrss_feeds, ttrss_entries, ttrss_user_entries WHERE
(SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
@@ -1621,7 +1621,7 @@ class Pref_Feeds extends Handler_Protected {
htmlspecialchars($line["title"])."";
print "
";
- print make_local_datetime($this->link, $line['last_article'], false);
+ print make_local_datetime( $line['last_article'], false);
print " | ";
print "";
@@ -1648,7 +1648,7 @@ class Pref_Feeds extends Handler_Protected {
print "
" . __("These feeds have not been updated because of errors:") .
"
";
- $result = db_query($this->link, "SELECT id,title,feed_url,last_error,site_url
+ $result = db_query( "SELECT id,title,feed_url,last_error,site_url
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
print "
";
@@ -1722,53 +1722,53 @@ class Pref_Feeds extends Handler_Protected {
* @param integer $id The id of the feed to purge.
* @return void
*/
- private function clear_feed_articles($link, $id) {
+ private function clear_feed_articles($id) {
if ($id != 0) {
- $result = db_query($link, "DELETE FROM ttrss_user_entries
+ $result = db_query( "DELETE FROM ttrss_user_entries
WHERE feed_id = '$id' AND marked = false AND owner_uid = " . $_SESSION["uid"]);
} else {
- $result = db_query($link, "DELETE FROM ttrss_user_entries
+ $result = db_query( "DELETE FROM ttrss_user_entries
WHERE feed_id IS NULL AND marked = false AND owner_uid = " . $_SESSION["uid"]);
}
- $result = db_query($link, "DELETE FROM ttrss_entries WHERE
+ $result = db_query( "DELETE FROM ttrss_entries WHERE
(SELECT COUNT(int_id) FROM ttrss_user_entries WHERE ref_id = id) = 0");
- ccache_update($link, $id, $_SESSION['uid']);
+ ccache_update( $id, $_SESSION['uid']);
} // function clear_feed_articles
- private function remove_feed_category($link, $id, $owner_uid) {
+ private function remove_feed_category( $id, $owner_uid) {
- db_query($link, "DELETE FROM ttrss_feed_categories
+ db_query( "DELETE FROM ttrss_feed_categories
WHERE id = '$id' AND owner_uid = $owner_uid");
- ccache_remove($link, $id, $owner_uid, true);
+ ccache_remove( $id, $owner_uid, true);
}
- static function remove_feed($link, $id, $owner_uid) {
+ static function remove_feed( $id, $owner_uid) {
if ($id > 0) {
/* save starred articles in Archived feed */
- db_query($link, "BEGIN");
+ db_query( "BEGIN");
/* prepare feed if necessary */
- $result = db_query($link, "SELECT feed_url FROM ttrss_feeds WHERE id = $id
+ $result = db_query( "SELECT feed_url FROM ttrss_feeds WHERE id = $id
AND owner_uid = $owner_uid");
- $feed_url = db_escape_string($link, db_fetch_result($result, 0, "feed_url"));
+ $feed_url = db_escape_string( db_fetch_result($result, 0, "feed_url"));
- $result = db_query($link, "SELECT id FROM ttrss_archived_feeds
+ $result = db_query( "SELECT id FROM ttrss_archived_feeds
WHERE feed_url = '$feed_url' AND owner_uid = $owner_uid");
if (db_num_rows($result) == 0) {
- $result = db_query($link, "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
+ $result = db_query( "SELECT MAX(id) AS id FROM ttrss_archived_feeds");
$new_feed_id = (int)db_fetch_result($result, 0, "id") + 1;
- db_query($link, "INSERT INTO ttrss_archived_feeds
+ db_query( "INSERT INTO ttrss_archived_feeds
(id, owner_uid, title, feed_url, site_url)
SELECT $new_feed_id, owner_uid, title, feed_url, site_url from ttrss_feeds
WHERE id = '$id'");
@@ -1778,31 +1778,31 @@ class Pref_Feeds extends Handler_Protected {
$archive_id = db_fetch_result($result, 0, "id");
}
- db_query($link, "UPDATE ttrss_user_entries SET feed_id = NULL,
+ db_query( "UPDATE ttrss_user_entries SET feed_id = NULL,
orig_feed_id = '$archive_id' WHERE feed_id = '$id' AND
marked = true AND owner_uid = $owner_uid");
/* Remove access key for the feed */
- db_query($link, "DELETE FROM ttrss_access_keys WHERE
+ db_query( "DELETE FROM ttrss_access_keys WHERE
feed_id = '$id' AND owner_uid = $owner_uid");
/* remove the feed */
- db_query($link, "DELETE FROM ttrss_feeds
+ db_query( "DELETE FROM ttrss_feeds
WHERE id = '$id' AND owner_uid = $owner_uid");
- db_query($link, "COMMIT");
+ db_query( "COMMIT");
if (file_exists(ICONS_DIR . "/$id.ico")) {
unlink(ICONS_DIR . "/$id.ico");
}
- ccache_remove($link, $id, $owner_uid);
+ ccache_remove( $id, $owner_uid);
} else {
- label_remove($link, feed_to_label_id($id), $owner_uid);
- //ccache_remove($link, $id, $owner_uid); don't think labels are cached
+ label_remove( feed_to_label_id($id), $owner_uid);
+ //ccache_remove( $id, $owner_uid); don't think labels are cached
}
}
@@ -1813,9 +1813,9 @@ class Pref_Feeds extends Handler_Protected {
print "
|
".__("Add one valid RSS feed per line (no feed detection is done)")."
| ";
- if (get_pref($this->link, 'ENABLE_FEED_CATS')) {
+ if (get_pref( 'ENABLE_FEED_CATS')) {
print __('Place in category:') . " ";
- print_feed_cat_select($this->link, "cat", false, 'dojoType="dijit.form.Select"');
+ print_feed_cat_select( "cat", false, 'dojoType="dijit.form.Select"');
}
print " |
| ";
print " |