some things which were missed during the big merger.

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index c94013fc56d596140311e1168c35afbccc9c3e00..3c0e06919deb03ed85bd3bbf583a6727324dc0bf 100644 (file)
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -267,17 +267,16 @@ void tmplput_rssmeta(StrBuf *Target, WCTemplputParams *TP)
  */
 void tmplput_rssbutton(StrBuf *Target, WCTemplputParams *TP) 
 {
-       wcsession *WCC = WC;
-       char feed_link[1024];
-       char encoded_link[1024];
+       StrBuf *FeedLink = NULL;
 
-       strcpy(feed_link, "/feed_rss?go=");
-       urlesc(&feed_link[20], sizeof(feed_link) - 20, (char *)ChrPtr(WCC->CurRoom.name) );
-       CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0);
+       FeedLink = NewStrBufPlain(HKEY("/feed_rss?go="));
+       StrBufUrlescAppend(FeedLink, WC->CurRoom.name, NULL);
 
-       StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
-       StrBufAppendPrintf(Target, "<img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
+       StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"");
+       StrBufAppendBuf(Target, FeedLink, 0);
+       StrBufAppendPrintf(Target, "\"><img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
        StrBufAppendPrintf(Target, "</a>");
+       FreeStrBuf(&FeedLink);
 }
 
 

diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index b8f1332295fc581cbb5cfdaf87f95eb05d468b6e..a7cf607da6257d895d6b16a7a706ad19e3ac98e2 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -50,8 +50,5 @@
        </div>
 </div>
 <!-- end modal box -->
-<noscript><div id="noscript_warning">
-<?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
-</div></noscript>
 <div id="global">
 <!--("end head.html")-->