X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=e0f7df7ebbac49f662a5494c9d0a345a41d53781;hb=a845b4fa9330e996a5cc62fdc5347ac982e855bf;hp=b3440092078d57d12e5c37f94735645fa82b536d;hpb=c7d361a0f38f6b7a8066c1a0b9b677cee7e15ebb;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index b34400920..e0f7df7eb 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2012 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)
@@ -123,14 +118,18 @@ extern char *ssl_cipher_list;
 
 #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__)
 
+#ifdef UNDEF_MEMCPY
+#undef memcpy
+#endif
+
 #define SLEEPING		180		/* TCP connection timeout */
 #define WEBCIT_TIMEOUT		900		/* WebCit session timeout */
 #define PORT_NUM		2000		/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION		813		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	813		/* Minimum required version of Citadel server */
-#define	LIBCITADEL_MIN		813		/* 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 */
@@ -256,11 +255,16 @@ typedef struct _disp_cal {
 	icalproperty_status Status;
 } disp_cal;						
 
-typedef struct _IcalEnumMap {
+typedef struct _IcalKindEnumMap {
 	const char *Name;
 	long NameLen;
 	icalproperty_kind map;
-} IcalEnumMap;
+} IcalKindEnumMap;
+typedef struct _IcalMethodEnumMap {
+	const char *Name;
+	long NameLen;
+        icalproperty_method map;
+} IcalMethodEnumMap;
 
 /*
  * Address book entry (keep it short and sweet, it's just a quickie lookup
@@ -290,7 +294,7 @@ typedef struct _addrbookent {
 #define DATEFMT_BRIEF 1
 #define DATEFMT_RAWDATE 2
 #define DATEFMT_LOCALEDATE 3
-void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format);
+long webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format);
 
 
 typedef enum _RESTDispatchID {
@@ -380,6 +384,10 @@ typedef struct _HdrRefs {
 
 typedef struct _ParsedHttpHdrs {
 	int http_sock;				/* HTTP server socket */
+	long HaveRange;
+	long RangeStart;
+	long RangeTil;
+	long TotalBytes;
 	const char *Pos;
 	StrBuf *ReadBuf;
 
@@ -441,7 +449,7 @@ struct wcsession {
 	StrBuf *wc_password;			/* Password of current user */
 	StrBuf *httpauth_pass;  		/* only for GroupDAV sessions */
 	int axlevel;				/* this user's access level */
-	int is_aide;				/* nonzero == this user is an Aide */
+	int is_aide;				/* nonzero == this user is an Admin */
 	int connected;				/* nonzero == we are connected to Citadel */
 	int logged_in;				/* nonzero == we are logged in  */
 	int need_regi;				/* This user needs to register. */
@@ -486,6 +494,8 @@ struct wcsession {
 
 	char last_chat_user[256];
 
+	StrBuf *IconTheme;                      /* Icontheme setting */
+
 /* Iconbar controls */
 	int cache_max_folders;
 	int cache_num_floors;
@@ -553,7 +563,7 @@ void ssl_lock(int mode, int n, const char *file, int line);
 int starttls(int sock);
 extern SSL_CTX *ssl_ctx;  
 int client_read_sslbuffer(StrBuf *buf, int timeout);
-void client_write_ssl(const StrBuf *Buf);
+int client_write_ssl(const StrBuf *Buf);
 #endif
 
 extern int is_https;
@@ -570,6 +580,7 @@ void InitialiseSemaphores(void);
 void begin_critical_section(int which_one);
 void end_critical_section(int which_one);
 
+void CheckGZipCompressionAllowed(const char *MimeType, long MLen);
 
 extern void do_404(void);
 void http_redirect(const char *);
@@ -671,7 +682,6 @@ void output_html(const char *, int, int, StrBuf *, StrBuf *);
 ssize_t write(int fd, const void *buf, size_t count);
 void cal_process_attachment(wc_mime_attachment *Mime);
 
-void address_book_popup(void);
 void begin_ajax_response(void);
 void end_ajax_response(void);
 
@@ -680,6 +690,7 @@ 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, int is_gzip);
 long unescape_input(char *buf);
 void check_thread_pool_size(void);
 void StrEndTab(StrBuf *Target, int tabnum, int num_tabs);
@@ -740,6 +751,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;
 };
 
 
@@ -755,3 +767,5 @@ struct bltr {
 struct bltr blogview_learn_thread_references(long msgnum);
 void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP);
 void display_summary_page(void);
+
+HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);