Fixed the webcit preferences bug once and for all, using a proper

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 07c181bc706a0071cd571f7202d663c038a0bdba..1c8397df9bf91796629f300b76bb2ca0b1692468 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -326,6 +326,15 @@ struct folder {
        int num_rooms;  /**< If this is a floor, how many rooms does it have */
 };
 
+
+/* Linked list member for a list of webcit preferences for a user
+ */
+struct wcpref {
+       struct wcpref *next;
+       char *pref_key;
+       char *pref_value;
+};
+
 /**
  * \brief One of these is kept for each active Citadel session.
  * HTTP transactions are bound to on e at a time.
@@ -375,7 +384,6 @@ struct wcsession {
        struct wcsubst *vars;                   /**< HTTP variable substitutions for this page */
        char this_page[512];                    /**< URL of current page */
        char http_host[512];                    /**< HTTP Host: header */
-       char *preferences;                      /**< WebCit preferences for this user */
 #ifdef WEBCIT_WITH_CALENDAR_SERVICE            
        /** \brief ical???? */                          
        struct disp_cal {                                       
@@ -405,6 +413,7 @@ struct wcsession {
        time_t last_pager_check;                /**< last time we polled for instant msgs */
        int nonce;                              /**< session nonce (to prevent session riding) */
        int time_format_cache;                  /**< which timeformat does our user like? */
+       struct wcpref *first_pref;              /* linked list of preferences */
 };
 
 /** values for WC->current_iconbar */
@@ -455,7 +464,7 @@ void begin_critical_section(int which_one);
 void end_critical_section(int which_one);
 
 
-void stuff_to_cookie(char *cookie, int session,
+void stuff_to_cookie(char *cookie, size_t clen, int session,
                        char *user, char *pass, char *room);
 void cookie_to_stuff(char *cookie, int *session,
                 char *user, size_t user_len,
@@ -491,9 +500,8 @@ void pullquote_fmout(void);
 void wDumpContent(int);
 void serv_printf(const char *format,...);
 char *bstr(char *key);
-void urlesc(char *, char *);
 void urlescputs(char *);
-void jsesc(char *, char *);
+void jsesc(char *, size_t, char *);
 void jsescputs(char *);
 void output_headers(    int do_httpheaders,
                        int do_htmlhead,
@@ -508,7 +516,7 @@ long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks);
 void escputs(char *strbuf);
 void url(char *buf);
 void escputs1(char *strbuf, int nbsp, int nolinebreaks);
-void msgesc(char *target, char *strbuf);
+void msgesc(char *target, size_t tlen, char *strbuf);
 void msgescputs(char *strbuf);
 void msgescputs1(char *strbuf);
 void stripout(char *str, char leftboundary, char rightboundary);
@@ -677,6 +685,7 @@ void begin_ajax_response(void);
 void end_ajax_response(void);
 void initialize_viewdefs(void);
 void initialize_axdefs(void);
+void burn_folder_cache(time_t age);
 void list_all_rooms_by_floor(char *viewpref);
 void display_room_directory(void);
 void download_file(char *);
@@ -769,7 +778,7 @@ void client_write_ssl(char *buf, int nbytes);
 
 #ifdef HAVE_ZLIB
 #include <zlib.h>
-int ZEXPORT compress_gzip(Bytef * dest, uLongf * destLen,
+int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen,
                           const Bytef * source, uLong sourceLen, int level);
 #endif
 
@@ -785,17 +794,6 @@ extern char *hourname[];   /**< Names of hours (12am, 1am, etc.) */
 void http_datestring(char *buf, size_t n, time_t xtime);
 
 
-/** Views (from citadel.h) */
-#define        VIEW_BBS                0       /**< Traditional Citadel BBS view */
-#define VIEW_MAILBOX           1       /**< Mailbox summary */
-#define VIEW_ADDRESSBOOK       2       /**< Address book view */
-#define VIEW_CALENDAR          3       /**< Calendar view */
-#define VIEW_TASKS             4       /**< Tasks view */
-#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  ""
 #define DEFAULT_HTTPAUTH_PASS  ""