support for comments attribute (schema updated)

4 files changed, 24 insertions, 38 deletions

diff --git a/backend.php b/backend.php
index 3d304655a..1ae88917e 100644
--- a/backend.php
+++ b/backend.php
@@ -178,7 +178,7 @@
 
 		$result = pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
 
-		$result = pg_query("SELECT title,link,content,feed_id,
+		$result = pg_query("SELECT title,link,content,feed_id,comments,
 			(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url 
 			FROM ttrss_entries
 			WHERE	id = '$id'");
@@ -199,10 +199,18 @@
 			print "<tr class=\"titleTop\"><td align=\"right\"><b>Title:</b></td>
 				<td width=\"100%\">".$line["title"]."</td>
 				<td>&nbsp;</td></tr>";
-				
+
+			if ($line["comments"] && $line["comments"] != $line["link"]) {
+//				print "<tr class=\"titleInner\"><td align=\"right\"><b>Comments:</b></td>
+//					<td><a href=\"".$line["comments"]."\">".$line["comments"]."</a></td>
+//					<td>&nbsp;</td> </tr>";
+
+				$comments_prompt = "(<a href=\"".$line["comments"]."\">Comments</a>)";
+			}
+			
 			print "<tr class=\"titleBottom\"><td align=\"right\"><b>Link:</b></td>
-				<td><a href=\"".$line["link"]."\">".$line["link"]."</a></td>
-				<td>&nbsp;</td> </tr>";
+				<td><a href=\"".$line["link"]."\">".$line["link"]."</a> $comments_prompt</td>
+				<td>&nbsp;</td></tr>";
 			print "<tr><td valign=\"top\" class=\"post\" 
 				colspan=\"2\">" . $line["content"] . "</td>
 				<td valign=\"top\">$feed_icon</td>
diff --git a/functions.php b/functions.php
index e769e79ea..aac732232 100644
--- a/functions.php
+++ b/functions.php
@@ -153,6 +153,8 @@
 
 				$content_hash = "SHA1:" . sha1(strip_tags($entry_content));
 
+				$entry_comments = $item["comments"];
+
 				$result = pg_query($link, "
 					SELECT 
 						id,last_read,no_orig_date,title,feed_id,content_hash,
@@ -164,9 +166,11 @@
 
 				if (pg_num_rows($result) == 0) {
 
+					$entry_guid = pg_escape_string($entry_guid);
 					$entry_content = pg_escape_string($entry_content);
 					$entry_title = pg_escape_string($entry_title);
 					$entry_link = pg_escape_string($entry_link);
+					$entry_comments = pg_escape_string($entry_comments);
 
 					$query = "INSERT 
 						INTO ttrss_entries 
@@ -177,6 +181,7 @@
 							content, 
 							content_hash,
 							feed_id, 
+							comments,
 							no_orig_date) 
 						VALUES
 							('$entry_title', 
@@ -186,6 +191,7 @@
 							'$entry_content', 
 							'$content_hash',
 							'$feed', 
+							'$entry_comments',
 							$no_orig_date)";
 
 					$result = pg_query($link, $query);
@@ -217,14 +223,15 @@
 						$last_read_qpart = 'last_read = null,';
 					}
 
-//					if ($orig_timestamp < $entry_timestamp) {
+//					if (!$no_orig_date && $orig_timestamp < $entry_timestamp) {
 //						$last_read_qpart = 'last_read = null,';
 //					}
 
+					$entry_comments = pg_escape_string($entry_comments);
 					$entry_content = pg_escape_string($entry_content);
-					$entry_title = pg_escape_string($entry_title);
+					$entry_title = pg_escape_string($entry_title);					
 					$entry_link = pg_escape_string($entry_link);
-
+			
 					$query = "UPDATE ttrss_entries 
 						SET 
 							$last_read_qpart 
@@ -232,6 +239,7 @@
 							link = '$entry_link', 
 							updated = '$entry_timestamp_fmt',
 							content = '$entry_content',
+							comments = '$entry_comments',
 							content_hash = '$content_hash'
 						WHERE
 							id = '$orig_entry_id'";
diff --git a/tt-rss.css b/tt-rss.css
index 8c16790eb..104964472 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -98,9 +98,6 @@ input {
 table.main td.toolbar {
 	height : 40px;
 	background-color : #f0f0f0;
-	/* background-image : url("shadow_top.png");
-	background-position : bottom left;
-	background-repeat : repeat-x; */
 	padding-right : 10px;
 	padding-left : 10px;
 	font-size : small;
@@ -200,17 +197,6 @@ table.main td.notify {
 	font-weight : bold;
 }
 
-li {
-	list-style-type : none;
-
-}
-
-ul {
-	margin : 0px;
-	padding : 0px;
-	border : 1px solid #f0f0f0;
-}
-
 .invisible {
 	display : none;
 }
@@ -251,7 +237,6 @@ table.prefFeedList tr.title td {
 	font-weight : bold;
 }
 
-
 .evenSelected {
 	background-color : #e0e0ff;
 }
@@ -344,22 +329,6 @@ table.postTable tr.titleBottom td {
 
 }
 
-/*
-table.postTable tr.titleTop td {
-	padding : 5px 10px 0px 10px;
-}
-
-table.postTable tr.titleBottom td {
-	padding : 3px 10px 5px 10px;	
-}
-
-table.postTable tr.headerRow td.headers, table.postTable tr.headerRow td.iconBox {
-	background : #f0f0f0;
-	border-width : 0px 0px 1px 0px;
-	border-color : #d0d0d0;
-	border-style : solid;
-}*/
-
 table.postTable td.post {
 	padding : 20px;
 
diff --git a/ttrss_schema.sql b/ttrss_schema.sql
index 0ee3a7558..e986a2685 100644
--- a/ttrss_schema.sql
+++ b/ttrss_schema.sql
@@ -38,5 +38,6 @@ create table ttrss_entries (id serial not null primary key,
 	last_read timestamp,
 	date_entered timestamp not null default NOW(),
 	no_orig_date boolean not null default false,
+	comments varchar(250) not null default '',
 	unread boolean not null default true);