Citadel API clean up.

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c
diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c

index 7902ab7434fbbb07c2f3809db883319ac0ccdc21..e60c5ad9448d39fe8437cf2813a24744000537a7 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -3,6 +3,21 @@
   *
   * Bring external RSS feeds into rooms.
   *
+ * Copyright (c) 2007-2009 by the citadel.org team
+ *
+ *  This program is free 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.
+ *
+ *  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 <stdlib.h>
@@ -34,7 +49,6 @@
  #include "support.h"
  #include "config.h"
  #include "threads.h"
-#include "room_ops.h"
  #include "ctdl_module.h"
  #include "clientsocket.h"
  #include "msgbase.h"
@@ -162,11 +176,12 @@ void rss_save_item(struct rss_item *ri) {
                                 msg->cm_fields['O'] = strdup(ri->channel_title);
                         }
                 }
-
-               msglen = 1024 + strlen(ri->link) + strlen(ri->description) ;
+               if (ri->link == NULL) 
+                       ri->link = strdup("");
+               msglen += 1024 + strlen(ri->link) + strlen(ri->description) ;
                 msg->cm_fields['M'] = malloc(msglen);
                 snprintf(msg->cm_fields['M'], msglen,
-                       "Content-type: text/html\r\n\r\n"
+                       "Content-type: text/html; charset=\"UTF-8\"\r\n\r\n"
                         "<html><body>\n"
                         "%s<br><br>\n"
                         "<a href=\"%s\">%s</a>\n"
@@ -399,6 +414,10 @@ void rss_do_fetching(char *url, char *rooms) {
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, rss_libcurl_callback);
         curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errmsg);
         curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+#ifdef CURLOPT_HTTP_CONTENT_DECODING
+       curl_easy_setopt(curl, CURLOPT_HTTP_CONTENT_DECODING, 1);
+       curl_easy_setopt(curl, CURLOPT_ENCODING, "");
+#endif
         curl_easy_setopt(curl, CURLOPT_USERAGENT, CITADEL);
         curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);           /* die after 180 seconds */
         if (!IsEmptyStr(config.c_ip_addr)) {
@@ -560,7 +579,7 @@ void *rssclient_scan(void *args) {
         doing_rssclient = 1;
  
         CtdlLogPrintf(CTDL_DEBUG, "rssclient started\n");
-       ForEachRoom(rssclient_scan_room, NULL);
+       CtdlForEachRoom(rssclient_scan_room, NULL);
  
         while (rnclist != NULL && !CtdlThreadCheckStop()) {
                 rss_do_fetching(rnclist->url, rnclist->rooms);