functionality updates

backend.php

@@ -20,12 +20,12 @@
 				WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
 			FROM ttrss_feeds ORDER BY title");			
 
-		print "<ul>";
+		print "<table width=\"100%\">";
 
 		$lnum = 0;
 
 		while ($line = pg_fetch_assoc($result)) {
-
+		
 			$feed = $line["title"];
 			$feed_id = $line["id"];	  
 			
@@ -35,14 +35,21 @@
 			$class = ($lnum % 2) ? "even" : "odd";
 			
 //			if ($lnum == 2 || $lnum == 0) $feed = "<b>$feed</b>";
-			
+
-			$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed ($unread/$total)</a>";
+			if ($unread > 0) $class .= "Unread";
-			
+
-			print "<li class=\"$class\">$feed</li>";
+			print "<tr class=\"$class\" id=\"FEEDR-$feed_id\">";
+
+			$feed = "<a href=\"javascript:viewfeed($feed_id, 0);\">$feed</a>";
+			print "<td id=\"FEEDN-$feed_id\">$feed</td>";
+			print "<td id=\"FEEDU-$feed_id\">$unread</td>";
+			print "<td id=\"FEEDT-$feed_id\">$total</td>";
+
+			print "</tr>";
 			++$lnum;
 		}
 
-		print "</ul>";
+		print "</table>";
 
 	}
 
@@ -50,6 +57,8 @@
 
 		$id = $_GET["id"];
 
