* Get ready for the 6.10 release

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index c3ce7dfeb431c356757b9aa43d478f81dd5abc8a..2a0784d769141aca180917c2ecc78906aa2b5057 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
 $Log$

+Revision 400.82  2003/01/13 03:34:33  ajc
+* Get ready for the 6.10 release
+

 Revision 400.81  2003/01/12 23:22:53  ajc
 * configure.in: check for libical v0.24 or newer
 
 Revision 400.81  2003/01/12 23:22:53  ajc
 * configure.in: check for libical v0.24 or newer
 


@@ -1234,4 +1237,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix

-

diff --git a/webcit/README.txt b/webcit/README.txt
index 774522802b08a95beb56cd80c0de92323cf870a6..de9d0da50873042cd478e07f583f1f130f356e84 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,5 +1,5 @@
                       WEBCIT for the Citadel/UX System
                       WEBCIT for the Citadel/UX System

-                               version 4.00
+                               version 4.10

  
    Copyright (C) 1996-2002 by the authors.  Portions written by:
        Art Cancro
  
    Copyright (C) 1996-2002 by the authors.  Portions written by:
        Art Cancro


@@ -14,15 +14,15 @@ Public License.  Please read COPYING.txt for more licensing information.
  INTRODUCTION
  ------------
  
  INTRODUCTION
  ------------
  

- Citadel/UX is a sophisticated BBS package which allows multiple users to
-simultaneously access the system using a variety of user interfaces.  This
-package (WebCit) is a "middleware" package which presents an HTML/HTTP user
-interface to the Citadel system.
+ Citadel/UX is a sophisticated BBS and groupware package which allows multiple
+users to simultaneously access the system using a variety of user interfaces.
+This package (WebCit) is a "middleware" package which presents an HTML/HTTP
+user interface to the Citadel system.

  
  What this means in practice is that after you've installed WebCit, users can
  
  What this means in practice is that after you've installed WebCit, users can

-access all functions of your BBS using any web browser.  Since this may be the
-first Citadel experience for many new users, the screens have been designed to
-be attractive and easy to navigate.
+access all functions of your system using any web browser.  Since this may be
+the first Citadel experience for many new users, the screens have been designed
+to be attractive and easy to navigate.

  
  
  INSTALLATION
  
  
  INSTALLATION


@@ -117,6 +117,15 @@ ones which you may be interested in are:
     banner, and on the top left corner of each page.
  
  
     banner, and on the top left corner of each page.
  
  

+ CALENDAR SERVICE
+ ----------------
+ 
+ WebCit contains support for calendaring and scheduling.  In order to use it
+you must have libical v0.24 (or newer) on your system.  You must also be
+running a Citadel server with calendaring support.  The calendar service will
+be automatically configured and installed if your host system supports it.
+ 
+ 

  CONCLUSION
  ----------
  
  CONCLUSION
  ----------
  

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 3b9bf2e862934d9a272017687e1a5f58b4117e1c..087a2a8b3f26a071b72d16e931eda146de4593e4 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -27,7 +27,7 @@
 #include "webcit.h"
 #include "webserver.h"
 
 #include "webcit.h"
 #include "webserver.h"
 

-#ifndef HAVE_ICAL_H
+#ifndef WEBCIT_WITH_CALENDAR_SERVICE

 
 /*
  * Handler stubs for builds with no calendar library available
 
 /*
  * Handler stubs for builds with no calendar library available


@@ -59,7 +59,7 @@ void display_task(long msgnum) {
                "</i><br>\n");
 }
 
                "</i><br>\n");
 }
 

-#else /* HAVE_ICAL_H */
+#else /* WEBCIT_WITH_CALENDAR_SERVICE */

 
 
 /******   End of handler stubs.  Everything below this line is real.   ******/
 
 
 /******   End of handler stubs.  Everything below this line is real.   ******/


@@ -835,4 +835,4 @@ void save_event(void) {
        }
 }
 
        }
 }
 

-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 154f43e03cf5f093917a3877c119094118c21655..dfc97f3bc3271e52b0ca030cb72a8f595bb29833 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -43,7 +43,7 @@ char *hourname[] = {
        "7pm", "8pm", "9pm", "10pm", "11pm"
 };
 
        "7pm", "8pm", "9pm", "10pm", "11pm"
 };
 

-#ifdef HAVE_ICAL_H
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

 
 /*
  * The display_icaltimetype_as_webform() and icaltime_from_webform() functions
 
 /*
  * The display_icaltimetype_as_webform() and icaltime_from_webform() functions

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index c1ccd9e9f945d141357a32cc11a8fd8b86ff8818..1acb1fad1f0bd1c6fd4259ef2a22473625211555 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -26,17 +26,16 @@
 #include "webcit.h"
 #include "webserver.h"
 
 #include "webcit.h"
 #include "webserver.h"
 

-#ifndef HAVE_ICAL_H
+#ifndef WEBCIT_WITH_CALENDAR_SERVICE

 
 void do_calendar_view(void) {  /* stub for non-libical builds */
        wprintf("<CENTER><I>Calendar view not available</I></CENTER><BR>\n");
 }
 
 
 void do_calendar_view(void) {  /* stub for non-libical builds */
        wprintf("<CENTER><I>Calendar view not available</I></CENTER><BR>\n");
 }
 

