* Created IsEmptyStr define to be used rather then using some weird strlen constructs

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 2c35aa1b4f38da744ecf050fe3d885cb3799c50b..e4ae3b7d7b20f5c1d7d75c0b3f3ce6690be81767 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -53,6 +53,7 @@ extern locale_t wc_locales[];
 #define _(string)      (string)
 #endif
 
+#define IsEmptyStr(a) ((a)[0] == '\0')
 /*
  * Uncomment to dump an HTTP trace to stderr
 #define HTTP_TRACING 1
@@ -122,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 v7.07"  /* who's in da house */
+#define SERVER                 "WebCit v7.12"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         707             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    707             /* min required Citadel ver. */
+#define CLIENT_VERSION         712             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    710             /* min required Citadel ver. */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
@@ -169,6 +170,7 @@ extern locale_t wc_locales[];
 #define QR2_SYSTEM     1               /**< System room; hide by default       */
 #define QR2_SELFLIST   2               /**< Self-service mailing list mgmt     */
 #define QR2_COLLABDEL  4               /**< Anyone who can post can also delete*/
+#define QR2_SUBJECTREQ   8   /**< Subject strongly recommended */
 
 /**
  * user/room access
@@ -199,6 +201,11 @@ extern locale_t wc_locales[];
                        US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \
                        US_FLOORS | US_COLOR | US_PROMPTCTL )
 
+/*
+ * NLI is the string that shows up in a who's online listing for sessions
+ * that are active, but for which no user has yet authenticated.
+ */
+#define NLI    "(not logged in)"
 
 
 /** \brief     Linked list of lines appearing in an HTTP client request */
@@ -396,7 +403,7 @@ struct wcsession {
        char floordiv_expanded[32];             /**< which floordiv currently expanded */
        int selected_language;                  /**< Language selected by user */
        time_t last_pager_check;                /**< last time we polled for instant msgs */
-       char addrpopup_initial_room[128];       /**< see address_book_popup.c */
+       int nonce;                              /**< session nonce (to prevent session riding) */
 };
 
 /** values for WC->current_iconbar */
@@ -456,6 +463,10 @@ void serv_getln(char *strbuf, int bufsize);
 void serv_puts(char *string);
 void who(void);
 void who_inner_div(void);
+void wholist_section(void);
+void tasks_section(void);
+void calendar_section(void);
+void new_messages_section(void);
 void fmout(char *align);
 void pullquote_fmout(void);
 void wDumpContent(int);
@@ -580,6 +591,7 @@ void do_edit_vcard(long, char *, char *);
 void edit_vcard(void);
 void submit_vcard(void);
 void striplt(char *);
+void stripltlen(char *, int *);
 void select_user_to_edit(char *message, char *preselect);
 void delete_user(char *);
 void display_edituser(char *who, int is_new);
@@ -639,6 +651,7 @@ void CtdlMakeTempFileName(char *, int);
 void display_preferences(void);
 void set_preferences(void);
 void recp_autocomplete(char *);
+void address_book_popup(void);
 void display_address_book_middle_div(void);
 void display_address_book_inner_div(void);
 void begin_ajax_response(void);
@@ -754,7 +767,7 @@ void http_datestring(char *buf, size_t n, time_t xtime);
 #define VIEW_NOTES             5       /**<  Notes view */
 #define VIEW_WIKI              6       /**<  Wiki view */
 #define VIEW_CALBRIEF          7       /**< Brief Calendar view */
-
+#define VIEW_JOURNAL            8       /**< Journal view (not yet implemented in webcit) */
 
 /* These should be empty, but we have them for testing */
 #define DEFAULT_HTTPAUTH_USER  ""