X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=ab448012a44782b82f2f3220e75b1dd6fa0e4141;hb=92a9cfc8847833d9c20925adccdd200e0c2495f8;hp=5180a2e2564dd33f499b1f262950bc6815f03a41;hpb=44bd452609c8e429d324d4205460c656dd91bd5f;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 5180a2e25..ab448012a 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2013 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 3.
@@ -25,9 +25,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #include <sys/stat.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -64,8 +61,6 @@
 #define _(string)	(string)
 #endif
 
-#define IsEmptyStr(a) ((a)[0] == '\0')
-
 #define DO_DBG_QR 0
 #define DBG_QR(x) if(DO_DBG_QR) _DBG_QR(x)
 #define DBG_QR2(x) if(DO_DBG_QR) _DBG_QR2(x)
@@ -132,9 +127,9 @@ extern char *ssl_cipher_list;
 #define PORT_NUM		2000		/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION		820		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	820		/* Minimum required version of Citadel server */
-#define	LIBCITADEL_MIN		820		/* Minimum required version of libcitadel */
+#define CLIENT_VERSION		901		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	901		/* Minimum required version of Citadel server */
+#define	LIBCITADEL_MIN		901		/* Minimum required version of libcitadel */
 #define DEFAULT_HOST		"localhost"	/* Default Citadel server */
 #define DEFAULT_PORT		"504"
 #define TARGET			"webcit01"	/* Window target for inline URL's */
@@ -219,7 +214,9 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which);
 typedef struct urlcontent urlcontent;
 struct urlcontent {
 	char url_key[32];		/* key */
+	long klen;
 	StrBuf *url_data;		/* value */
+	HashList *sub;
 };
 
 /*
@@ -271,15 +268,6 @@ typedef struct _IcalMethodEnumMap {
         icalproperty_method map;
 } IcalMethodEnumMap;
 
-/*
- * Address book entry (keep it short and sweet, it's just a quickie lookup
- * which we can use to get to the real meat and bones later)
- */
-typedef struct _addrbookent {
-	char ab_name[64];	/* name string */
-	long ab_msgnum;		/* message number of address book entry */
-} addrbookent;
-
 
 #define AJAX (1<<0)
 #define ANONYMOUS (1<<1)
@@ -425,6 +413,7 @@ struct wcsession {
 	int ctdl_pid;				/* Session ID on the Citadel server */
 	int nonce;				/* session nonce (to prevent session riding) */
 	int inuse;				/* set to nonzero if bound to a running thread */
+	int isFailure;                          /* Http 2xx or 5xx? */
 
 /* Session local Members */
 	int serv_sock;				/* Client socket to Citadel server */
@@ -662,9 +651,6 @@ void cdataout(char *rawdata);
 void url(char *buf, size_t bufsize);
 void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf);
 
-
-void display_vcard(StrBuf *Target, wc_mime_attachment *Mime, char alpha, int full, char **storename, long msgnum);
-
 void display_success(const char *successmessage);
 
 void shutdown_sessions(void);
@@ -695,13 +681,13 @@ extern char *days[];
 long locate_user_vcard_in_this_room(message_summary **VCMsg,
 				    wc_mime_attachment **VCAtt);
 void http_transmit_thing(const char *content_type, int is_static);
-void http_transmit_headers(const char *content_type, int is_static, long is_chunked);
+void http_transmit_headers(const char *content_type, int is_static, long is_chunked, int is_gzip);
 long unescape_input(char *buf);
 void check_thread_pool_size(void);
 void StrEndTab(StrBuf *Target, int tabnum, int num_tabs);
 void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names);
 void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]);
-void tabbed_dialog(int num_tabs, char *tabnames[]);
+void tabbed_dialog(int num_tabs, const char *tabnames[]);
 void begin_tab(int tabnum, int num_tabs);
 void end_tab(int tabnum, int num_tabs);
 
@@ -756,6 +742,7 @@ struct blogpost {
 	long *msgs;		/* Array of msgnums for messages we are displaying */
 	int num_msgs;		/* Number of msgnums stored in 'msgs' */
 	int alloc_msgs;		/* Currently allocated size of array */
+	int unread_oments;
 };