X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=a5adb52fd4b89687d843980bbcb4c333580f3297;hb=954e5749b5e0102f8598fcc19fc10267f31a6cda;hp=0aa0eaa54b17a2a0f99d739a708f2bbc8c76ee16;hpb=e18f917e9db1b3ed555c0ec91bb3939589aaff2c;p=citadel.git

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 0aa0eaa54..a5adb52fd 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -87,7 +87,7 @@ typedef struct wcsession wcsession;
 #include "roomops.h"
 #include "preferences.h"
 
-#include "tcp_sockets.h"
+#include "sockets.h"
 #include "utils.h"
 #ifdef HAVE_OPENSSL
 /* Work around RedHat's b0rken OpenSSL includes */
@@ -122,20 +122,19 @@ extern char *ssl_cipher_list;
 #undef memcpy
 #endif
 
-#define SLEEPING		180		/* TCP connection timeout */
-#define WEBCIT_TIMEOUT		900		/* WebCit session timeout */
-#define PORT_NUM		80		/* port number to listen on */
+#define SLEEPING		180			/* TCP connection timeout */
+#define WEBCIT_TIMEOUT		900			/* WebCit session timeout */
+#define PORT_NUM		80			/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION 938		/* This version of WebCit */
-#define MINIMUM_CIT_VERSION	931		/* Minimum required version of Citadel server */
-#define	LIBCITADEL_MIN		931		/* 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 */
-#define HOUSEKEEPING		15		/* Housekeeping frequency */
+#define CLIENT_VERSION 957		/* This version of WebCit */
+#define MINIMUM_CIT_VERSION	931			/* Minimum required version of Citadel server */
+#define	LIBCITADEL_MIN		931			/* Minimum required version of libcitadel */
+#define DEFAULT_CTDLDIR		"/usr/local/citadel"	/* Default Citadel server directory */
+#define TARGET			"webcit01"		/* Window target for inline URL's */
+#define HOUSEKEEPING		15			/* Housekeeping frequency */
 #define MAX_WORKER_THREADS	250
-#define LISTEN_QUEUE_LENGTH	100		/* listen() backlog queue */
+#define LISTEN_QUEUE_LENGTH	100			/* listen() backlog queue */
 
 #define USERCONFIGROOM		"My Citadel Config"
 #define DEFAULT_MAXMSGS		20
@@ -528,10 +527,6 @@ extern pthread_key_t MyConKey;
 #ifdef HAVE_OPENSSL
 #define THREADSSL ((SSL *)pthread_getspecific(ThreadSSL))
 extern pthread_key_t ThreadSSL;
-extern char ctdl_key_dir[PATH_MAX];
-extern char file_crpt_file_key[PATH_MAX];
-extern char file_crpt_file_csr[PATH_MAX];
-extern char file_crpt_file_cer[PATH_MAX];
 
 void init_ssl(void);
 void endtls(void);
@@ -544,12 +539,9 @@ int client_write_ssl(const StrBuf *Buf);
 extern int is_https;
 extern int follow_xff;
 extern char *server_cookie;
-extern char *ctdlhost, *ctdlport;
 extern char *axdefs[];
 extern int num_threads_existing;
 extern int num_threads_executing;
-extern int setup_wizard;
-extern char wizard_filename[];
 
 void InitialiseSemaphores(void);
 void begin_critical_section(int which_one);
@@ -629,7 +621,7 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); /* actual supported loca
 void set_selected_language(const char *);
 void go_selected_language(void);
 const char *get_selected_language(void);
-void utf8ify_rfc822_string(char **buf);
+// void utf8ify_rfc822_string(char **buf); this is in libcitadel now
 void begin_burst(void);
 long end_burst(void);
 void AppendImportantMessage(const char *pch, long len);
@@ -657,3 +649,4 @@ void display_summary_page(void);
 HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);
 void output_error_pic(const char *ErrMsg1, const char *ErrMsg2);
 void jsonMessageListHdr(void);
+extern char *ctdl_dir;				/* Directory where Citadel Server is running */