X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=ab448012a44782b82f2f3220e75b1dd6fa0e4141;hb=92a9cfc8847833d9c20925adccdd200e0c2495f8;hp=c46e8b4b52d6ce8146d620694b4f3c7c94a316a2;hpb=80598eb9c1cf339151a66e3bdf1b7756efdde1a2;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index c46e8b4b5..ab448012a 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,19 +1,13 @@ /* - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2015 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 as published - * by the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * modify it under the terms of the GNU General Public License version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -31,9 +25,6 @@ #include #include #include -#ifdef HAVE_SYS_TIME_H -#include -#endif #include #ifdef HAVE_LIMITS_H #include @@ -70,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) @@ -129,17 +118,21 @@ extern char *ssl_cipher_list; #define TRACE syslog(LOG_DEBUG, "\033[3%dmCHECKPOINT: %s:%d\033[0m", ((__LINE__%6)+1), __FILE__, __LINE__) +#ifdef UNDEF_MEMCPY +#undef memcpy +#endif + #define SLEEPING 180 /* TCP connection timeout */ #define WEBCIT_TIMEOUT 900 /* WebCit session timeout */ #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 901 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 901 /* Minimum required version of Citadel server */ +#define LIBCITADEL_MIN 901 /* 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 */ @@ -155,70 +148,6 @@ extern char *ssl_cipher_list; #endif -/* - * Room flags (from Citadel) - * - * bucket one... - */ -#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_DIRECTORY 32 /* Directory room */ -#define QR_UPLOAD 64 /* Allowed to upload */ -#define QR_DOWNLOAD 128 /* Allowed to download */ -#define QR_VISDIR 256 /* Visible directory */ -#define QR_ANONONLY 512 /* Anonymous-Only room */ -#define QR_ANONOPT 1024 /* Anonymous-Option 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_MAILBOX 16384 /* Set if this is a private mailbox */ - -/* - * bucket two... - */ -#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 */ - -/* - * user/room access - */ -#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... */ - - -/* - * User flags (from Citadel) - */ -#define US_NEEDVALID 1 /* User needs to be validated */ -#define US_PERM 4 /* Permanent user */ -#define US_LASTOLD 16 /* Print last old message with new */ -#define US_EXPERT 32 /* Experienced user */ -#define US_UNLISTED 64 /* Unlisted userlog entry */ -#define US_NOPROMPT 128 /* Don't prompt after each message */ -#define US_PROMPTCTL 256 /* ext & top work at prompt */ -#define US_DISAPPEAR 512 /* Use "disappearing msg prompts" */ -#define US_REGIS 1024 /* Registered user */ -#define US_PAGINATOR 2048 /* Pause after each screen of text */ -#define US_INTERNET 4096 /* Internet mail privileges */ -#define US_FLOORS 8192 /* User wants to see floors */ -#define US_COLOR 16384 /* User wants ANSI color support */ -#define US_USER_SET (US_LASTOLD | US_EXPERT | US_UNLISTED | \ - US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \ - US_FLOORS | US_COLOR | US_PROMPTCTL ) - #define SRV_STATUS_MSG(ServerLineBuf) (ChrPtr(ServerLineBuf) + 4), (StrLength(ServerLineBuf) - 4) @@ -271,11 +200,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); @@ -285,7 +214,9 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which); typedef struct urlcontent urlcontent; struct urlcontent { char url_key[32]; /* key */ + long klen; StrBuf *url_data; /* value */ + HashList *sub; }; /* @@ -326,20 +257,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) @@ -360,7 +287,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 { @@ -410,6 +337,7 @@ enum { eHEAD, eMOVE, eCOPY, + eREPORT, eNONE }; extern const char *ReqStrs[eNONE]; @@ -449,6 +377,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; @@ -481,6 +413,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 */ @@ -491,7 +424,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 */ @@ -511,7 +443,7 @@ struct wcsession { StrBuf *wc_password; /* Password of current user */ StrBuf *httpauth_pass; /* only for GroupDAV sessions */ int axlevel; /* this user's access level */ - int is_aide; /* nonzero == this user is an Aide */ + int is_aide; /* nonzero == this user is an Admin */ int connected; /* nonzero == we are connected to Citadel */ int logged_in; /* nonzero == we are logged in */ int need_regi; /* This user needs to register. */ @@ -556,6 +488,8 @@ struct wcsession { char last_chat_user[256]; + StrBuf *IconTheme; /* Icontheme setting */ + /* Iconbar controls */ int cache_max_folders; int cache_num_floors; @@ -571,7 +505,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]; @@ -623,7 +557,7 @@ 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; @@ -640,6 +574,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 *); @@ -697,8 +632,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); @@ -718,9 +651,6 @@ 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); @@ -743,30 +673,28 @@ 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, 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 *); + HashList *GetRoomListHashLKRA(StrBuf *Target, WCTemplputParams *TP); /* actual supported locales */ @@ -804,6 +732,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 @@ -813,6 +742,7 @@ struct blogpost { 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 */ + int unread_oments; }; @@ -827,3 +757,6 @@ struct bltr { struct bltr blogview_learn_thread_references(long msgnum); void tmplput_blog_permalink(StrBuf *Target, WCTemplputParams *TP); +void display_summary_page(void); + +HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);