* Removed all of the absolute URL's.

[citadel.git] / webcit / rss.c

diff --git a/webcit/rss.c b/webcit/rss.c
index 0e71987f2401c8a6e20fdb8d06ec1512ac1bf189..9d0a424020a066b210404f880f5cb8b41ed18cad 100644 (file)
--- a/webcit/rss.c
+++ b/webcit/rss.c
@@ -14,13 +14,13 @@ time_t if_modified_since;
 void display_rss_control(char *reply_to, char *subject)
 {
        wprintf("<div style=\"align: right;\"><p>\n");
-       wprintf("<a href=\"/display_enter?recp=");
+       wprintf("<a href=\"display_enter?recp=");
        urlescputs(reply_to);
        wprintf("&subject=");
        if (strncasecmp(subject, "Re: ", 3)) wprintf("Re:%20");
        urlescputs(subject);
        wprintf("\">[%s]</a> \n", _("Reply"));
-       wprintf("<a href=\"/display_enter?recp=");
+       wprintf("<a href=\"display_enter?recp=");
        urlescputs(reply_to);
        wprintf("&force_room=_MAIL_&subject=");
        if (strncasecmp(subject, "Re: ", 3)) wprintf("Re:%20");
@@ -232,10 +232,11 @@ void display_rss(char *roomname, char *request_method)
 
                /* Set up a character set conversion if we need to */
 #ifdef HAVE_ICONV
-               if (strcasecmp(charset, "us-ascii") && strcasecmp(charset, "utf-8")) {
+               if (strcasecmp(charset, "us-ascii") && strcasecmp(charset, "utf-8") && strcasecmp(charset, "") ) {
                        ic = iconv_open("UTF-8", charset);
                        if (ic == (iconv_t)(-1)) {
-                               lprintf(5, "iconv_open() failed: %s\n", strerror(errno));
+                               lprintf(5, "%s:%d iconv_open() failed: %s\n",
+                                       __FILE__, __LINE__, strerror(errno));
                                goto ENDBODY;
                        }
                }