move a bunch of functions into Feeds/Article namespaces

[tt-rss.git] / include / ccache.php

diff --git a/include/ccache.php b/include/ccache.php
index d89b9efe03c8b61a477c5e28b5ddbd9006ddd6f5..c6f7ddef93f5e2162c9c8d2de5855a6133c39ba1 100644 (file)
--- a/include/ccache.php
+++ b/include/ccache.php
@@ -92,7 +92,7 @@
        }
 
        function ccache_update($feed_id, $owner_uid, $is_cat = false,
-               $update_pcat = true) {
+               $update_pcat = true, $pcat_fast = false) {
 
                if (!is_numeric($feed_id)) return;
 
@@ -127,22 +127,25 @@
 
                        /* Recalculate counters for child feeds */
 
-                       $result = db_query("SELECT id FROM ttrss_feeds
+                       if (!$pcat_fast) {
+                               $result = db_query("SELECT id FROM ttrss_feeds
                                                WHERE owner_uid = '$owner_uid' AND $cat_qpart");
 
-                       while ($line = db_fetch_assoc($result)) {
-                               ccache_update($line["id"], $owner_uid, false, false);
+                               while ($line = db_fetch_assoc($result)) {
+                                       ccache_update($line["id"], $owner_uid, false, false);
+                               }
                        }
 
                        $result = db_query("SELECT SUM(value) AS sv
                                FROM ttrss_counters_cache, ttrss_feeds
                                WHERE id = feed_id AND $cat_qpart AND
+                               ttrss_counters_cache.owner_uid = $owner_uid AND
                                ttrss_feeds.owner_uid = '$owner_uid'");
 
                        $unread = (int) db_fetch_result($result, 0, "sv");
 
                } else {
-                       $unread = (int) getFeedArticles($feed_id, $is_cat, true, $owner_uid);
+                       $unread = (int) Feeds::getFeedArticles($feed_id, $is_cat, true, $owner_uid);
                }
 
                db_query("BEGIN");
@@ -177,7 +180,7 @@
 
                                        $cat_id = (int) db_fetch_result($result, 0, "cat_id");
 
-                                       ccache_update($cat_id, $owner_uid, true);
+                                       ccache_update($cat_id, $owner_uid, true, true, true);
 
                                }
                        }
@@ -219,4 +222,4 @@
 
                }
        } */
-?>
+