X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=030b75a53ea46b18297bc5a25fed0a973a51e686;hb=245705dab4255f788c00f5562102d4c0ecee3d69;hp=1f71f45f94e23f2305d44915d87753dcc2ab1848;hpb=eb3066c0522617c7c5212e0e1508e03c9a87e1e5;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index 1f71f45f9..030b75a53 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-2018 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 #include #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #include #ifdef HAVE_LIMITS_H #include @@ -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) @@ -132,9 +127,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 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 921 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 920 /* Minimum required version of Citadel server */ +#define LIBCITADEL_MIN 920 /* 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 */ @@ -201,17 +196,11 @@ extern char *ssl_cipher_list; /* * Expiry policy for the autopurger */ -#define EXPIRE_NEXTLEVEL 0 /* Inherit expiration policy */ -#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 expire_mode; int expire_value; } ExpirePolicy; -void LoadExpirePolicy(GPEXWhichPolicy which); -void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which); /* * Linked list of session variables encoded in an x-www-urlencoded content type @@ -219,7 +208,9 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which); typedef struct urlcontent urlcontent; struct urlcontent { char url_key[32]; /* key */ + long klen; StrBuf *url_data; /* value */ + HashList *sub; }; /* @@ -260,20 +251,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; - -/* - * Address book entry (keep it short and sweet, it's just a quickie lookup - * which we can use to get to the real meat and bones later) - */ -typedef struct _addrbookent { - char ab_name[64]; /* name string */ - long ab_msgnum; /* message number of address book entry */ -} addrbookent; +} IcalKindEnumMap; +typedef struct _IcalMethodEnumMap { + const char *Name; + long NameLen; + icalproperty_method map; +} IcalMethodEnumMap; #define AJAX (1<<0) @@ -294,7 +281,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 { @@ -384,6 +371,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; @@ -416,6 +407,7 @@ struct wcsession { int ctdl_pid; /* Session ID on the Citadel server */ int nonce; /* session nonce (to prevent session riding) */ int inuse; /* set to nonzero if bound to a running thread */ + int isFailure; /* Http 2xx or 5xx? */ /* Session local Members */ int serv_sock; /* Client socket to Citadel server */ @@ -490,6 +482,8 @@ struct wcsession { char last_chat_user[256]; + StrBuf *IconTheme; /* Icontheme setting */ + /* Iconbar controls */ int cache_max_folders; int cache_num_floors; @@ -510,8 +504,6 @@ struct wcsession { HashList *InetCfg; /* Our inet server config for editing */ ExpirePolicy Policy[maxpolicy]; -/* used by the blog viewer */ - int bptlid; /* hash of thread currently being rendered */ }; @@ -553,11 +545,10 @@ extern char file_crpt_file_cer[PATH_MAX]; void init_ssl(void); void endtls(void); -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; @@ -574,6 +565,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 *); @@ -643,16 +635,12 @@ void output_headers( int do_httpheaders, int unset_cookies, int suppress_check, int cache); -void output_custom_content_header(const char *ctype); void cdataout(char *rawdata); void url(char *buf, size_t bufsize); void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); - -void display_vcard(StrBuf *Target, wc_mime_attachment *Mime, char alpha, int full, char **storename, long msgnum); - void display_success(const char *successmessage); void shutdown_sessions(void); @@ -675,7 +663,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); @@ -684,18 +671,19 @@ 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); void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names); void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]); -void tabbed_dialog(int num_tabs, char *tabnames[]); +void tabbed_dialog(int num_tabs, const 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 *); +void str_wiki_index(StrBuf *); HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP); @@ -704,7 +692,6 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); void set_selected_language(const char *); void go_selected_language(void); -void stop_selected_language(void); const char *get_selected_language(void); void utf8ify_rfc822_string(char **buf); @@ -736,26 +723,9 @@ void http_datestring(char *buf, size_t n, time_t xtime); 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 - */ -struct blogpost { - int top_level_id; - 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 */ -}; +void display_summary_page(void); +HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP); +void output_error_pic(const char *ErrMsg1, const char *ErrMsg2); -/* - * Data which gets returned from a call to blogview_learn_thread_references() - */ -struct bltr { - int id; - int refs; -}; - -struct bltr blogview_learn_thread_references(long msgnum); -void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP); -void display_summary_page(void);