/*
* 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"
-
/*
* RSS feed generator -- do one message
*/
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);
return;
}
+
/*
* RSS feed generator -- go through the message list
*/
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 */
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));
{
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
);
}
*/
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 src=\"static/webcit_icons/essen/16x16/rss.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);
}