* serv_crypto.c: made changes to OpenSSL calls ... removed unnecessary

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index d436e8e74e9c4eb3a4fd5a9875118d2869a39e36..103908e135d29e0b0aaab7c0e3eb552d14b81b9c 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -32,11 +32,11 @@
 #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 v5.28"  /* who's in da house */
+#define SERVER                 "WebCit v6.03"  /* who's in da house */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         528             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    626             /* min required Citadel vers */
+#define CLIENT_VERSION         603             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    640             /* min required Citadel vers */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define LB                     (1)             /* Internal escape chars */
@@ -212,7 +212,7 @@ struct wcsession {
        long msgarr[4096];              /* for read operations */
        int is_wap;                     /* Client is a WAP gateway */
        struct urlcontent *urlstrings;
-       int HaveExpressMessages;        /* Nonzero if incoming msgs exist */
+       int HaveInstantMessages;        /* Nonzero if incoming msgs exist */
        struct wcsubst *vars;
        char this_page[SIZ];            /* address of current page */
        char http_host[SIZ];            /* HTTP Host: header */
@@ -228,6 +228,12 @@ struct wcsession {
        char ImportantMessage[SIZ];
        char last_chat_user[SIZ];
        int ctdl_pid;                   /* Session ID on the Citadel server */
+       char httpauth_user[SIZ];        /* only for GroupDAV sessions */
+       char httpauth_pass[SIZ];        /* only for GroupDAV sessions */
+
+       size_t burst_len;
+       char *burst;
+       int gzip_ok;                    /* Nonzero if Accept-encoding: gzip */
 };
 
 #define extract(dest,source,parmnum)   extract_token(dest,source,parmnum,'|')
@@ -249,7 +255,9 @@ extern char *axdefs[];
 extern char *ctdlhost, *ctdlport;
 extern char *server_cookie;
 extern int is_https;
-
+extern int setup_wizard;
+extern char wizard_filename[];
+void do_setup_wizard(void);
 
 void stuff_to_cookie(char *cookie, int session,
                        char *user, char *pass, char *room);
@@ -262,6 +270,7 @@ void display_login(char *mesg);
 void do_welcome(void);
 void do_logout(void);
 void display_main_menu(void);
+void display_aide_menu(void);
 void display_advanced_menu(void);
 void slrp_highest(void);
 void gotonext(void);
@@ -308,7 +317,6 @@ void display_enter(void);
 void post_message(void);
 void confirm_delete_msg(void);
 void delete_msg(void);
-void do_stuff_to_one_msg(void);
 void confirm_move_msg(void);
 void move_msg(void);
 void userlist(void);
@@ -328,6 +336,7 @@ void display_editroom(void);
 void netedit(void);
 void editroom(void);
 void display_whok(void);
+void do_invt_kick(void);
 void server_to_text(void);
 void save_edit(char *description, char *enter_cmd, int regoto);
 void display_edit(char *description, char *check_cmd,
@@ -361,7 +370,6 @@ void siteconfig(void);
 void display_generic(void);
 void do_generic(void);
 void display_menubar(int);
-void embed_room_banner(char *);
 void smart_goto(char *);
 void worker_entry(void);
 void session_loop(struct httprequest *);
@@ -389,6 +397,7 @@ void edit_vcard(void);
 void submit_vcard(void);
 void striplt(char *);
 void select_user_to_edit(char *message, char *preselect);
+void delete_user(char *);
 void display_edituser(char *who, int is_new);
 void create_user(void);
 void edituser(void);
@@ -405,6 +414,7 @@ int is_msg_in_mset(char *mset, long msgnum);
 char *safestrncpy(char *dest, const char *src, size_t n);
 void display_addressbook(long msgnum, char alpha);
 void offer_start_page(void);
+void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext);
 void change_start_page(void);
 void output_html(void);
 void display_floorconfig(char *);
@@ -467,6 +477,12 @@ void commit_iconbar(void);
 int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
 void spawn_another_worker_thread(void);
 
+void embed_room_banner(char *, int);
+/* navbar types that can be passed to embed_room_banner */
+enum {
+       navbar_none,
+       navbar_default
+};
 
 
 #ifdef HAVE_OPENSSL
@@ -479,7 +495,18 @@ int client_read_ssl(char *buf, int bytes, int timeout);
 void client_write_ssl(char *buf, int nbytes);
 #endif
 
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+int ZEXPORT compress_gzip(Bytef * dest, uLongf * destLen,
+                          const Bytef * source, uLong sourceLen, int level);
+#endif
+
+
+void begin_burst(void);
+void end_burst(void);
+
 extern char *ascmonths[];
+void http_datestring(char *buf, size_t n, time_t xtime);
 
 
 /* Views (from citadel.h) */
@@ -489,3 +516,8 @@ extern char *ascmonths[];
 #define VIEW_CALENDAR          3       /* Calendar view */
 #define VIEW_TASKS             4       /* Tasks view */
 #define VIEW_NOTES             5       /* Notes view */
+
+
+/* These should be empty, but we have them for testing */
+#define DEFAULT_HTTPAUTH_USER  ""
+#define DEFAULT_HTTPAUTH_PASS  ""