X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=860129e2f72036f78e79c2f0f2b5b3c96b42ebbc;hb=981a324cf4ad0365808ba1c6e2fdc324086f212a;hp=8fab4872190e3e14af7c21175447c86cab3d30be;hpb=dcae8966f0bb1443dc3c843462c38e07d79a018d;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index 8fab48721..860129e2f 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -39,10 +39,11 @@ #ifdef HAVE_LIMITS_H #include #endif +#include #include #include -#include #include +#include #include #include #include @@ -53,10 +54,6 @@ #include #include -#ifndef INADDR_NONE -#define INADDR_NONE 0xffffffff -#endif - #ifdef HAVE_ICONV #include #endif @@ -114,6 +111,17 @@ extern char *ssl_cipher_list; #define DEFAULT_SSL_CIPHER_LIST "DEFAULT" /* See http://openssl.org/docs/apps/ciphers.html */ #endif +#if SIZEOF_SIZE_T == SIZEOF_INT +#define SIZE_T_FMT "%d" +#else +#define SIZE_T_FMT "%ld" +#endif + +#if SIZEOF_LONG_UNSIGNED_INT == SIZEOF_INT +#define ULONG_FMT "%d" +#else +#define ULONG_FMT "%ld" +#endif #define CALENDAR_ROOM_NAME "Calendar" #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" @@ -127,9 +135,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 780 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 780 /* min required Citadel ver */ -#define LIBCITADEL_MIN 780 /* min required libcitadel ver */ +#define CLIENT_VERSION 783 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 781 /* min required Citadel ver */ +#define LIBCITADEL_MIN 781 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ @@ -500,7 +508,6 @@ struct wcsession { 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_room_aide; /* nonzero == this user is a Room Aide in this room */ int connected; /* nonzero == we are connected to Citadel */ int logged_in; /* nonzero == we are logged in */ int need_regi; /* This user needs to register. */ @@ -529,7 +536,6 @@ struct wcsession { StrBuf *upload_filename; /* filename of http-uploaded data */ char upload_content_type[256]; /* content type of http-uploaded data */ - int new_mail; /* user has new mail waiting */ int remember_new_mail; /* last count of new mail messages */ /* Roomiew control */ @@ -547,10 +553,8 @@ struct wcsession { char last_chat_user[256]; /* Iconbar controls */ - struct __ofolder *cache_fold; /* cache the iconbar room list */ int cache_max_folders; int cache_num_floors; - time_t cache_timestamp; long *IBSettingsVec; /* which icons should be shown / not shown? */ const StrBuf *floordiv_expanded; /* which floordiv currently expanded */ @@ -633,7 +637,6 @@ void do_welcome(void); void do_logout(void); void display_main_menu(void); void display_aide_menu(void); -void display_advanced_menu(void); void slrp_highest(void); ServInfo *get_serv_info(StrBuf *, StrBuf *); void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority); @@ -641,13 +644,13 @@ void CreateMimeStr(void); int GetConnected(void); void DeleteServInfo(ServInfo **FreeMe); int uds_connectsock(char *); -int tcp_connectsock(char *, int); +int tcp_connectsock(char *, char *); int serv_getln(char *strbuf, int bufsize); int StrBuf_ServGetln(StrBuf *buf); int GetServerStatus(StrBuf *Line, long* FullState); void serv_puts(const char *string); void who(void); -void who_inner_div(void); + void ajax_mini_calendar(void); void fmout(char *align); void _fmout(StrBuf *Targt, char *align); @@ -692,17 +695,14 @@ void msgesc(char *target, size_t tlen, char *strbuf); void msgescputs(char *strbuf); void msgescputs1(char *strbuf); void dump_vars(void); -void embed_main_menu(void); void do_addrbook_view(addrbookent *addrbook, int num_ab); void fetch_ab_name(message_summary *Msg, char **namebuf); void display_vcard(StrBuf *Target, wc_mime_attachment *Mime, char alpha, int full, char **storename, long msgnum); void jsonMessageList(void); void new_summary_view(void); -void getseen(void); void text_to_server(char *ptr); void text_to_server_qp(char *ptr); -void confirm_delete_msg(void); void display_success(char *); void CheckAuthBasic(ParsedHttpHdrs *hdr); void GetAuthBasic(ParsedHttpHdrs *hdr); @@ -713,15 +713,12 @@ void display_edit(char *description, char *check_cmd, long gotoroom(const StrBuf *gname); void remove_march(const StrBuf *aaa); void dotskip(void); -void confirm_delete_room(void); void validate(void); void display_graphics_upload(char *, char *, char *); void do_graphics_upload(char *upl_cmd); -void serv_gets(char *strbuf); void serv_write(const char *buf, int nbytes); void serv_putbuf(const StrBuf *string); void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); -void load_floorlist(StrBuf *Buf); void shutdown_sessions(void); void do_housekeeping(void); void smart_goto(const StrBuf *); @@ -744,7 +741,6 @@ long extract_token(char *dest, const char *source, int parmnum, char separator, void remove_token(char *source, int parmnum, char separator); StrBuf *load_mimepart(long msgnum, char *partnum); void MimeLoadData(wc_mime_attachment *Mime); -int pattern2(char *search, char *patn); void do_edit_vcard(long msgnum, char *partnum, message_summary *VCMsg, wc_mime_attachment *VCAtt, @@ -764,9 +760,6 @@ void output_html(const char *, int, int, StrBuf *, StrBuf *); void do_listsub(void); ssize_t write(int fd, const void *buf, size_t count); void cal_process_attachment(wc_mime_attachment *Mime); -void display_calendar(message_summary *Msg, int unread); -void display_note(message_summary *Msg, int unread); -void updatenote(void); void do_tasks_view(void); int calendar_summary_view(void); void free_march_list(wcsession *wcf); @@ -776,11 +769,6 @@ void CtdlMakeTempFileName(char *, int); void address_book_popup(void); void begin_ajax_response(void); void end_ajax_response(void); -void initialize_viewdefs(void); -void initialize_axdefs(void); -void burn_folder_cache(time_t age); -void list_all_rooms_by_floor(const char *viewpref); -void display_pictureview(void); void display_edit_task(void); void display_edit_event(void); @@ -810,10 +798,10 @@ long locate_user_vcard_in_this_room(message_summary **VCMsg, void sleeeeeeeeeep(int); void http_transmit_thing(const char *content_type, int is_static); long unescape_input(char *buf); -void do_selected_iconbar(void); +void check_thread_pool_size(void); void spawn_another_worker_thread(void); void StrEndTab(StrBuf *Target, int tabnum, int num_tabs); -void StrBeginTab(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 begin_tab(int tabnum, int num_tabs); @@ -829,21 +817,14 @@ void display_wiki_pagelist(void); #define DATEFMT_RAWDATE 2 #define DATEFMT_LOCALEDATE 3 void webcit_fmt_date(char *buf, size_t siz, time_t thetime, int Format); -int fetch_http(char *url, char *target_buf, int maxbytes); -void free_attachments(wcsession *sess); void summary(void); int is_mobile_ua(char *user_agent); -void embed_room_banner(char *, int); +void embed_room_banner(void); HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP); HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP); int SortRoomsByListOrder(const void *room1, const void *room2); -/* navbar types that can be passed to embed_room_banner */ -enum { - navbar_none, - navbar_default -}; /* actual supported locales */ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); @@ -867,6 +848,8 @@ void utf8ify_rfc822_string(char **buf); void begin_burst(void); long end_burst(void); +void AppendImportantMessage(const char *pch, long len); + extern char *hourname[]; /* Names of hours (12am, 1am, etc.) */ void http_datestring(char *buf, size_t n, time_t xtime); @@ -888,3 +871,4 @@ void http_datestring(char *buf, size_t n, time_t xtime); #define WC_TIMEFORMAT_AMPM 1 #define WC_TIMEFORMAT_24 2 +extern int time_to_die; /* Nonzero if server is shutting down */