* Updated internal version number of citadel and webcit to 7.23

* Implement RSS feed reader config screen in webcit

diff --git a/citadel/citadel.h b/citadel/citadel.h
index c20ee80425ec1da64d8c7dae0bc3f1232bec9555..1bda089c64258ae24f251eaa18a00e9339ba46b6 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -47,7 +47,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      722             /* This version */
+#define REV_LEVEL      723             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 722             /* Oldest compatible export files */
 

diff --git a/citadel/citadel.nsi b/citadel/citadel.nsi
index 82b9d463835e4a710fdf736015452903a68d6232..b1696e22e8a40b91a01d1a6aec2756856c46d432 100644 (file)
--- a/citadel/citadel.nsi
+++ b/citadel/citadel.nsi
@@ -4,7 +4,7 @@
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 !define MUI_PRODUCT "Citadel"
-!define MUI_VERSION "7.21"
+!define MUI_VERSION "7.23"
 !define MUI_WELCOMEPAGE
 !define MUI_LICENSEPAGE
 !define MUI_COMPONENTSPAGE

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 9d307d67c1f2304ff09f3dc5ded767c2fa4ea836..694f74b17cd3fd7384c40678f494ebf55ee01059 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.22], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.23], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_PREFIX_DEFAULT(/usr/local/citadel)

diff --git a/webcit/README.txt b/webcit/README.txt
index f83693debc632db63d569960662dc1f7b839ff7a..094a7df4309eb8e827565f14b79167c0077a1460 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,9 +1,11 @@
                         WEBCIT for the Citadel System
-                               version 7.11
+                               version 7.23
  
    Copyright (C) 1996-2007 by the authors.  Portions written by:
+ 
        Art Cancro
-       Wilifried Goesgens
+       Wilfried Goesgens
+       Dave West
        Nathan Bryant
        Nick Grossman
        Andru Luvisi

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 06e7247c75623aca10bad59027892e5513999906..4cbbc701bddb9434d7ede1ddfffea05f7996e222 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
-AC_INIT([WebCit], [7.22], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.23], [http://www.citadel.org/])
 
 AC_SUBST(PROG_SUBDIRS)
 AC_DEFINE(PROG_SUBDIRS, [], [Program dirs])

diff --git a/webcit/roomops.c b/webcit/roomops.c
index e5148d0914eaa0e78f9fad6e4a0cda492da67332..891243959ed15f2ccf80f8e2488337671a0159c1 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -1778,7 +1778,7 @@ void display_editroom(void)
                wprintf(_("Password"));
                wprintf("</td><td>");
                wprintf(_("Keep messages on server?"));
-               wprintf("</td></tr>");
+               wprintf("</td><td> </td></tr>");
 
                serv_puts("GNET");
                serv_getln(buf, sizeof buf);
@@ -1835,6 +1835,55 @@ void display_editroom(void)
                wprintf("</td></tr>");
                wprintf("</form></table>\n");
 
+               wprintf("<hr>\n");
+
+               wprintf("<i>");
+               wprintf(_("Fetch the following RSS feeds and store them in this room:"));
+               wprintf("</i><br /><br />\n");
+
+               wprintf("<table border=0 cellpadding=5><tr class=\"tab_cell\"><td>");
+               wprintf(_("Feed URL"));
+               wprintf("</td><td>");
+               wprintf("</td></tr>");
+
+               serv_puts("GNET");
+               serv_getln(buf, sizeof buf);
+               if (buf[0]=='1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+                       extract_token(cmd, buf, 0, '|', sizeof cmd);
+                       if (!strcasecmp(cmd, "rssclient")) {
+                               safestrncpy(recp, &buf[10], sizeof recp);
+                               wprintf("<tr>");
+
+                               wprintf("<td>");
+                               extract_token(pop3_host, buf, 1, '|', sizeof pop3_host);
+                               escputs(pop3_host);
+                               wprintf("</td>");
+
+                               wprintf("<td>");
+                               wprintf(" <a href=\"netedit&cmd=remove&tab=feeds&line=rssclient|");
+                               urlescputs(recp);
+                               wprintf("\">");
+                               wprintf(_("(remove)"));
+                               wprintf("</A></td>");
+                       
+                               wprintf("</tr>");
+                       }
+               }
+
+               wprintf("<form method=\"POST\" action=\"netedit\">\n"
+                       "<tr>"
+                       "<input type=\"hidden\" NAME=\"tab\" VALUE=\"feeds\">"
+                       "<input type=\"hidden\" NAME=\"prefix\" VALUE=\"rssclient|\">\n");
+               wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
+               wprintf("<td>");
+               wprintf("<input type=\"text\" id=\"add_as_pop3host\" SIZE=\"72\" "
+                       "MAXLENGTH=\"256\" NAME=\"line_pop3host\">\n");
+               wprintf("</td>");
+               wprintf("<td>");
+               wprintf("<input type=\"submit\" NAME=\"add_button\" VALUE=\"%s\">", _("Add"));
+               wprintf("</td></tr>");
+               wprintf("</form></table>\n");
+
                wprintf("</div>");
        }
 

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 5f4c3ccdc03b8cb262cc03c3c9d48fbb261672ef..b10ed8ddce78fa0e29ef249010d81ab7cfccedb9 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -117,8 +117,8 @@ extern locale_t wc_locales[];
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         722             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    710             /* min required Citadel ver. */
+#define CLIENT_VERSION         723             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    723             /* min required Citadel ver. */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */