GroupDAV PROPFIND on the folder list collection now

looks at each room's default view instead of the user's current view.

diff --git a/webcit/groupdav_propfind.c b/webcit/groupdav_propfind.c
index 2e4cf5cf8e4b837b6fa1aa9ff4c90e00a0b8fd35..aac489450d4ebda431d692ceb9278f0bbba5d2c1 100644 (file)
--- a/webcit/groupdav_propfind.c
+++ b/webcit/groupdav_propfind.c
@@ -83,12 +83,18 @@ void groupdav_folder_list(void) {
        if (buf[0] == '1') while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
                extract_token(roomname, buf, 0, '|', sizeof roomname);
-               view = extract_int(buf, 6);
+               view = extract_int(buf, 7);
 
                /*
                 * For now, only list rooms that we know a GroupDAV client
                 * might be interested in.  In the future we may add
                 * the rest.
+                *
+                * We determine the type of objects which are stored in each
+                * room by looking at the *default* view for the room.  This
+                * allows, for example, a Calendar room to appear as a
+                * GroupDAV calendar even if the user has switched it to a
+                * Calendar List view.
                 */
                if ((view == VIEW_CALENDAR)
                   || (view == VIEW_TASKS)

diff --git a/webcit/webcit.h b/webcit/webcit.h
index fbe5866f3716cb9ce817ae93352ba55bb20c9b43..dc6791d4e921180ee331a11fd725fc78c925b645 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -123,11 +123,11 @@ 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 v6.72"  /* who's in da house */
+#define SERVER                 "WebCit v6.73"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         672             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    672             /* min required Citadel ver. */
+#define CLIENT_VERSION         673             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    673             /* min required Citadel ver. */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */