X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=4d01fb55802a6095e2b0158cb164a012b10139a5;hb=6ec73d6906542ea2f8cca2e62f7625ee2e17ae03;hp=e3275432752c581288d4412b93d1809cf517138c;hpb=1ce9a4d4c13712de72f8a188c60d4bc464285ca9;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index e32754327..4d01fb558 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -87,11 +87,10 @@ #include "sysdep.h" #include "subst.h" -#include "wc_gettext.h" #include "messages.h" #include "paramhandling.h" #include "preferences.h" - +#include "roomops.h" #ifdef HAVE_OPENSSL /* Work around RedHat's b0rken OpenSSL includes */ @@ -99,8 +98,11 @@ #include #include #include +extern char *ssl_cipher_list; +#define DEFAULT_SSL_CIPHER_LIST "DEFAULT" /* See http://openssl.org/docs/apps/ciphers.html */ #endif + #define CALENDAR_ROOM_NAME "Calendar" #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN" @@ -113,9 +115,9 @@ #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 760 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 744 /* min required Citadel ver */ -#define LIBCITADEL_MIN 744 /* min required libcitadel ver */ +#define CLIENT_VERSION 766 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 766 /* min required Citadel ver */ +#define LIBCITADEL_MIN 766 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ @@ -173,6 +175,9 @@ #define UA_GOTOALLOWED 4 #define UA_HASNEWMSGS 8 #define UA_ZAPPED 16 +#define UA_POSTALLOWED 32 +#define UA_ADMINALLOWED 64 +#define UA_DELETEALLOWED 128 /* @@ -239,16 +244,16 @@ /* - * \brief Linked list of session variables encoded in an x-www-urlencoded content type + * Linked list of session variables encoded in an x-www-urlencoded content type */ typedef struct urlcontent urlcontent; struct urlcontent { - char url_key[32]; /* the variable name */ - StrBuf *url_data; /* its value */ + char url_key[32]; /* key */ + StrBuf *url_data; /* value */ }; /* - * \brief information about us ??? + * Information about the Citadel server to which we are connected */ typedef struct _serv_info { int serv_pid; /* Process ID of the Citadel server */ @@ -260,7 +265,6 @@ typedef struct _serv_info { StrBuf *serv_bbs_city; /* Geographic location of the Citadel server */ StrBuf *serv_sysadm; /* Name of system administrator */ StrBuf *serv_moreprompt; /* Whats the commandline textprompt */ - int serv_ok_floors; /* nonzero == server supports floors */ int serv_supports_ldap; /* is the server linked against an ldap tree for adresses? */ int serv_newuser_disabled; /* Has the server disabled self-service new user creation? */ StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ @@ -271,50 +275,6 @@ typedef struct _serv_info { } ServInfo; - -/* - * \brief This struct holds a list of rooms for \\\oto operations. - */ -struct march { - struct march *next; /* pointer to next in linked list */ - char march_name[128]; /* name of room */ - int march_floor; /* floor number of room */ - int march_order; /* sequence in which we are to visit this room */ -}; - -/* * - * \brief This struct holds a list of rooms for client display. - * It is a binary tree. - */ -struct roomlisting { - struct roomlisting *lnext; /* pointer to 'left' tree node */ - struct roomlisting *rnext; /* pointer to 'right' tree node */ - char rlname[128]; /* name of room */ - unsigned rlflags; /* room flags */ - int rlfloor; /* the floor it resides on */ - int rlorder; /* room listing order */ -}; - - - - - - - -/** - * \brief Data structure for roomlist-to-folderlist conversion - */ -struct folder { - int floor; /* which floor is it on */ - char room[SIZ]; /* which roomname ??? */ - char name[SIZ]; /* which is its own name??? */ - int hasnewmsgs; /* are there unread messages inside */ - int is_mailbox; /* is it a mailbox? */ - int selectable; /* can we select it ??? */ - int view; /* whats its default view? inbox/calendar.... */ - int num_rooms; /* If this is a floor, how many rooms does it have */ -}; - typedef struct _disp_cal { icalcomponent *cal; /* cal items for display */ long cal_msgnum; /* cal msgids for display */ @@ -341,8 +301,8 @@ typedef struct _IcalEnumMap { * 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 */ + char ab_name[64]; /* name string */ + long ab_msgnum; /* message number of address book entry */ } addrbookent; @@ -356,15 +316,18 @@ typedef struct _addrbookent { #define COOKIEUNNEEDED (1<<6) #define ISSTATIC (1<<7) #define FORCE_SESSIONCLOSE (1<<8) - +#define PARSE_REST_URL (1<<0) typedef void (*WebcitHandlerFunc)(void); typedef struct _WebcitHandler{ WebcitHandlerFunc F; long Flags; StrBuf *Name; + StrBuf *DisplayName; } WebcitHandler; -void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc F, long Flags); + + +void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, const char *DisplayName, long dslen, WebcitHandlerFunc F, long Flags); typedef struct _headereval { ExamineMsgHeaderFunc evaluator; @@ -405,7 +368,7 @@ const char *ReqStrs[eNONE]; typedef struct _HdrRefs { - long eReqType; /**< eGET, ePOST.... */ + long eReqType; /* HTTP method */ int desired_session; int SessionKey; @@ -413,24 +376,25 @@ typedef struct _HdrRefs { int DontNeedAuth; long ContentLength; time_t if_modified_since; - int gzip_ok; /**< Nonzero if Accept-encoding: gzip */ + int gzip_ok; /* Nonzero if Accept-encoding: gzip */ int prohibit_caching; + int dav_depth; /* these are references into Hdr->HTTPHeaders, so we don't need to free them. */ StrBuf *ContentType; StrBuf *RawCookie; StrBuf *ReqLine; - StrBuf *http_host; /**< HTTP Host: header */ + StrBuf *http_host; /* HTTP Host: header */ StrBuf *browser_host; StrBuf *user_agent; StrBuf *plainauth; - + StrBuf *dav_ifmatch; const WebcitHandler *Handler; } HdrRefs; typedef struct _ParsedHttpHdrs { - int http_sock; /**< HTTP server socket */ + int http_sock; /* HTTP server socket */ const char *Pos; StrBuf *ReadBuf; @@ -438,12 +402,12 @@ typedef struct _ParsedHttpHdrs { StrBuf *c_password; StrBuf *c_roomname; StrBuf *c_language; - StrBuf *this_page; /**< URL of current page */ + StrBuf *this_page; /* URL of current page */ StrBuf *PlainArgs; - HashList *urlstrings; /**< variables passed to webcit in a URL */ - HashList *HTTPHeaders; /**< the headers the client sent us */ - int nWildfireHeaders; /**< how many wildfire headers did we already send? */ + HashList *urlstrings; /* variables passed to webcit in a URL */ + HashList *HTTPHeaders; /* the headers the client sent us */ + int nWildfireHeaders; /* how many wildfire headers did we already send? */ HdrRefs HR; } ParsedHttpHdrs; @@ -456,109 +420,112 @@ typedef struct _ParsedHttpHdrs { typedef struct wcsession wcsession; struct wcsession { /* infrastructural members */ - wcsession *next; /**< Linked list */ - pthread_mutex_t SessionMutex; /**< mutex for exclusive access */ - int wc_session; /**< WebCit session ID */ - int killthis; /**< Nonzero == purge this session */ - int is_mobile; /**< Client is a handheld browser */ - int ctdl_pid; /**< Session ID on the Citadel server */ - int nonce; /**< session nonce (to prevent session riding) */ + wcsession *next; /* Linked list */ + pthread_mutex_t SessionMutex; /* mutex for exclusive access */ + int wc_session; /* WebCit session ID */ + int killthis; /* Nonzero == purge this session */ + int is_mobile; /* Client is a handheld browser */ + int ctdl_pid; /* Session ID on the Citadel server */ + int nonce; /* session nonce (to prevent session riding) */ int SessionKey; /* Session local Members */ - int serv_sock; /**< Client socket to Citadel server */ - StrBuf *ReadBuf; /**< here we keep our stuff while reading linebuffered from the server. */ - StrBuf *MigrateReadLineBuf; /**< here we buffer legacy server read stuff */ - const char *ReadPos; /**< whats our read position in ReadBuf? */ - int chat_sock; /**< Client socket to Citadel server - for chat */ - time_t lastreq; /**< Timestamp of most recent HTTP */ - time_t last_pager_check; /**< last time we polled for instant msgs */ - ServInfo *serv_info; /**< Iformation about the citserver we're connected to */ - int is_ajax; /** < are we doing an ajax request? */ + int serv_sock; /* Client socket to Citadel server */ + StrBuf *ReadBuf; /* here we keep our stuff while reading linebuffered from the server. */ + StrBuf *MigrateReadLineBuf; /* here we buffer legacy server read stuff */ + const char *ReadPos; /* whats our read position in ReadBuf? */ + int chat_sock; /* Client socket to Citadel server - for chat */ + 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? */ /* Request local Members */ - StrBuf *CLineBuf; /**< linebuffering client stuff */ + StrBuf *CLineBuf; /* linebuffering client stuff */ ParsedHttpHdrs *Hdr; - StrBuf *WBuf; /**< Our output buffer */ - StrBuf *HBuf; /**< Our HeaderBuffer */ + StrBuf *WBuf; /* Our output buffer */ + StrBuf *HBuf; /* Our HeaderBuffer */ - HashList *vars; /**< HTTP variable substitutions for this page */ - StrBuf *trailing_javascript; /**< extra javascript to be appended to page */ - char ImportantMessage[SIZ]; /**< ??? todo */ + HashList *vars; /* HTTP variable substitutions for this page */ + StrBuf *trailing_javascript; /* extra javascript to be appended to page */ + char ImportantMessage[SIZ]; StrBuf *ImportantMsg; + HashList *Directory; /* Parts of the directory URL in snippets */ + const floor *CurrentFloor; /**< when Parsing REST, which floor are we on? */ /* accounting */ - StrBuf *wc_username; /**< login name of current user */ - StrBuf *wc_fullname; /**< Screen name of current user */ - 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_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. */ - int need_vali; /**< New users require validation. */ + StrBuf *wc_username; /* login name of current user */ + StrBuf *wc_fullname; /* Screen name of current user */ + 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_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. */ + int need_vali; /* New users require validation. */ /* Preferences */ - StrBuf *cs_inet_email; /**< User's preferred Internet addr. */ - char reply_to[512]; /**< reply-to address */ - HashList *hash_prefs; /**< WebCit preferences for this user */ - StrBuf *DefaultCharset; /**< Charset the user preferes */ - int downloaded_prefs; /** Has the client download its prefs yet? */ - int SavePrefsToServer; /**< Should we save our preferences to the server at the end of the request? */ - int selected_language; /**< Language selected by user */ - int time_format_cache; /**< which timeformat does our user like? */ + StrBuf *cs_inet_email; /* User's preferred Internet addr. */ + char reply_to[512]; /* reply-to address */ + HashList *hash_prefs; /* WebCit preferences for this user */ + StrBuf *DefaultCharset; /* Charset the user preferes */ + int downloaded_prefs; /* Has the client download its prefs yet? */ + int SavePrefsToServer; /* Should we save our preferences to the server at the end of the request? */ + int selected_language; /* Language selected by user */ + int time_format_cache; /* which timeformat does our user like? */ /* current room related */ - StrBuf *wc_roomname; /**< Room we are currently in */ - unsigned room_flags; /**< flags associated with the current room */ - unsigned room_flags2; /**< flags associated with the current room */ - int wc_view; /**< view for the current room */ - int wc_default_view; /**< default view for the current room */ - int wc_is_trash; /**< nonzero == current room is a Trash folder */ - int wc_floor; /**< floor number of current room */ - int is_mailbox; /**< the current room is a private mailbox */ + StrBuf *wc_roomname; /* Room we are currently in */ + unsigned room_flags; /* flags associated with the current room */ + unsigned room_flags2; /* flags associated with the current room */ + int wc_view; /* view for the current room */ + int wc_default_view; /* default view for the current room */ + int wc_is_trash; /* nonzero == current room is a Trash folder */ + int wc_floor; /* floor number of current room */ + int is_mailbox; /* the current room is a private mailbox */ /* next/previous room thingabob */ - struct march *march; /**< march mode room list */ - char ugname[128]; /**< where does 'ungoto' take us */ - long uglsn; /**< last seen message number for ungoto */ + struct march *march; /* march mode room list */ + char ugname[128]; /* where does 'ungoto' take us */ + long uglsn; /* last seen message number for ungoto */ /* Uploading; mime attachments for composing messages */ - HashList *attachments; /**< list of attachments for 'enter message' */ - int upload_length; /**< content length of http-uploaded data */ - char *upload; /**< pointer to http-uploaded data */ - char upload_filename[PATH_MAX]; /**< filename of http-uploaded data */ - char upload_content_type[256]; /**< content type of http-uploaded data */ + HashList *attachments; /* list of attachments for 'enter message' */ + int upload_length; /* content length of http-uploaded data */ + StrBuf *upload; /* pointer to http-uploaded data */ + char upload_filename[PATH_MAX]; /* 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 */ + int new_mail; /* user has new mail waiting */ + int remember_new_mail; /* last count of new mail messages */ /* Roomiew control */ - HashList *summ; /**< list of messages for mailbox summary view */ + HashList *Floors; /* floors our citserver has... */ + HashList *summ; /* list of messages for mailbox summary view */ /** Perhaps these should be within a struct instead */ - long startmsg; /**< message number to start at */ - long maxmsgs; /**< maximum messages to display */ - long num_displayed; /**< number of messages actually displayed */ - HashList *disp_cal_items; /**< sorted list of calendar items; startdate is the sort criteria. */ + long startmsg; /* message number to start at */ + long maxmsgs; /* maximum messages to display */ + long num_displayed; /* number of messages actually displayed */ + HashList *disp_cal_items; /* sorted list of calendar items; startdate is the sort criteria. */ - char last_chat_user[256]; /**< ??? todo */ + char last_chat_user[256]; /* Iconbar controls */ - struct folder *cache_fold; /**< cache the iconbar room list */ - int cache_max_folders; /**< ??? todo */ - int cache_num_floors; /**< ??? todo */ - time_t cache_timestamp; /**< ??? todo */ - HashList *IconBarSettings; /**< which icons should be shown / not shown? */ - const StrBuf *floordiv_expanded; /**< which floordiv currently expanded */ + struct __ofolder *cache_fold; /* cache the iconbar room list */ + int cache_max_folders; + int cache_num_floors; + time_t cache_timestamp; + HashList *IconBarSettings; /* which icons should be shown / not shown? */ + const StrBuf *floordiv_expanded; /* which floordiv currently expanded */ /* cache stuff for templates. TODO: find a smartrer way */ - HashList *ServCfg; /**< cache our server config for editing */ - HashList *InetCfg; /**< Our inet server config for editing */ + HashList *ServCfg; /* cache our server config for editing */ + HashList *InetCfg; /* Our inet server config for editing */ }; @@ -574,11 +541,6 @@ typedef struct _HttpHeader { void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F); -/* values for WC->current_iconbar */ -enum { - current_iconbar_menu, /* view the icon menue */ - current_iconbar_roomlist /* view the roomtree */ -}; enum { S_SELECT, S_SHUTDOWN, @@ -586,27 +548,6 @@ enum { }; -/* - * calview contains data passed back and forth between the message fetching loop - * and the calendar view renderer. - */ -enum { - calview_month, - calview_day, - calview_week, - calview_brief, - calview_summary -}; - -struct calview { - int view; - int year; - int month; - int day; - time_t lower_bound; - time_t upper_bound; -}; - #ifndef num_parms #define num_parms(source) num_tokens(source, '|') #endif @@ -634,6 +575,7 @@ extern int is_https; extern int setup_wizard; extern char wizard_filename[]; extern int follow_xff; +extern int num_threads; void InitialiseSemaphores(void); void begin_critical_section(int which_one); @@ -644,7 +586,7 @@ void stuff_to_cookie(char *cookie, size_t clen, StrBuf *user, StrBuf *pass, StrBuf *room, - char *language + const char *language ); void cookie_to_stuff(StrBuf *cookie, int *session, @@ -665,6 +607,8 @@ 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); +void CreateMimeStr(void); int GetConnected(void); void DeleteServInfo(ServInfo **FreeMe); int uds_connectsock(char *); @@ -682,10 +626,6 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source); void pullquote_fmout(void); void wDumpContent(int); -int Flathash(const char *str, long len); - - - void UrlescPutStrBuf(const StrBuf *strbuf); @@ -707,7 +647,6 @@ void wprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void output_static(const char* What); -void print_menu_box(char* Title, char *Class, int nLines, ...); long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks); void escputs(const char *strbuf); void url(char *buf, size_t bufsize); @@ -719,7 +658,6 @@ void msgescputs1(char *strbuf); void dump_vars(void); void embed_main_menu(void); -void SetAccessCommand(long Oper); void do_addrbook_view(addrbookent *addrbook, int num_ab); void fetch_ab_name(message_summary *Msg, char **namebuf); void display_vcard(StrBuf *Target, StrBuf *vcard_source, char alpha, int full, char **storename, long msgnum); @@ -730,7 +668,6 @@ void text_to_server(char *ptr); void text_to_server_qp(char *ptr); void confirm_delete_msg(void); void display_success(char *); -void authorization_required(const char *message); void CheckAuthBasic(ParsedHttpHdrs *hdr); void GetAuthBasic(ParsedHttpHdrs *hdr); void server_to_text(void); @@ -738,6 +675,8 @@ void save_edit(char *description, char *enter_cmd, int regoto); void display_edit(char *description, char *check_cmd, char *read_cmd, char *save_cmd, int with_room_banner); 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 *); @@ -775,7 +714,7 @@ int pattern2(char *search, char *patn); void do_edit_vcard(long msgnum, char *partnum, message_summary *VCMsg, wc_mime_attachment *VCAtt, - char *return_to, + const char *return_to, const char *force_room); void select_user_to_edit(const char *preselect); @@ -792,13 +731,9 @@ 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 load_calendar_item(message_summary *Msg, int unread, struct calview *c); void display_calendar(message_summary *Msg, int unread); -void display_task(message_summary *Msg, int unread); void display_note(message_summary *Msg, int unread); void updatenote(void); -void parse_calendar_view_request(struct calview *c); -void render_calendar_view(struct calview *c); void do_tasks_view(void); int calendar_summary_view(void); void free_march_list(wcsession *wcf); @@ -820,11 +755,6 @@ icaltimezone *get_default_icaltimezone(void); void display_icaltimetype_as_webform(struct icaltimetype *, char *, int); void icaltime_from_webform(struct icaltimetype *result, char *prefix); void icaltime_from_webform_dateonly(struct icaltimetype *result, char *prefix); -void display_edit_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, - int unread, struct calview *calv); -void save_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, - int unread, struct calview *calv); -void ical_dezonify(icalcomponent *cal); void partstat_as_string(char *buf, icalproperty *attendee); icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp); void check_attendee_availability(icalcomponent *supplied_vevent); @@ -874,14 +804,6 @@ void summary(void); int is_mobile_ua(char *user_agent); void embed_room_banner(char *, int); -#define FLOOR_PARAM_LEN 3 -extern const char FLOOR_PARAM_NAMES[(FLOOR_PARAM_LEN + 1)][15]; -extern const int FLOOR_PARAM_NAMELEN[(FLOOR_PARAM_LEN + 1)]; -#define FPKEY(a) FLOOR_PARAM_NAMES[a], FLOOR_PARAM_NAMELEN[a] -#define ROOM_PARAM_LEN 8 -extern const char ROOM_PARAM_NAMES[(ROOM_PARAM_LEN + 1)][20]; -extern const int ROOM_PARAM_NAMELEN[(ROOM_PARAM_LEN +1)]; -#define RPKEY(a) ROOM_PARAM_NAMES[a], ROOM_PARAM_NAMELEN[a] HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP); HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP); int SortRoomsByListOrder(const void *room1, const void *room2); @@ -891,6 +813,12 @@ enum { navbar_default }; +/* actual supported locales */ +void TmplGettext(StrBuf *Target, WCTemplputParams *TP); +void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); +void set_selected_language(const char *); +void go_selected_language(void); +void stop_selected_language(void); #ifdef HAVE_OPENSSL void init_ssl(void); @@ -902,7 +830,7 @@ int client_read_sslbuffer(StrBuf *buf, int timeout); void client_write_ssl(const StrBuf *Buf); #endif -void utf8ify_rfc822_string(char *buf); +void utf8ify_rfc822_string(char **buf); void begin_burst(void); long end_burst(void); @@ -911,7 +839,6 @@ extern char *hourname[]; /* Names of hours (12am, 1am, etc.) */ void http_datestring(char *buf, size_t n, time_t xtime); -typedef void (*IcalCallbackFunc)(icalcomponent *, long, char*, int, struct calview *); /* These should be empty, but we have them for testing */ #define DEFAULT_HTTPAUTH_USER ""