diff options
author | Andrew Dolgov <[email protected]> | 2013-04-17 16:23:15 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-04-17 16:48:41 +0400 |
commit | 6322ac79a020ab584d412d782d62b2ee77d7c6cf (patch) | |
tree | b2e64a140a3bc9d9ce649ee67f8a687b6511d9f4 /include/ccache.php | |
parent | aca75cb5cb323535099c7aef46a78ea3cec082f2 (diff) |
remove $link
Diffstat (limited to 'include/ccache.php')
-rw-r--r-- | include/ccache.php | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/include/ccache.php b/include/ccache.php index c53b1a08c..10e70ffe3 100644 --- a/include/ccache.php +++ b/include/ccache.php @@ -1,19 +1,19 @@ <?php - /* function ccache_zero($link, $feed_id, $owner_uid) { - db_query($link, "UPDATE ttrss_counters_cache SET + /* function ccache_zero( $feed_id, $owner_uid) { + db_query( "UPDATE ttrss_counters_cache SET value = 0, updated = NOW() WHERE feed_id = '$feed_id' AND owner_uid = '$owner_uid'"); } */ - function ccache_zero_all($link, $owner_uid) { - db_query($link, "UPDATE ttrss_counters_cache SET + function ccache_zero_all( $owner_uid) { + db_query( "UPDATE ttrss_counters_cache SET value = 0 WHERE owner_uid = '$owner_uid'"); - db_query($link, "UPDATE ttrss_cat_counters_cache SET + db_query( "UPDATE ttrss_cat_counters_cache SET value = 0 WHERE owner_uid = '$owner_uid'"); } - function ccache_remove($link, $feed_id, $owner_uid, $is_cat = false) { + function ccache_remove( $feed_id, $owner_uid, $is_cat = false) { if (!$is_cat) { $table = "ttrss_counters_cache"; @@ -21,39 +21,39 @@ $table = "ttrss_cat_counters_cache"; } - db_query($link, "DELETE FROM $table WHERE + db_query( "DELETE FROM $table WHERE feed_id = '$feed_id' AND owner_uid = '$owner_uid'"); } - function ccache_update_all($link, $owner_uid) { + function ccache_update_all( $owner_uid) { - if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid)) { + if (get_pref( 'ENABLE_FEED_CATS', $owner_uid)) { - $result = db_query($link, "SELECT feed_id FROM ttrss_cat_counters_cache + $result = db_query( "SELECT feed_id FROM ttrss_cat_counters_cache WHERE feed_id > 0 AND owner_uid = '$owner_uid'"); while ($line = db_fetch_assoc($result)) { - ccache_update($link, $line["feed_id"], $owner_uid, true); + ccache_update( $line["feed_id"], $owner_uid, true); } /* We have to manually include category 0 */ - ccache_update($link, 0, $owner_uid, true); + ccache_update( 0, $owner_uid, true); } else { - $result = db_query($link, "SELECT feed_id FROM ttrss_counters_cache + $result = db_query( "SELECT feed_id FROM ttrss_counters_cache WHERE feed_id > 0 AND owner_uid = '$owner_uid'"); while ($line = db_fetch_assoc($result)) { - print ccache_update($link, $line["feed_id"], $owner_uid); + print ccache_update( $line["feed_id"], $owner_uid); } } } - function ccache_find($link, $feed_id, $owner_uid, $is_cat = false, + function ccache_find( $feed_id, $owner_uid, $is_cat = false, $no_update = false) { if (!is_numeric($feed_id)) return; @@ -61,7 +61,7 @@ if (!$is_cat) { $table = "ttrss_counters_cache"; /* if ($feed_id > 0) { - $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds + $tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds WHERE id = '$feed_id'"); $owner_uid = db_fetch_result($tmp_result, 0, "owner_uid"); } */ @@ -75,7 +75,7 @@ $date_qpart = "updated > DATE_SUB(NOW(), INTERVAL 15 MINUTE)"; } - $result = db_query($link, "SELECT value FROM $table + $result = db_query( "SELECT value FROM $table WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1"); @@ -85,30 +85,30 @@ if ($no_update) { return -1; } else { - return ccache_update($link, $feed_id, $owner_uid, $is_cat); + return ccache_update( $feed_id, $owner_uid, $is_cat); } } } - function ccache_update($link, $feed_id, $owner_uid, $is_cat = false, + function ccache_update( $feed_id, $owner_uid, $is_cat = false, $update_pcat = true) { if (!is_numeric($feed_id)) return; /* if (!$is_cat && $feed_id > 0) { - $tmp_result = db_query($link, "SELECT owner_uid FROM ttrss_feeds + $tmp_result = db_query( "SELECT owner_uid FROM ttrss_feeds WHERE id = '$feed_id'"); $owner_uid = db_fetch_result($tmp_result, 0, "owner_uid"); } */ - $prev_unread = ccache_find($link, $feed_id, $owner_uid, $is_cat, true); + $prev_unread = ccache_find( $feed_id, $owner_uid, $is_cat, true); /* When updating a label, all we need to do is recalculate feed counters * because labels are not cached */ if ($feed_id < 0) { - ccache_update_all($link, $owner_uid); + ccache_update_all( $owner_uid); return; } @@ -127,14 +127,14 @@ /* Recalculate counters for child feeds */ - $result = db_query($link, "SELECT id FROM ttrss_feeds + $result = db_query( "SELECT id FROM ttrss_feeds WHERE owner_uid = '$owner_uid' AND $cat_qpart"); while ($line = db_fetch_assoc($result)) { - ccache_update($link, $line["id"], $owner_uid, false, false); + ccache_update( $line["id"], $owner_uid, false, false); } - $result = db_query($link, "SELECT SUM(value) AS sv + $result = db_query( "SELECT SUM(value) AS sv FROM ttrss_counters_cache, ttrss_feeds WHERE id = feed_id AND $cat_qpart AND ttrss_feeds.owner_uid = '$owner_uid'"); @@ -142,27 +142,27 @@ $unread = (int) db_fetch_result($result, 0, "sv"); } else { - $unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid); + $unread = (int) getFeedArticles( $feed_id, $is_cat, true, $owner_uid); } - db_query($link, "BEGIN"); + db_query( "BEGIN"); - $result = db_query($link, "SELECT feed_id FROM $table + $result = db_query( "SELECT feed_id FROM $table WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1"); if (db_num_rows($result) == 1) { - db_query($link, "UPDATE $table SET + db_query( "UPDATE $table SET value = '$unread', updated = NOW() WHERE feed_id = '$feed_id' AND owner_uid = '$owner_uid'"); } else { - db_query($link, "INSERT INTO $table + db_query( "INSERT INTO $table (feed_id, value, owner_uid, updated) VALUES ($feed_id, $unread, $owner_uid, NOW())"); } - db_query($link, "COMMIT"); + db_query( "COMMIT"); if ($feed_id > 0 && $prev_unread != $unread) { @@ -172,36 +172,36 @@ if ($update_pcat) { - $result = db_query($link, "SELECT cat_id FROM ttrss_feeds + $result = db_query( "SELECT cat_id FROM ttrss_feeds WHERE owner_uid = '$owner_uid' AND id = '$feed_id'"); $cat_id = (int) db_fetch_result($result, 0, "cat_id"); - ccache_update($link, $cat_id, $owner_uid, true); + ccache_update( $cat_id, $owner_uid, true); } } } else if ($feed_id < 0) { - ccache_update_all($link, $owner_uid); + ccache_update_all( $owner_uid); } return $unread; } - /* function ccache_cleanup($link, $owner_uid) { + /* function ccache_cleanup( $owner_uid) { if (DB_TYPE == "pgsql") { - db_query($link, "DELETE FROM ttrss_counters_cache AS c1 WHERE + db_query( "DELETE FROM ttrss_counters_cache AS c1 WHERE (SELECT count(*) FROM ttrss_counters_cache AS c2 WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1 AND owner_uid = '$owner_uid'"); - db_query($link, "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE + db_query( "DELETE FROM ttrss_cat_counters_cache AS c1 WHERE (SELECT count(*) FROM ttrss_cat_counters_cache AS c2 WHERE c1.feed_id = c2.feed_id AND c2.owner_uid = c1.owner_uid) > 1 AND owner_uid = '$owner_uid'"); } else { - db_query($link, "DELETE c1 FROM + db_query( "DELETE c1 FROM ttrss_counters_cache AS c1, ttrss_counters_cache AS c2 WHERE @@ -209,7 +209,7 @@ c1.owner_uid = c2.owner_uid AND c1.feed_id = c2.feed_id"); - db_query($link, "DELETE c1 FROM + db_query( "DELETE c1 FROM ttrss_cat_counters_cache AS c1, ttrss_cat_counters_cache AS c2 WHERE |