X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=bfad761078615c157be9d30a51d39be0566b6296;hb=eae9f81553dc2753bb1101de8564bf72dcd5b243;hp=432bdf516eabe5b3aa950a0c17e0e91a46d5b4f1;hpb=28138c561e67821aa7d3f7cd433e4bae2e1c2d61;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 432bdf516..bfad76107 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -70,20 +70,11 @@
 #endif
 
 #define IsEmptyStr(a) ((a)[0] == '\0')
-/*
- * Uncomment to dump an HTTP trace to stderr
-#define HTTP_TRACING 1
- */
 
 #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)
 
-#ifdef HTTP_TRACING
-#undef HAVE_ZLIB_H
-#undef HAVE_ZLIB
-#endif
-
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>
 #endif
@@ -144,9 +135,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		800		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	800		/* min required Citadel ver */
-#define	LIBCITADEL_MIN		800		/* min required libcitadel ver */
+#define CLIENT_VERSION		802		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	802		/* min required Citadel ver */
+#define	LIBCITADEL_MIN		802		/* min required libcitadel ver */
 #define DEFAULT_HOST		"localhost"	/* Default Citadel server */
 #define DEFAULT_PORT		"504"
 #define TARGET			"webcit01"	/* Target for inline URL's */
@@ -170,43 +161,43 @@ extern char *ssl_cipher_list;
  *
  * bucket one...
  */
-#define QR_PERMANENT	1		/* Room does not purge		*/
+#define QR_PERMANENT	1		/* Room does not purge			*/
 #define QR_INUSE	2		/* Set if in use, clear if avail	*/
 #define QR_PRIVATE	4		/* Set for any type of private room	*/
 #define QR_PASSWORDED	8		/* Set if there's a password too	*/
-#define QR_GUESSNAME	16		/* Set if it's a guessname room	*/
+#define QR_GUESSNAME	16		/* Set if it's a guessname room		*/
 #define QR_DIRECTORY	32		/* Directory room			*/
 #define QR_UPLOAD	64	    	/* Allowed to upload			*/
-#define QR_DOWNLOAD	128		/* Allowed to download		*/
+#define QR_DOWNLOAD	128		/* Allowed to download			*/
 #define QR_VISDIR	256		/* Visible directory			*/
-#define QR_ANONONLY	512		/* Anonymous-Only room		*/
+#define QR_ANONONLY	512		/* Anonymous-Only room			*/
 #define QR_ANONOPT	1024		/* Anonymous-Option room		*/
-#define QR_NETWORK	2048		/* Shared network room		*/
+#define QR_NETWORK	2048		/* Shared network room			*/
 #define QR_PREFONLY	4096		/* Preferred status needed to enter	*/
-#define QR_READONLY	8192		/* Aide status required to post	*/
+#define QR_READONLY	8192		/* Aide status required to post		*/
 #define QR_MAILBOX	16384		/* Set if this is a private mailbox	*/
 
 /*
  * bucket two...
  */
-#define QR2_SYSTEM	1		/* System room; hide by default	*/
+#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 */
-#define QR2_SMTP_PUBLIC 16              /* smtp public postable room */
-#define QR2_MODERATED	32		/* Listservice aide has to permit posts  */
+#define QR2_COLLABDEL	4		/* Anyone who can post can also delete	*/
+#define QR2_SUBJECTREQ  8               /* Subject strongly recommended		*/
+#define QR2_SMTP_PUBLIC 16              /* smtp public postable room		*/
+#define QR2_MODERATED	32		/* Listservice aide has to permit posts	*/
 
 /*
  * user/room access
  */
-#define UA_KNOWN	2
-#define UA_GOTOALLOWED	4
-#define UA_HASNEWMSGS	8
-#define UA_ZAPPED	16
+#define UA_KNOWN		2
+#define UA_GOTOALLOWED		4
+#define UA_HASNEWMSGS		8
+#define UA_ZAPPED		16
 #define UA_POSTALLOWED          32
 #define UA_ADMINALLOWED         64
 #define UA_DELETEALLOWED        128
-#define UA_ISTRASH              256 /* Only available in room view... */
+#define UA_ISTRASH              256	/* Only available in room view... */
 
 
 /*
@@ -490,7 +481,6 @@ struct wcsession {
 	int killthis;				/* Nonzero == purge this session */
 	int ctdl_pid;				/* Session ID on the Citadel server */
 	int nonce;				/* session nonce (to prevent session riding) */
-	int SessionKey;
 	int inuse;				/* set to nonzero if bound to a running thread */
 
 /* Session local Members */
@@ -511,9 +501,7 @@ struct wcsession {
 	StrBuf *WBuf;                           /* Our output buffer */
 	StrBuf *HBuf;                           /* Our HeaderBuffer */
 	StrBuf *WFBuf;                          /* Wildfire error logging buffer */
-
 	StrBuf *trailing_javascript;		/* extra javascript to be appended to page */
-/*	char ImportantMessage[SIZ];*/
 	StrBuf *ImportantMsg;
 	HashList *Directory;			/* Parts of the directory URL in snippets */
 	const Floor *CurrentFloor;              /* when Parsing REST, which floor are we on? */