X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ffeed_generator.c;h=00bc5074f6f31ada34ffe77cdf44066bb25a58ad;hb=HEAD;hp=648309cc4551d54dc95212497bd2f5af50588046;hpb=1d82485e0277efce7a74c579584a588f681c7c89;p=citadel.git

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 648309cc4..119001bd8 100644
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -1,25 +1,18 @@
 /*
  * RSS feed generator (could be adapted in the future to feed both RSS and Atom)
  *
- * Copyright (c) 2010-2011 by the citadel.org team
+ * Copyright (c) 2010-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
-#include "webserver.h"
 
 
 /*
@@ -36,9 +29,9 @@ void feed_rss_one_message(long msgnum) {
 	const char *BufPtr = NULL;
 	StrBuf *Line = NewStrBufPlain(NULL, 1024);
 	char buf[1024];
+	int permalink_hash = 0;
 
-	/* FIXME if this is a blog room we only want to include top-level messages */
-
+	/* Phase 1: read the message into memory */
 	serv_printf("MSG4 %ld", msgnum);
 	serv_getln(buf, sizeof buf);
 	if (buf[0] != '1') return;
@@ -47,69 +40,114 @@ void feed_rss_one_message(long msgnum) {
 		StrBufAppendPrintf(ServerResponse, "%s\n", buf);
 	}
 
-	wc_printf("<item>");
-	wc_printf("<link>%s/readfwd?go=", ChrPtr(site_prefix));
-	urlescputs(ChrPtr(WC->CurRoom.name));
-	wc_printf("?start_reading_at=%ld</link>", msgnum);
-
+	/* Phase 2: help SkyNet become self-aware */
+	BufPtr = NULL;
 	while (StrBufSipLine(Line, ServerResponse, &BufPtr), ((BufPtr!=StrBufNOTNULL)&&(BufPtr!=NULL)) ) {
-		safestrncpy(buf, ChrPtr(Line), sizeof buf);
 		if (in_body) {
-			if (in_messagetext) {
-				StrBufAppendBufPlain(messagetext, buf, -1, 0);
-				StrBufAppendBufPlain(messagetext, HKEY("\r\n"), 0);
-			}
-			else if (IsEmptyStr(buf)) {
-				in_messagetext = 1;
-			}
+			/* do nothing */
 		}
-		else if (!strncasecmp(buf, "subj=", 5)) {
-			wc_printf("<title>");
-			escputs(&buf[5]);
-			wc_printf("</title>");
-			++found_title;
+		else if (StrLength(Line) == 0) {
+			++in_body;
 		}
-		else if (!strncasecmp(buf, "exti=", 5)) {
-			wc_printf("<guid isPermaLink=\"false\">");
-			escputs(&buf[5]);
-			wc_printf("</guid>");
-			++found_guid;
+		else if ((StrLength(Line) > 5) && (!strncasecmp(ChrPtr(Line), "wefw=", 5))) {
+			is_top_level_post = 0;	/* presence of references means it's a reply/comment */
 		}
-		else if (!strncasecmp(buf, "time=", 5)) {
-			http_datestring(pubdate, sizeof pubdate, atol(&buf[5]));
-			wc_printf("<pubDate>%s</pubDate>", pubdate);
+		else if ((StrLength(Line) > 5) && (!strncasecmp(ChrPtr(Line), "msgn=", 5))) {
+			StrBufCutLeft(Line, 5);
+			permalink_hash = ThreadIdHash(Line);
 		}
-		else if (!strncasecmp(buf, "wefw=", 5)) {
-			is_top_level_post = 0;	/* presence of references means it's a reply/comment */
+	}
+
+	/*
+	 * Phase 3: output the message in RSS <item> form
+	 * (suppress replies [comments] if this is a blog room)
+	 */
+	if ( (WC->CurRoom.view != VIEW_BLOG) || (is_top_level_post == 1) ) {
+		wc_printf("<item>");
+		wc_printf("<link>%s/readfwd?go=", ChrPtr(site_prefix));
+		urlescputs(ChrPtr(WC->CurRoom.name));
+		if ((WC->CurRoom.view == VIEW_BLOG) && (permalink_hash != 0)) {
+			wc_printf("?p=%d", permalink_hash);
 		}
-		else if (!strncasecmp(buf, "text", 4)) {
-			if (!found_title) {
-				wc_printf("<title>Message #%ld</title>", msgnum);
+		else {
+			wc_printf("?start_reading_at=%ld", msgnum);
+		}
+		wc_printf("</link>");
+	
+		BufPtr = NULL;
+		in_body = 0;
+		in_messagetext = 0;
+		while (StrBufSipLine(Line, ServerResponse, &BufPtr), ((BufPtr!=StrBufNOTNULL)&&(BufPtr!=NULL)) ) {
+			safestrncpy(buf, ChrPtr(Line), sizeof buf);
+
+			/* XML parsers can be picky; strip out nonprintable header characters */
+			if ((strlen(buf)>=6) && (buf[4]=='=')) {
+				char *p = &buf[5];
+				while (*p) {
+					if (!isprint(*p)) {
+						*p = 0;
+					}
+					++p;
+				}
+			}
+
+			/* Now output fields */
+			if (in_body) {
+				if (in_messagetext) {
+					StrBufAppendBufPlain(messagetext, buf, -1, 0);
+					StrBufAppendBufPlain(messagetext, HKEY("\r\n"), 0);
+				}
+				else if (IsEmptyStr(buf)) {
+					in_messagetext = 1;
+				}
 			}
-			if (!found_guid) {
-				wc_printf("<guid isPermaLink=\"false\">%ld@%s</guid>",
-					msgnum,
-					ChrPtr(WC->serv_info->serv_humannode)
-				);
+			else if (!strncasecmp(buf, "subj=", 5)) {
+				wc_printf("<title>");
+				escputs(&buf[5]);
+				wc_printf("</title>");
+				++found_title;
+			}
+			else if (!strncasecmp(buf, "exti=", 5)) {
+				wc_printf("<guid isPermaLink=\"false\">");
+				escputs(&buf[5]);
+				wc_printf("</guid>");
+				++found_guid;
+			}
+			else if (!strncasecmp(buf, "time=", 5)) {
+				http_datestring(pubdate, sizeof pubdate, atol(&buf[5]));
+				wc_printf("<pubDate>%s</pubDate>", pubdate);
+			}
+			else if (!strncasecmp(buf, "text", 4)) {
+				if (!found_title) {
+					wc_printf("<title>Message #%ld</title>", msgnum);
+				}
+				if (!found_guid) {
+					wc_printf("<guid isPermaLink=\"false\">%ld@%s</guid>",
+						msgnum,
+						ChrPtr(WC->serv_info->serv_humannode)
+					);
+				}
+				wc_printf("<description>");
+				in_body = 1;
+				messagetext = NewStrBuf();
 			}
-			wc_printf("<description>");
-			in_body = 1;
-			messagetext = NewStrBuf();
 		}
-	}
+	
+		if (in_body) {
+			cdataout((char*)ChrPtr(messagetext));
+			FreeStrBuf(&messagetext);
+			wc_printf("</description>");
+		}
 
-	if (in_body) {
-		cdataout((char*)ChrPtr(messagetext));
-		FreeStrBuf(&messagetext);
-		wc_printf("</description>");
+		wc_printf("</item>");
 	}
 
-	wc_printf("</item>");
 	FreeStrBuf(&Line);
 	FreeStrBuf(&ServerResponse);
 	return;
 }
 
+
 /*
  * RSS feed generator -- go through the message list
  */
@@ -124,7 +162,7 @@ void feed_rss_do_messages(void) {
 	Stat.maxload = INT_MAX;
 	Stat.lowest_found = (-1);
 	Stat.highest_found = (-1);
-	num_msgs = load_msg_ptrs("MSGS ALL", &Stat, NULL);
+	num_msgs = load_msg_ptrs("MSGS ALL", NULL, NULL, &Stat, NULL, NULL, NULL, NULL, 0);
 	if (num_msgs < 1) return;
 
 	i = num_msgs;					/* convention is to feed newest-to-oldest */
@@ -193,7 +231,7 @@ void feed_rss(void) {
 	escputs(ChrPtr(WC->CurRoom.name));
 	wc_printf("</title><url>");
 	escputs(ChrPtr(site_prefix));
-	wc_printf("/image?name=_roompic_?go=");
+	wc_printf("/roompic?room=");
 	urlescputs(ChrPtr(WC->CurRoom.name));
 	wc_printf("</url><link>");
 	escputs(ChrPtr(site_prefix));
@@ -218,15 +256,12 @@ void tmplput_rssmeta(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;
 	char feed_link[1024];
-	char encoded_link[1024];
 
 	strcpy(feed_link, "/feed_rss?go=");
 	urlesc(&feed_link[20], sizeof(feed_link) - 20, (char *)ChrPtr(WCC->CurRoom.name) );
-	CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0);
-
 	StrBufAppendPrintf(Target,
-		"<link rel=\"alternate\" title=\"RSS\" href=\"/B64%s\" type=\"application/rss+xml\">",
-		encoded_link
+		"<link rel=\"alternate\" title=\"RSS\" href=\"%s\" type=\"application/rss+xml\">",
+		feed_link
 	);
 }
 
@@ -236,17 +271,16 @@ void tmplput_rssmeta(StrBuf *Target, WCTemplputParams *TP)
  */
 void tmplput_rssbutton(StrBuf *Target, WCTemplputParams *TP) 
 {
-	wcsession *WCC = WC;
-	char feed_link[1024];
-	char encoded_link[1024];
+	StrBuf *FeedLink = NULL;
 
-	strcpy(feed_link, "/feed_rss?go=");
-	urlesc(&feed_link[20], sizeof(feed_link) - 20, (char *)ChrPtr(WCC->CurRoom.name) );
-	CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0);
+	FeedLink = NewStrBufPlain(HKEY("/feed_rss?go="));
+	StrBufUrlescAppend(FeedLink, WC->CurRoom.name, NULL);
 
-	StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
-	StrBufAppendPrintf(Target, "<img border=\"0\" src=\"static/rss_16x.png\" alt=\"RSS\">");
+	StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"");
+	StrBufAppendBuf(Target, FeedLink, 0);
+	StrBufAppendPrintf(Target, "\"><img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
 	StrBufAppendPrintf(Target, "</a>");
+	FreeStrBuf(&FeedLink);
 }