Readloop remove special cases

[citadel.git] / webcit / feed_generator.c

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 40ee30f7c33813cddf01026d2a5ce530f88d90c4..34b721bdd248ec35fd8902a6558e69902d2eb6f5 100644 (file)
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -155,7 +155,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, &Stat, NULL);
        if (num_msgs < 1) return;
 
        i = num_msgs;                                   /* convention is to feed newest-to-oldest */
@@ -267,17 +267,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);
 }