WebCit 7.13

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ce448a84e113178a582ce7e202a61a4a13233b1d..4a7de0715962249e0a5d95c10e6a8d47c2a2dfc1 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -75,16 +75,16 @@ void ical_dezonify_backend(icalcomponent *cal,
 
                /* Convert it to an icaltimezone type. */
                if (tzid != NULL) {
-                       lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+                       /* lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid); */
                        if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
                                utc_declared_as_tzid = 1;
-                               lprintf(9, "                * ...and we handle that internally.\n");
+                               /* lprintf(9, "                * ...and we handle that internally.\n"); */
                        }
                        else {
                                t = icalcomponent_get_timezone(cal, tzid);
-                               lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+                               /* lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
                                        (t ? "DO" : "DO NOT")
-                               );
+                               ); */
                        }
                }
 
@@ -108,24 +108,24 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+       /* lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
 
        if (TheTime.is_utc) {
-               lprintf(9, "                * This property is ALREADY UTC.\n");
+               /* lprintf(9, "                * This property is ALREADY UTC.\n"); */
        }
 
        else if (utc_declared_as_tzid) {
-               lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+               /* lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
                TheTime.is_utc = 1;
        }
 
        else {
                /* Do the conversion. */
                if (t != NULL) {
-                       lprintf(9, "                * Timezone prop found.  Converting to UTC.\n");
+                       /* lprintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
                }
                else {
-                       lprintf(9, "                * Converting default timezone to UTC.\n");
+                       /* lprintf(9, "                * Converting default timezone to UTC.\n"); */
                }
 
                if (t == NULL) {
@@ -140,7 +140,7 @@ void ical_dezonify_backend(icalcomponent *cal,
        }
 
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-       lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+       /* lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime)); */
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -206,7 +206,7 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
-       lprintf(9, "ical_dezonify() started\n");
+       /* lprintf(9, "ical_dezonify() started\n"); */
 
        /* Convert all times to UTC */
        ical_dezonify_recurse(cal, cal);
@@ -218,8 +218,7 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
-       lprintf(9, "ical_dezonify() completed\n");
+       /* lprintf(9, "ical_dezonify() completed\n"); */
 }
 
-
 #endif /* CITADEL_WITH_CALENDAR_SERVICE */

diff --git a/citadel/tools.c b/citadel/tools.c
index 5c457de3b3e90617bc82029ae014f0d24a42a57a..5f225ccbddc03e814a3a02bb53e1eade2f7150a7 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -82,10 +82,10 @@ int strncasecmp(char *lstr, char *rstr, int len)
 /*
  * num_tokens()  -  discover number of parameters/tokens in a string
  */
-int num_tokens(char *source, char tok)
+int num_tokens(const char *source, char tok)
 {
        int count = 1;
-       char *ptr = source;
+       const char *ptr = source;
 
        if (source == NULL) {
                return (0);

diff --git a/webcit/configure.ac b/webcit/configure.ac
index a7738d78418f283c83e682caacef3aa1654bfcbe..ce25377fa5b93239ded74a0ffcb05dfeb3dca5d8 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(webserver.c)
 
 
 PACKAGE=webcit
-VERSION=7.12
+VERSION=7.13
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index eae5c97422723e9d10f896cdb61265fbe09a2196..aa21dfe95bfaeea9f31cfbba29d833b4991cb15d 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -70,16 +70,16 @@ void ical_dezonify_backend(icalcomponent *cal,
 
                /* Convert it to an icaltimezone type. */
                if (tzid != NULL) {
-                       lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid);
+                       /* lprintf(9, "                * Stringy supplied timezone is: '%s'\n", tzid); */
                        if ( (!strcasecmp(tzid, "UTC")) || (!strcasecmp(tzid, "GMT")) ) {
                                utc_declared_as_tzid = 1;
-                               lprintf(9, "                * ...and we handle that internally.\n");
+                               /* lprintf(9, "                * ...and we handle that internally.\n"); */
                        }
                        else {
                                t = icalcomponent_get_timezone(cal, tzid);
-                               lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
+                               /* lprintf(9, "                * ...and I %s have tzdata for that zone.\n",
                                        (t ? "DO" : "DO NOT")
-                               );
+                               ); */
                        }
                }
 
@@ -103,24 +103,24 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
-       lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
+       /* lprintf(9, "                * Was: %s\n", icaltime_as_ical_string(TheTime)); */
 
        if (TheTime.is_utc) {
-               lprintf(9, "                * This property is ALREADY UTC.\n");
+               /* lprintf(9, "                * This property is ALREADY UTC.\n"); */
        }
 
        else if (utc_declared_as_tzid) {
-               lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid);
+               /* lprintf(9, "                * Replacing '%s' TZID with 'Z' suffix.\n", tzid); */
                TheTime.is_utc = 1;
        }
 
        else {
                /* Do the conversion. */
                if (t != NULL) {
-                       lprintf(9, "                * Timezone prop found.  Converting to UTC.\n");
+                       /* lprintf(9, "                * Timezone prop found.  Converting to UTC.\n"); */
                }
                else {
-                       lprintf(9, "                * Converting default timezone to UTC.\n");
+                       /* lprintf(9, "                * Converting default timezone to UTC.\n"); */
                }
 
                if (t == NULL) {
@@ -135,7 +135,7 @@ void ical_dezonify_backend(icalcomponent *cal,
        }
 
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-       lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
+       /* lprintf(9, "                * Now: %s\n", icaltime_as_ical_string(TheTime)); */
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {
@@ -201,7 +201,7 @@ void ical_dezonify_recurse(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
        icalcomponent *vt = NULL;
 
-       lprintf(9, "ical_dezonify() started\n");
+       /* lprintf(9, "ical_dezonify() started\n"); */
 
        /* Convert all times to UTC */
        ical_dezonify_recurse(cal, cal);
@@ -213,7 +213,7 @@ void ical_dezonify(icalcomponent *cal) {
                icalcomponent_free(vt);
        }
 
-       lprintf(9, "ical_dezonify() completed\n");
+       /* lprintf(9, "ical_dezonify() completed\n"); */
 }
 
 

diff --git a/webcit/static/gradient_background.jpg b/webcit/static/gradient_background.jpg
new file mode 100644 (file)
index 0000000..8b95a89
Binary files /dev/null and b/webcit/static/gradient_background.jpg differ

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 71d8951f91ae3fc4151f2fbe1c7dba9f733f04d8..9ed1ee29c4e0ec5cc41bc3843fe15adb16e8710f 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -9,6 +9,7 @@ body {
        height: 100%;
        overflow: auto;
        background-color: #D8D8D8;
+       //background-image:url(/static/gradient_background.jpg);
        color: #000000;
        font-weight: normal;
        font-size: 10pt;

diff --git a/webcit/webcit.h b/webcit/webcit.h
index e4ae3b7d7b20f5c1d7d75c0b3f3ce6690be81767..2e1a006cf801dcbbd737c67be49219bb55f11e7c 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -123,10 +123,10 @@ extern locale_t wc_locales[];
 #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 v7.12"  /* who's in da house */
+#define SERVER                 "WebCit v7.13"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         712             /* This version of WebCit */
+#define CLIENT_VERSION         713             /* This version of WebCit */
 #define MINIMUM_CIT_VERSION    710             /* min required Citadel ver. */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"