-#else  /* HAVE_ICAL_H */
+#else  /* WEBCIT_WITH_CALENDAR_SERVICE */

 
 /****************************************************************************/
 
 
 /****************************************************************************/
 

-#include "ical.h"

 
 void calendar_month_view_display_events(time_t thetime) {
        int i;
 
 void calendar_month_view_display_events(time_t thetime) {
        int i;


@@ -545,4 +544,4 @@ void do_calendar_view(void) {
 
 }
 
 
 }
 

-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */

diff --git a/webcit/event.c b/webcit/event.c
index 52aa8a12f7640dbe538de1a9639371eab174678e..0b729ccf6a0704a0e8aca764a21879829324f384 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -28,7 +28,7 @@
 #include "webserver.h"
 
 
 #include "webserver.h"
 
 

-#ifdef HAVE_ICAL_H
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

 
 /*
  * Display an event by itself (for editing)
 
 /*
  * Display an event by itself (for editing)


@@ -644,4 +644,4 @@ STARTOVER:
 }
 
 
 }
 
 

-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index ab0d725a99307839d845584fb1105af0b345c477..6bf691bbb78272f9acc74664136c80517f3667b5 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -16,8 +16,7 @@
 #include <strings.h>
 #include "webcit.h"
 
 #include <strings.h>
 #include "webcit.h"
 

-#ifdef HAVE_ICAL_H
-#include <ical.h>
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

 
 
 /*
 
 
 /*


@@ -160,4 +159,4 @@ void ical_dezonify(icalcomponent *cal) {
 }
 
 
 }
 
 

-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */

diff --git a/webcit/summary.c b/webcit/summary.c
index f5a4896b72220935f7da0e051be76b376334a106..46bed8fdec0eef8c29f49ad9fabff3a94e69d955 100644 (file)
--- a/webcit/summary.c
+++ b/webcit/summary.c
@@ -164,7 +164,7 @@ void calendar_section(void) {
        int i;
 
        section_title("Today on your calendar");
        int i;
 
        section_title("Today on your calendar");

-#ifdef HAVE_ICAL_H
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

        gotoroom("Calendar", 0);
        if (strcasecmp(WC->wc_roomname, "Calendar")) {
                wprintf("<i>(You do not have a calendar)</i><BR>\n");
        gotoroom("Calendar", 0);
        if (strcasecmp(WC->wc_roomname, "Calendar")) {
                wprintf("<i>(You do not have a calendar)</i><BR>\n");


@@ -182,7 +182,7 @@ void calendar_section(void) {
        }
 
        calendar_summary_view();
        }
 
        calendar_summary_view();

-#endif /* HAVE_ICAL_H */
+#endif /* WEBCIT_WITH_CALENDAR_SERVICE */

 }
 
 
 }
 
 

diff --git a/webcit/webcit.c b/webcit/webcit.c
index d1927a4a26f01496bf4c4ab64619372561370e25..257ba8d0d441a6d649ca66cafe30c2af8f926299 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -1150,7 +1150,7 @@ void session_loop(struct httprequest *req)
                display_floorconfig(NULL);
        } else if (!strcasecmp(action, "toggle_self_service")) {
                toggle_self_service();
                display_floorconfig(NULL);
        } else if (!strcasecmp(action, "toggle_self_service")) {
                toggle_self_service();

-#ifdef HAVE_ICAL_H
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

        } else if (!strcasecmp(action, "display_edit_task")) {
                display_edit_task();
        } else if (!strcasecmp(action, "save_task")) {
        } else if (!strcasecmp(action, "display_edit_task")) {
                display_edit_task();
        } else if (!strcasecmp(action, "save_task")) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 16cfe39f6a3a18291127776115cf1823542be670..31976fc5514eb8b37b3b861bc936bf8bf9f5c78f 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -4,7 +4,14 @@
 #include <zlib.h>
 #endif
 
 #include <zlib.h>
 #endif
 

+

 #ifdef HAVE_ICAL_H
 #ifdef HAVE_ICAL_H

+#ifdef HAVE_LIBICAL
+#define WEBCIT_WITH_CALENDAR_SERVICE 1
+#endif
+#endif
+
+#ifdef WEBCIT_WITH_CALENDAR_SERVICE

 #include <ical.h>
 #endif
 
 #include <ical.h>
 #endif
 


@@ -17,10 +24,10 @@
 #define SLEEPING               180             /* TCP connection timeout */
 #define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
 #define PORT_NUM               2000            /* port number to listen on */
 #define SLEEPING               180             /* TCP connection timeout */
 #define WEBCIT_TIMEOUT         900             /* WebCit session timeout */
 #define PORT_NUM               2000            /* port number to listen on */

-#define SERVER                 "WebCit v4.00"  /* who's in da house */
+#define SERVER                 "WebCit v4.10"  /* who's in da house */

 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4

-#define CLIENT_VERSION         400
+#define CLIENT_VERSION         410

 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */