X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=d3ef2977202e2c008f3d4e8f91aa21c8f2023832;hb=dc4679ebfb997ad5941b5a32b8e0f1fd0488ea68;hp=e80489f22421531fcc802da4f31ffd50c5ee214e;hpb=efccdcf4db04e63bfa3512c80215357ee9ffd98f;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index e80489f22..d3ef29772 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -128,12 +128,12 @@ 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 802 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 802 /* min required Citadel ver */ -#define LIBCITADEL_MIN 802 /* min required libcitadel ver */ +#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 DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" -#define TARGET "webcit01" /* Target for inline URL's */ +#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 */ @@ -265,11 +265,11 @@ extern char *ssl_cipher_list; #define EXPIRE_MANUAL 1 /* Don't expire messages at all */ #define EXPIRE_NUMMSGS 2 /* Keep only latest n messages */ #define EXPIRE_AGE 3 /* Expire messages after n days */ + typedef struct __ExpirePolicy { - int loaded; /* has this been loaded from the server? */ int expire_mode; int expire_value; -}ExpirePolicy; +} ExpirePolicy; void LoadExpirePolicy(GPEXWhichPolicy which); void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which); @@ -486,7 +486,6 @@ struct wcsession { time_t lastreq; /* Timestamp of most recent HTTP */ time_t last_pager_check; /* last time we polled for instant msgs */ ServInfo *serv_info; /* Information about the citserver we're connected to */ - int is_ajax; /* are we doing an ajax request? */ StrBuf *PushedDestination; /* Where to go after login, registration, etc. */ /* Request local Members */ @@ -566,7 +565,7 @@ struct wcsession { StrBuf *ConvertBuf1; StrBuf *ConvertBuf2; -/* cache stuff for templates. TODO: find a smartrer way */ +/* cache stuff for templates. TODO: find a smarter way */ HashList *ServCfg; /* cache our server config for editing */ HashList *InetCfg; /* Our inet server config for editing */ ExpirePolicy Policy[maxpolicy]; @@ -692,8 +691,6 @@ void CreateMimeStr(void); void pop_destination(void); -void fmout(const char *align); -void _fmout(StrBuf *Targt, const char *align); void FmOut(StrBuf *Target, const char *align, const StrBuf *Source); void wDumpContent(int); @@ -738,13 +735,10 @@ 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 generate_uuid(char *); - void address_book_popup(void); void begin_ajax_response(void); void end_ajax_response(void); - extern char *months[]; extern char *days[]; long locate_user_vcard_in_this_room(message_summary **VCMsg, @@ -759,9 +753,10 @@ void tabbed_dialog(int num_tabs, char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); - int get_time_format_cached (void); void display_wiki_pagelist(void); +void str_wiki_index(char *); + HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP); /* actual supported locales */ @@ -799,6 +794,7 @@ void http_datestring(char *buf, size_t n, time_t xtime); #define WC_TIMEFORMAT_24 2 extern int time_to_die; /* Nonzero if server is shutting down */ +extern int DisableGzip; /* * Array type for a blog post. The first message is the post; the rest are comments @@ -822,3 +818,4 @@ struct bltr { struct bltr blogview_learn_thread_references(long msgnum); void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP); +void display_summary_page(void);