final touches on dkim test harness

[citadel.git] / webcit / feed_generator.c

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 34b721bdd248ec35fd8902a6558e69902d2eb6f5..119001bd837315d334980f2be73e229779ad4ecb 100644 (file)
--- 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"
 
 
 /*
@@ -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("</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));
@@ -249,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
        );
 }