code cleanup; ccache category calculation for cid=0 corrected

5 files changed, 20 insertions, 61 deletions

diff --git a/README b/README
index a040066a9..a278b44a4 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Tiny Tiny RSS
 Web-based news feed aggregator, designed to allow you to read news from 
 any location, while feeling as close to a real desktop application as possible.
 
-	http://tt-rss.spb.ru
+	http://tt-rss.org
 
 Copyright (C) 2005 Andrew Dolgov unless stated otherwise.
 
@@ -27,7 +27,7 @@ Licensed under GNU GPL version 2
 Features Overview
 =================
 
-	Updates: http://tt-rss.spb.ru/trac/wiki/FeatureList
+	Updates: http://tt-rss.org/trac/wiki/FeatureList
 
 	* Server-side application, user only needs a web browser
 	* Supports RSS, RDF, Atom feeds using Magpie or SimplePie library
@@ -43,7 +43,7 @@ Requirements
 		Basically, Firefox, Konqueror or MSIE6 are okay. See here
 		for more information:
 
-		http://tt-rss.spb.ru/trac/wiki/CompatibleBrowsers
+		http://tt-rss.org/trac/wiki/CompatibleBrowsers
 
 	* Web server, for example Apache
 	* PHP (requires PHP4 DOMXML extension)
@@ -56,7 +56,7 @@ Requirements
 Installation Notes
 ==================
 
-	Updates: http://tt-rss.spb.ru/trac/wiki/InstallationNotes
+	Updates: http://tt-rss.org/trac/wiki/InstallationNotes
 
 	* If you are upgrading from the previous version, don't forget to update 
 	schema and logout.
@@ -80,10 +80,10 @@ Installation Notes
 See also
 ========
 
-	* FAQ:				http://tt-rss.spb.ru/trac/wiki/FrequentlyAskedQuestions
-	* Forum:				http://tt-rss.spb.ru/forum
-	* Wiki:				http://tt-rss.spb.ru/trac/wiki/WikiStart
-	* Bug Tracker:		http://tt-rss.spb.ru/trac/report
+	* FAQ:				http://tt-rss.org/trac/wiki/FrequentlyAskedQuestions
+	* Forum:				http://tt-rss.org/forum
+	* Wiki:				http://tt-rss.org/trac/wiki/WikiStart
+	* Bug Tracker:		http://tt-rss.org/trac/report
 
 Contact
 =======
diff --git a/backend.php b/backend.php
index c2efc73d6..b7419dede 100644
--- a/backend.php
+++ b/backend.php
@@ -401,15 +401,6 @@
 			update_daemon_common($link, 0, true, true);
 			print " -->";
 
-			// FIXME : old feed update way. To be removed.
-			//$result = db_query($link, "SELECT id FROM ttrss_users");
-
-			//while ($line = db_fetch_assoc($result)) {
-			//	$user_id = $line["id"];
-			//	print "<!-- updating feeds of uid $user_id -->";
-			//	update_all_feeds($link, false, $user_id);
-			//}
-
 			print "<rpc-reply>
 				<message msg=\"All feeds updated\"/>
 			</rpc-reply>";
diff --git a/functions.php b/functions.php
index ebd3cff1a..c4ecc78ec 100644
--- a/functions.php
+++ b/functions.php
@@ -1825,11 +1825,11 @@
 
 		db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: New Releases',
-			'http://tt-rss.spb.ru/releases.rss')");
+			'http://tt-rss.org/releases.rss')");
 
 		db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
 			values ('$uid', 'Tiny Tiny RSS: Forum',
-			'http://tt-rss.spb.ru/forum/rss.php')");
+			'http://tt-rss.org/forum/rss.php')");
 	}
 
 	function logout_user() {
@@ -2349,7 +2349,9 @@
 
 	}
 
