X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=b38a9c97501b7c071d4886d196afce606d36f4fc;hb=a3ba94ad306d781296c53012f732f3a910015263;hp=e015ce50fb4b9b18d3e5c77a2503e8efbf741a8e;hpb=873351275cca76878a15128ed8ffbd556f880c0f;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index e015ce50f..b38a9c975 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -89,8 +89,8 @@
 #include "subst.h"
 #include "messages.h"
 #include "paramhandling.h"
-#include "preferences.h"
 #include "roomops.h"
+#include "preferences.h"
 
 #ifdef HAVE_OPENSSL
 /* Work around RedHat's b0rken OpenSSL includes */
@@ -115,8 +115,8 @@ 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		766		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	766		/* min required Citadel ver */
+#define CLIENT_VERSION		780		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	770		/* min required Citadel ver */
 #define	LIBCITADEL_MIN		766		/* min required libcitadel ver */
 #define DEFAULT_HOST		"localhost"	/* Default Citadel server */
 #define DEFAULT_PORT		"504"
@@ -178,6 +178,7 @@ extern char *ssl_cipher_list;
 #define UA_POSTALLOWED          32
 #define UA_ADMINALLOWED         64
 #define UA_DELETEALLOWED        128
+#define UA_ISTRASH              256 /* Only available in room view... */
 
 
 /*
@@ -479,14 +480,16 @@ struct wcsession {
 	int time_format_cache;                  /* which timeformat does our user like? */
 
 /* current room related */
-	StrBuf *wc_roomname;			/* Room we are currently in */
-	unsigned room_flags;			/* flags associated with the current room */
-	unsigned room_flags2;			/* flags associated with the current room */
-	int wc_view;				/* view for the current room */
-	int wc_default_view;			/* default view for the current room */
-	int wc_is_trash;			/* nonzero == current room is a Trash folder */
-	int wc_floor;				/* floor number of current room */
-	int is_mailbox;				/* the current room is a private mailbox */
+/*	StrBuf *wc_roomname;			/ * Room we are currently in */
+/*	unsigned room_flags;			/ * flags associated with the current room */
+/*	unsigned room_flags2;			/ * flags associated with the current room */
+/*	int wc_view;				/ * view for the current room */
+/*	int wc_default_view;			/ * default view for the current room */
+/*	int wc_is_trash;			/ * nonzero == current room is a Trash folder */
+/*	int wc_floor;				/ * floor number of current room */
+/*	int is_mailbox;				/ * the current room is a private mailbox */
+
+	folder CurRoom;                         /* information about our current room */
 
 /* next/previous room thingabob */
 	struct march *march;			/* march mode room list */
@@ -520,7 +523,7 @@ struct wcsession {
 	int cache_max_folders;
 	int cache_num_floors;
 	time_t cache_timestamp;
-	HashList *IconBarSettings;		/* which icons should be shown / not shown? */
+	long *IBSettingsVec;                    /* which icons should be shown / not shown? */
 	const StrBuf *floordiv_expanded;	/* which floordiv currently expanded */
 
 
@@ -583,13 +586,8 @@ void InitialiseSemaphores(void);
 void begin_critical_section(int which_one);
 void end_critical_section(int which_one);
 
-void stuff_to_cookie(char *cookie, size_t clen,
-		int session,
-		StrBuf *user,
-		StrBuf *pass,
-		StrBuf *room,
-		const char *language
-);
+void stuff_to_cookie(int unset_cookie);
+
 void cookie_to_stuff(StrBuf *cookie,
 		int *session,
 		StrBuf *user,
@@ -774,7 +772,6 @@ int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf);
 int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize);
 int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize);
 int read_server_text(StrBuf *Buf, long *nLines);
-int goto_config_room(StrBuf *Buf);
 long locate_user_vcard_in_this_room(message_summary **VCMsg,
 				    wc_mime_attachment **VCAtt);
 void sleeeeeeeeeep(int);
@@ -791,7 +788,6 @@ void end_tab(int tabnum, int num_tabs);
 void str_wiki_index(char *s);
 long guess_calhourformat(void);
 int get_time_format_cached (void);
-int xtoi(const char *in, size_t len);
 const char *get_selected_language(void);
 void display_wiki_pagelist(void);