* More license declarations

[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 7e844f52e607c63168dd50c6960ec9644bb38c07..47ef682073391851d5941330ac685298f0a58446 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -1,8 +1,23 @@
  /*
- * $Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $
+ * $Id$
   *
   * 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>
@@ -144,6 +159,7 @@ void rss_save_item(struct rss_item *ri) {
                 if (ri->author_or_creator != NULL) {
                         msg->cm_fields['A'] = html_to_ascii(ri->author_or_creator,
                                 strlen(ri->author_or_creator), 512, 0);
+                       striplt(msg->cm_fields['A']);
                 }
                 else {
                         msg->cm_fields['A'] = strdup("rss");
@@ -152,6 +168,7 @@ void rss_save_item(struct rss_item *ri) {
                 msg->cm_fields['N'] = strdup(NODENAME);
                 if (ri->title != NULL) {
                         msg->cm_fields['U'] = html_to_ascii(ri->title, strlen(ri->title), 512, 0);
+                       striplt(msg->cm_fields['U']);
                 }
                 msg->cm_fields['T'] = malloc(64);
                 snprintf(msg->cm_fields['T'], 64, "%ld", ri->pubdate);
@@ -160,11 +177,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"
@@ -307,7 +325,7 @@ void rss_xml_end(void *data, const char *supplied_el) {
         }
  
         if ( ((!strcasecmp(el, "author")) || (!strcasecmp(el, "creator"))) && (ri->chardata != NULL) ) {
-               if (ri->author_or_creator != NULL) free(ri->title);
+               if (ri->author_or_creator != NULL) free(ri->author_or_creator);
                 striplt(ri->chardata);
                 ri->author_or_creator = strdup(ri->chardata);
         }
@@ -397,7 +415,12 @@ 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)) {
                 curl_easy_setopt(curl, CURLOPT_INTERFACE, config.c_ip_addr);
         }
@@ -586,5 +609,5 @@ CTDL_MODULE_INIT(rssclient)
                 CtdlThreadSchedule ("RSS Client", CTDLTHREAD_BIGSTACK, rssclient_scan, NULL, 0);
         }
         /* return our Subversion id for the Log */
-        return "$Id: serv_rssclient.c 5652 2007-10-29 20:14:48Z ajc $";
+        return "$Id$";
  }