-	function getCategoryUnread($link, $cat) {
+	function getCategoryUnread($link, $cat, $owner_uid = false) {
+
+		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
 		if ($cat >= 0) {
 
@@ -2363,7 +2365,7 @@
 
 			$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE $cat_query 
 					AND hidden = false
-					AND owner_uid = " . $_SESSION["uid"]);
+					AND owner_uid = " . $owner_uid);
 	
 			$cat_feeds = array();
 			while ($line = db_fetch_assoc($result)) {
@@ -2377,7 +2379,7 @@
 			$result = db_query($link, "SELECT COUNT(int_id) AS unread 
 				FROM ttrss_user_entries,ttrss_entries 
 				WHERE	unread = true AND ($match_part) AND id = ref_id 
-				AND $age_qpart AND owner_uid = " . $_SESSION["uid"]);
+				AND $age_qpart AND owner_uid = " . $owner_uid);
 	
 			$unread = 0;
 	
@@ -2434,7 +2436,7 @@
 		$age_qpart = getMaxAgeSubquery();
 
 		if ($is_cat) {
-			return getCategoryUnread($link, $n_feed);		
+			return getCategoryUnread($link, $n_feed, $owner_uid);		
 		} else if ($n_feed == -1) {
 			$match_part = "marked = true";
 		} else if ($n_feed == -2) {
@@ -2522,8 +2524,6 @@
 		return $unread;
 	}
 
-	/* FIXME this needs reworking */
-
 	function getGlobalUnread($link, $user_id = false) {
 
 		if (!$user_id) {
@@ -2744,21 +2744,6 @@
 		return $ret_arr;
 	}
 
-/*	function getFeedCounter($link, $id) {
-	
-		$result = db_query($link, "SELECT 
-				count(id) as count,last_error
-			FROM ttrss_entries,ttrss_user_entries,ttrss_feeds
-			WHERE feed_id = '$id' AND unread = true
-			AND ttrss_user_entries.feed_id = ttrss_feeds.id
-			AND ttrss_user_entries.ref_id = ttrss_entries.id");
-	
-			$count = db_fetch_result($result, 0, "count");
-			$last_error = htmlspecialchars(db_fetch_result($result, 0, "last_error"));
-			
-			print "<counter type=\"feed\" id=\"$id\" counter=\"$count\" error=\"$last_error\"/>";		
-	} */
-
 	function getFeedCounters($link, $smart_mode = SMART_RPC_COUNTERS, $active_feed = false) {
 
 		$age_qpart = getMaxAgeSubquery();
@@ -2771,16 +2756,6 @@
 
 		$old_counters = $_SESSION["fctr_last_value"];
 
-/*		$result = db_query($link, "SELECT id,last_error,parent_feed,
-			".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated,
-			(SELECT count(id) 
-				FROM ttrss_entries,ttrss_user_entries 
-				WHERE feed_id = ttrss_feeds.id AND 
-					ttrss_user_entries.ref_id = ttrss_entries.id
-				AND unread = true AND owner_uid = ".$_SESSION["uid"].") as count
-			FROM ttrss_feeds WHERE owner_uid = ".$_SESSION["uid"] . "
-			AND parent_feed IS NULL"); */
-
 /*		$query = "SELECT ttrss_feeds.id,
 				ttrss_feeds.title,
 				".SUBSTRING_FOR_DATE."(ttrss_feeds.last_updated,1,19) AS last_updated, 
@@ -3824,7 +3799,7 @@
 	}
 
 	function check_for_update($link, $brief_fmt = true) {
-		$releases_feed = "http://tt-rss.spb.ru/releases.rss";
+		$releases_feed = "http://tt-rss.org/releases.rss";
 
 		if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
 			return;
@@ -3884,7 +3859,7 @@
 				} else {
 					return "New version of Tiny-Tiny RSS ($latest_version) is available:
 						<div class='milestoneDetails'>$content</div>
-						Visit <a target=\"_blank\" href=\"http://tt-rss.spb.ru/\">official site</a> for
+						Visit <a target=\"_blank\" href=\"http://tt-rss.org/\">official site</a> for
 						download and update information.";	
 				}
 
@@ -6008,7 +5983,7 @@
 			$table = "ttrss_cat_counters_cache";
 		}
 
-		if ($is_cat && $feed_id > 0) {
+		if ($is_cat && $feed_id >= 0) {
 			if ($feed_id != 0) {
 				$cat_qpart = "cat_id = '$feed_id'";
 			} else {
diff --git a/update_daemon2.php b/update_daemon2.php
index a85bc1f52..45ba2fbf2 100644
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -162,18 +162,11 @@
 						print "warning: unable to create stampfile";
 					}	
 
-					// $last_purge = 0;
-
-					// if (time() - $last_purge > PURGE_INTERVAL) {
-
 					// FIXME : $last_purge is of no use in a multiprocess update.
 					// FIXME : We ALWAYS purge old posts.
 					_debug("Purging old posts (random 30 feeds)...");
 					global_purge_old_posts($link, true, 30);
 
-					// 	$last_purge = time();
-					// }
-
 					// Call to the feed batch update function 
 					// or regenerate feedbrowser cache
 
diff --git a/update_daemon_loop.php b/update_daemon_loop.php
index c82ee561b..d3c760d87 100644
--- a/update_daemon_loop.php
+++ b/update_daemon_loop.php
@@ -76,7 +76,7 @@
 		update_daemon_common($link);
 	} else {
 		$count = update_feedbrowser_cache($link);
-		print "Finished, $count feeds processed.\n";
+		_debug("Finished, $count feeds processed.");
 	}