+		$result = pg_query("UPDATE ttrss_entries SET unread = false WHERE id = '$id'");
+
 		$result = pg_query("SELECT title,link,content FROM ttrss_entries
 			WHERE	id = '$id'");
 
@@ -72,9 +81,10 @@
 	if ($op == "viewfeed") {
 
 		$feed = $_GET["feed"];
-//		$feed = 0; // for speed
-
 		$skip = $_GET["skip"];
+		$ext = $_GET["ext"];
+
+		if ($ext == "undefined") $ext = "";
 
 		$result = pg_query("SELECT * FROM ttrss_feeds WHERE id = '$feed'");
 
@@ -82,129 +92,159 @@
 
 			$line = pg_fetch_assoc($result);
 
-			$rss = fetch_rss($line["feed_url"]);
+			if (!$ext) {
 
-			if ($rss) {
+				$rss = fetch_rss($line["feed_url"]);
-
+	
-				foreach ($rss->items as $item) {
+				if ($rss) {
-
+	
-					$entry_guid = $item["id"];
+					foreach ($rss->items as $item) {
-
+	
-					if (!$entry_guid) $entry_guid = $item["guid"];
+						$entry_guid = $item["id"];
-					if (!$entry_guid) $entry_guid = $item["link"];
+	
-
+						if (!$entry_guid) $entry_guid = $item["guid"];
-					$entry_timestamp = $item["pubdate"];
+						if (!$entry_guid) $entry_guid = $item["link"];
-					if (!$entry_timestamp) $entry_timestamp = $item["modified"];
+	
-					if (!$entry_timestamp) $entry_timestamp = $item["updated"];
+						$entry_timestamp = $item["pubdate"];
-
+						if (!$entry_timestamp) $entry_timestamp = $item["modified"];
-					$entry_timestamp = strtotime($entry_timestamp);
+						if (!$entry_timestamp) $entry_timestamp = $item["updated"];
-
+	
-					$entry_title = $item["title"];
+						$entry_timestamp = strtotime($entry_timestamp);
-					$entry_link = $item["link"];
+	
-
+						$entry_title = $item["title"];
-					$entry_content = $item["description"];
+						$entry_link = $item["link"];
-					if (!$entry_content) $entry_content = $item["content"];
+	
-
+						$entry_content = $item["description"];
-					$entry_content = pg_escape_string($entry_content);
+						if (!$entry_content) $entry_content = $item["content"];
-					$entry_title = pg_escape_string($entry_title);
+	
-
+						$entry_content = pg_escape_string($entry_content);
-					$content_md5 = md5($entry_content);
+						$entry_title = pg_escape_string($entry_title);
-
+	
-					$result = pg_query("
+						$content_md5 = md5($entry_content);
-						SELECT 
+	
-							id,unread,md5_hash
+						$result = pg_query("
-						FROM
+							SELECT 
-							ttrss_entries 
+								id,unread,md5_hash
-						WHERE
+							FROM
-							guid = '$entry_guid' OR md5_hash = '$content_md5'");
+								ttrss_entries 
-					
-					if (pg_num_rows($result) == 0) {
-
-						$entry_timestamp = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
-
-						$query = "INSERT INTO ttrss_entries 
-								(title, guid, link, updated, content, feed_id, md5_hash) 
-							VALUES
-								('$entry_title', '$entry_guid', '$entry_link', 
-									'$entry_timestamp', '$entry_content', '$feed', 
-									'$content_md5')";
-
-						pg_query($query);
-
-					} else {
-
-						$entry_id = pg_fetch_result($result, 0, "id");
-						$entry_timestamp = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
-
-						$unread = pg_fetch_result($result, 0, "unread");
-						$md5_hash = pg_fetch_result($result, 0, "md5_hash");
-					
-						if ($md5_hash != $content_md5) 
-							$unread = "false";
-					
-						$query = "UPDATE ttrss_entries 
-							SET 
-								title ='$entry_title', 
-								link = '$entry_link', 
-								updated = '$entry_timestamp', 
-								content = '$entry_content',
-								md5_hash = '$content_md5',
-								unread = '$unread'
 							WHERE
-								id = '$entry_id'";
+								guid = '$entry_guid' OR md5_hash = '$content_md5'");
-
+						
-						$result = pg_query($query);
+						if (pg_num_rows($result) == 0) {
-
+	
-//						print "$entry_guid - $entry_timestamp - $entry_title - 
+							$entry_timestamp = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
-//							$entry_link - $entry_id<br>";
+	
-
+							$query = "INSERT INTO ttrss_entries 
+									(title, guid, link, updated, content, feed_id, md5_hash) 
+								VALUES
+									('$entry_title', '$entry_guid', '$entry_link', 
+										'$entry_timestamp', '$entry_content', '$feed', 
+										'$content_md5')";
+	
+							pg_query($query);
+	
+						} else {
+	
+							$entry_id = pg_fetch_result($result, 0, "id");
+							$entry_timestamp = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp);
+	
+							$unread = pg_fetch_result($result, 0, "unread");
+							$md5_hash = pg_fetch_result($result, 0, "md5_hash");
+						
+							if ($md5_hash != $content_md5) 
+								$unread = "false";
+						
+							$query = "UPDATE ttrss_entries 
+								SET 
+									title ='$entry_title', 
+									link = '$entry_link', 
+									updated = '$entry_timestamp', 
+									content = '$entry_content',
+									md5_hash = '$content_md5',
+									unread = '$unread'
+								WHERE
+									id = '$entry_id'";
+	
+							$result = pg_query($query);
+	
+	//						print "$entry_guid - $entry_timestamp - $entry_title - 
+	//							$entry_link - $entry_id<br>";
+	
+						}
+	
 					}
-
+		
-				}
-			
-				print "<table class=\"headlines\" width=\"100%\">";
-				print "<tr><td colspan=\"2\" class=\"title\">" . $rss->channel["title"] . "</td></tr>";
-
-				$result = pg_query("SELECT id,title,updated,unread FROM ttrss_entries WHERE
-					feed_id = '$feed' ORDER BY updated LIMIT 10 OFFSET $skip");
-
-				$lnum = 0;
-
-				while ($line = pg_fetch_assoc($result)) {
-
-					$class = ($lnum % 2) ? "even" : "odd";
-
-					if ($line["unread"] == "t") 
-						$class .= "Unread";
-
-					$content_link = "<a href=\"javascript:view(".$line["id"].");\">".$line["title"]."</a>";
-					
-					print "<tr class='$class' id='RROW-".$line["id"]."'>";
-					print "<td class='headlineUpdated'>".$line["updated"]."</td>";
-					print "<td class='headlineTitle'>$content_link</td>";
-
-					print "</tr>";
-
-					++$lnum;
 				}
 
-				print "<tr><td colspan=\"2\" class=\"headlineToolbar\">";
+			} else {
 
-				$next_skip = $skip + 10;
+				if ($ext == "MarkAllRead")  {
-				$prev_skip = $skip - 10;
 
-				print "<a class=\"button\" 
+					pg_query("UPDATE ttrss_entries SET unread = false 
-					href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
+						WHERE feed_id = '$feed'");
-				print "&nbsp;";
+				}
-				print "<a class=\"button\" 
-					href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
-
-				print "</td></tr>";
-				print "</table>";
 
 			}
-
 		}
+
+		print "<table class=\"headlines\" width=\"100%\">";
+		print "<tr><td colspan=\"2\" class=\"title\">" . $line["title"] . "</td></tr>";
+
+		$result = pg_query("SELECT id,title,updated,unread,feed_id FROM
+			ttrss_entries WHERE
+			feed_id = '$feed' ORDER BY updated LIMIT ".HEADLINES_PER_PAGE." OFFSET $skip");
+
+		$lnum = 0;
+
+		while ($line = pg_fetch_assoc($result)) {
+
+			$class = ($lnum % 2) ? "even" : "odd";
+
+			if ($line["unread"] == "t") 
+				$class .= "Unread";
+
+			$content_link = "<a href=\"javascript:view(".$line["id"].",".$line["feed_id"].");\">".$line["title"]."</a>";
+			
+			print "<tr class='$class' id='RROW-".$line["id"]."'>";
+			print "<td class='headlineUpdated'>".$line["updated"]."</td>";
+			print "<td class='headlineTitle'>$content_link</td>";
+
+			print "</tr>";
+
+			++$lnum;
+		}
+
+		print "<tr><td colspan=\"2\" class=\"headlineToolbar\">";
+
+		$next_skip = $skip + HEADLINES_PER_PAGE;
+		$prev_skip = $skip - HEADLINES_PER_PAGE;
+
+		print "<a class=\"button\" 
+			href=\"javascript:viewfeed($feed, $prev_skip);\">Previous Page</a>";
+		print "&nbsp;";
+		print "<a class=\"button\" 
+			href=\"javascript:viewfeed($feed, $next_skip);\">Next Page</a>";
+		print "&nbsp;&nbsp;&nbsp;";
+		
+		print "<a class=\"button\" 
+			href=\"javascript:viewfeed($feed, 0, 'MarkAllRead');\">Mark all as read</a>";
+
+		print "</td></tr>";
+		print "</table>";
+
+		$result = pg_query("SELECT id, (SELECT count(id) FROM ttrss_entries 
+			WHERE feed_id = ttrss_feeds.id) AS total,
+		(SELECT count(id) FROM ttrss_entries
+			WHERE feed_id = ttrss_feeds.id AND unread = true) as unread
+		FROM ttrss_feeds WHERE id = '$feed'");			
+
+		$total = pg_fetch_result($result, 0, "total");
+		$unread = pg_fetch_result($result, 0, "unread");
+
+		print "<div class=\"invisible\" id=\"FACTIVE\">$feed</div>";
+		print "<div class=\"invisible\" id=\"FTOTAL\">$total</div>";
+		print "<div class=\"invisible\" id=\"FUNREAD\">$unread</div>";
+
 	}
 
 

config.php-dist

@@ -1,4 +1,6 @@
 <?
 	define(DB_CONN, "host=localhost dbname=fox user=fox password=XXXXXXXXXXX");
+	define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache');
+	define(HEADLINES_PER_PAGE, 15);
 ?>
 

tt-rss.css

@@ -62,7 +62,10 @@ table.main td.toolbar {
 
 table.main td.header {
 	font-size : 18pt;
-	background : #f0f0f0;
+	background-color : #f0f0f0;
+	background-image : url("header.png");
+	background-position : top left;
+	background-repeat : repeat-x;
 	height : 50px;
 	padding-left : 80px;
 	padding-top : 30px;
@@ -127,3 +130,7 @@ ul {
 	padding : 0px;
 	border : 1px solid #f0f0f0;
 }
+
+.invisible {
+	display : none;
+}

tt-rss.js

@@ -50,7 +50,6 @@ function feedlist_callback() {
 	var container = document.getElementById('feeds');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML=xmlhttp.responseText;
-	} else {
 	}
 }
 
@@ -58,7 +57,28 @@ function viewfeed_callback() {
 	var container = document.getElementById('headlines');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML = xmlhttp.responseText;
-	} else {
+
+		var factive = document.getElementById("FACTIVE");
+		var funread = document.getElementById("FUNREAD");
+		var ftotal = document.getElementById("FTOTAL");
+
+		if (ftotal && factive && funread) {
+			var feed_id = factive.innerHTML;
+
+			var feedr = document.getElementById("FEEDR-" + feed_id);
+			var feedt = document.getElementById("FEEDT-" + feed_id);
+			var feedu = document.getElementById("FEEDU-" + feed_id);
+
+			feedt.innerHTML = ftotal.innerHTML;
+			feedu.innerHTML = funread.innerHTML;
+
+			if (feedu.innerHTML > 0 && !feedr.className.match("Unread")) {
+					feedr.className = feedr.className + "Unread";
+			} else if (feedu.innerHTML <= 0) {	
+					feedr.className = feedr.className.replace("Unread", "");
+			}
+
+		}
 	}
 }
 
@@ -66,7 +86,6 @@ function view_callback() {
 	var container = document.getElementById('content');
 	if (xmlhttp.readyState == 4) {
 		container.innerHTML=xmlhttp.responseText;		
-	} else {
 	}
 }
 
@@ -79,28 +98,34 @@ function update_feed_list() {
 
 }
 
-function viewfeed(feed, skip) {
+function viewfeed(feed, skip, ext) {
 
 	notify("view-feed: " + feed);
 
 	document.getElementById('headlines').innerHTML='Loading headlines, please wait...';		
+	document.getElementById('content').innerHTML='&nbsp;';		
 
 	xmlhttp.open("GET", "backend.php?op=viewfeed&feed=" + param_escape(feed) +
-		"&skip=" + skip, true);
+		"&skip=" + param_escape(skip) + "&ext=" + param_escape(ext) , true);
 	xmlhttp.onreadystatechange=viewfeed_callback;
 	xmlhttp.send(null);
 
 }
 
-function view(id) {
+function view(id,feed_id) {
 
 	var crow = document.getElementById("RROW-" + id);
 
-	if (crow) {
+	if (crow.className.match("Unread")) {
+		var umark = document.getElementById("FEEDU-" + feed_id);
+		umark.innerHTML = umark.innerHTML - 1;
 		crow.className = crow.className.replace("Unread", "");
-	}
 
-	notify(crow.className);
+		if (umark.innerHTML == "0") {
+			var feedr = document.getElementById("FEEDR-" + feed_id);
+			feedr.className = feedr.className.replace("Unread", "");
+		}
+	}
 
 	document.getElementById('content').innerHTML='Loading, please wait...';		
 

tt-rss.php

@@ -17,7 +17,7 @@
 <tr>
 	<td class="toolbar" valign="middle" colspan="2">	
 		<a class="button">Preferences</a>
-		<a class="button" href="javascript:reload()">Refresh</a>
+		<a class="button" href="javascript:refresh()">Refresh</a>
 	</td>
 </tr>
 <tr>
@@ -25,11 +25,11 @@
 		Here be feeds
 	</td>
 	<td id="headlines" class="headlines" valign="top">
-			Here be headlines
+		Please select the feed.
 	</td>
 </tr>
 	<td class="content" id="content" valign="top">
-		Here be content	
+		&nbsp;
 	</td>
 </tr>
 <tr>