X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=ca05dd62d5067d619f77e030bf797b11a9b450a4;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=4f6677210002f5440b074fa544557a9b667f166e;hpb=cfa09472a585c534fd05c8a35811cff9ef18965f;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 4f6677210..ca05dd62d 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -3,14 +3,14 @@
  * very loose parser that scrapes both kinds of feeds and is not picky about
  * the standards compliance of the source data.
  *
- * Copyright (c) 2007-2018 by the citadel.org team
+ * Copyright (c) 2007-2020 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 version 3.
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
 
@@ -118,12 +118,16 @@ void rss_start_element(void *data, const char *el, const char **attribute)
 void rss_end_element(void *data, const char *el)
 {
 	struct rssparser *r = (struct rssparser *)data;
+	StrBuf *encoded_field;
+
+	if (StrLength(r->CData) > 0) {				// strip leading/trailing whitespace from field
+		StrBufTrim(r->CData);
+	}
 
 	if (							// end of a new item(rss) or entry(atom)
 		(!strcasecmp(el, "entry"))
 		|| (!strcasecmp(el, "item"))
 	) {
-
 		if (r->msg != NULL) {				// Save the message to the rooms
 
 			// use the link as an item id if nothing else is available
@@ -176,10 +180,10 @@ void rss_end_element(void *data, const char *el)
 				long msgnum = (-1);
 				for (rr=r->rooms; rr!=NULL; rr=rr->next) {
 					if (rr == r->rooms) {
-						msgnum = CtdlSubmitMsg(r->msg, NULL, rr->room, 0);
+						msgnum = CtdlSubmitMsg(r->msg, NULL, rr->room);		// in first room, save msg
 					}
 					else {
-						CtdlSaveMsgPointerInRoom(rr->room, msgnum, 0, NULL);
+						CtdlSaveMsgPointerInRoom(rr->room, msgnum, 0, NULL);	// elsewhere, save a pointer
 					}
 					syslog(LOG_DEBUG, "rssclient: saved message %ld to %s", msgnum, rr->room);
 				}
@@ -200,22 +204,25 @@ void rss_end_element(void *data, const char *el)
 
 	else if (!strcasecmp(el, "title")) {			// item subject (rss and atom)
 		if ((r->msg != NULL) && (CM_IsEmpty(r->msg, eMsgSubject))) {
-			CM_SetField(r->msg, eMsgSubject, ChrPtr(r->CData), StrLength(r->CData));
-			striplt(r->msg->cm_fields[eMsgSubject]);
+			encoded_field = NewStrBuf();
+			StrBufRFC2047encode(&encoded_field, r->CData);
+			CM_SetAsFieldSB(r->msg, eMsgSubject, &encoded_field);
 		}
 	}
 
 	else if (!strcasecmp(el, "creator")) {			// <creator> can be used if <author> is not present
 		if ((r->msg != NULL) && (CM_IsEmpty(r->msg, eAuthor))) {
-			CM_SetField(r->msg, eAuthor, ChrPtr(r->CData), StrLength(r->CData));
-			striplt(r->msg->cm_fields[eAuthor]);
+			encoded_field = NewStrBuf();
+			StrBufRFC2047encode(&encoded_field, r->CData);
+			CM_SetAsFieldSB(r->msg, eAuthor, &encoded_field);
 		}
 	}
 
 	else if (!strcasecmp(el, "author")) {			// <author> supercedes <creator> if both are present
 		if (r->msg != NULL) {
-			CM_SetField(r->msg, eAuthor, ChrPtr(r->CData), StrLength(r->CData));	// CM_SetField will free() the previous value
-			striplt(r->msg->cm_fields[eAuthor]);
+			encoded_field = NewStrBuf();
+			StrBufRFC2047encode(&encoded_field, r->CData);
+			CM_SetAsFieldSB(r->msg, eAuthor, &encoded_field);
 		}
 	}
 
@@ -243,7 +250,6 @@ void rss_end_element(void *data, const char *el)
 			r->link = NULL;
 		}
 		r->link = strdup(ChrPtr(r->CData));
-		striplt(r->link);
 	}
 
 	else if (
@@ -255,7 +261,6 @@ void rss_end_element(void *data, const char *el)
 			r->item_id = NULL;
 		}
 		r->item_id = strdup(ChrPtr(r->CData));
-		striplt(r->item_id);
 	}
 
 	else if (
@@ -268,7 +273,6 @@ void rss_end_element(void *data, const char *el)
 			r->description = NULL;
 		}
 		r->description = strdup(ChrPtr(r->CData));
-		striplt(r->description);
 	}
 
 	if (r->CData != NULL) {
@@ -324,6 +328,7 @@ void rssclient_push_todo(char *rssurl, char *roomname)
 			thisone = r;
 		}
 	}
+
 	if (thisone == NULL) {
 		thisone = malloc(sizeof(struct rssurl));
 		thisone->url = strdup(rssurl);