X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=85d7f0c1b2675c8e068520790e610e13b7fc4d36;hb=f3d67d7b31c63a0830c714420f6c3af0fdbbb13b;hp=250e1ecdd436bef27e2f40f925a552f9943beede;hpb=ba5851b4f7f719f4297a927940bf191d1a09568c;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index 250e1ecdd..85d7f0c1b 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.
  */
 
@@ -48,7 +48,6 @@
 #include "parsedate.h"
 #include "database.h"
 #include "citadel_dirs.h"
-#include "md5.h"
 #include "context.h"
 #include "internet_addressing.h"
 
@@ -73,7 +72,6 @@ struct rssparser {
 };
 
 time_t last_run = 0L;
-struct CitContext rss_CC;
 struct rssurl *rsstodo = NULL;
 
 
@@ -125,7 +123,6 @@ void rss_end_element(void *data, const char *el)
 		(!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
@@ -178,10 +175,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, 0);	// 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);
 				}
@@ -326,6 +323,7 @@ void rssclient_push_todo(char *rssurl, char *roomname)
 			thisone = r;
 		}
 	}
+
 	if (thisone == NULL) {
 		thisone = malloc(sizeof(struct rssurl));
 		thisone->url = strdup(rssurl);
@@ -446,7 +444,6 @@ void rssclient_scan(void) {
 		return;
 	}
 
-	become_session(&rss_CC);
 	syslog(LOG_DEBUG, "rssclient: started");
 	CtdlForEachRoom(rssclient_scan_room, NULL);
 	rss_pull_feeds();
@@ -463,10 +460,6 @@ CTDL_MODULE_INIT(rssclient)
 		syslog(LOG_INFO, "rssclient: using %s", curl_version());
 		CtdlRegisterSessionHook(rssclient_scan, EVT_TIMER, PRIO_AGGR + 300);
 	}
-	else
-	{
-		CtdlFillSystemContext(&rss_CC, "rssclient");
-	}
 	return "rssclient";
 }