X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Ffeed_generator.c;h=00bc5074f6f31ada34ffe77cdf44066bb25a58ad;hb=HEAD;hp=2be5e1f7492dd326e24ac4d454fd060ecdb55a9b;hpb=ec636368885b210420016b3f544edcbab9189880;p=citadel.git
diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 2be5e1f74..119001bd8 100644
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -5,21 +5,14 @@
*
* This program is open source software. You can redistribute it and/or
* 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.
- *
- *
- *
- *
*/
#include "webcit.h"
-#include "webserver.h"
/*
@@ -86,6 +79,19 @@ void feed_rss_one_message(long msgnum) {
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);
@@ -141,6 +147,7 @@ void feed_rss_one_message(long msgnum) {
return;
}
+
/*
* RSS feed generator -- go through the message list
*/
@@ -155,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", NULL, &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 */
@@ -224,7 +231,7 @@ void feed_rss(void) {
escputs(ChrPtr(WC->CurRoom.name));
wc_printf("");
escputs(ChrPtr(site_prefix));
- wc_printf("/image?name=_roompic_?go=");
+ wc_printf("/roompic?room=");
urlescputs(ChrPtr(WC->CurRoom.name));
wc_printf("");
escputs(ChrPtr(site_prefix));