X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=604205bc0f4d19d556b619dd63978626ca4dc8b6;hb=1b302cba797e9b8d6f94304f80c52ac63845503a;hp=f431ac9e7f752e23c4f1bbe68707a9195b893807;hpb=593af65c41d9a6385a5273a11e70aa88a32a4237;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index f431ac9e7..604205bc0 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -55,9 +55,6 @@ #endif #include #include -#ifdef HAVE_USELOCALE -extern locale_t wc_locales[]; -#endif #define _(string) gettext(string) #else #define _(string) (string) @@ -89,7 +86,12 @@ extern locale_t wc_locales[]; #undef PACKAGE_BUGREPORT #include "sysdep.h" -////////#include "hash.h" +#include "subst.h" +#include "wc_gettext.h" +#include "messages.h" +#include "paramhandling.h" +#include "preferences.h" + #ifdef HAVE_OPENSSL /* Work around RedHat's b0rken OpenSSL includes */ @@ -212,25 +214,25 @@ struct urlcontent { /* * \brief information about us ??? */ -struct serv_info { +typedef struct _serv_info { int serv_pid; /* Process ID of the Citadel server */ - char serv_nodename[32]; /* Node name of the Citadel server */ - char serv_humannode[64]; /* human readable node name of the Citadel server */ - char serv_fqdn[64]; /* fully quallified Domain Name (such as uncensored.citadel.org) */ - char serv_software[64]; /* What version does our connected citadel server use */ + StrBuf *serv_nodename; /* Node name of the Citadel server */ + StrBuf *serv_humannode; /* human readable node name of the Citadel server */ + StrBuf *serv_fqdn; /* fully quallified Domain Name (such as uncensored.citadel.org) */ + StrBuf *serv_software; /* What version does our connected citadel server use */ int serv_rev_level; /* Whats the citadel server revision */ - char serv_bbs_city[64]; /* Geographic location of the Citadel server */ - char serv_sysadm[64]; /* Name of system administrator */ - char serv_moreprompt[256]; /* Whats the commandline textprompt */ + 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? */ - char serv_default_cal_zone[128];/* Default timezone for unspecified calendar items */ + StrBuf *serv_default_cal_zone; /* Default timezone for unspecified calendar items */ int serv_supports_sieve; /* Does the server support Sieve mail filtering? */ int serv_fulltext_enabled; /* Does the server have the full text index enabled? */ - char serv_svn_revision[256]; /* SVN revision of the server */ + StrBuf *serv_svn_revision; /* SVN revision of the server */ int serv_supports_openid; /* Does the server support authentication via OpenID? */ -}; +} ServInfo; @@ -258,226 +260,8 @@ struct roomlisting { }; -#define TYPE_STR 1 -#define TYPE_LONG 2 -#define TYPE_PREFSTR 3 -#define TYPE_PREFINT 4 -#define TYPE_GETTEXT 5 -#define TYPE_BSTR 6 -#define MAXPARAM 20 - - -typedef struct _TemplateParam { - const char *Start; - int Type; - long len; - long lvalue; -} TemplateParam; - -typedef struct _TemplateToken { - const StrBuf *FileName; /* Reference to print error messages; not to be freed */ - StrBuf *FlatToken; - long Line; - const char *pTokenStart; - size_t TokenStart; - size_t TokenEnd; - const char *pTokenEnd; - int Flags; - void *PreEval; - - const char *pName; - size_t NameEnd; - - int HaveParameters; - int nParameters; - TemplateParam *Params[MAXPARAM]; -} WCTemplateToken; - -typedef void (*WCHandlerFunc)(); - - -/* - * \brief Dynamic content for variable substitution in templates - */ -typedef struct _wcsubst { - int wcs_type; /* which type of Substitution are we */ - char wcs_key[32]; /* copy of our hashkey for debugging */ - StrBuf *wcs_value; /* if we're a string, keep it here */ - long lvalue; /* type long? keep data here */ - int ContextRequired; /* do we require a context type? */ - WCHandlerFunc wcs_function; /* funcion hook ???*/ -} wcsubst; - -#define CTX_NONE 0 -#define CTX_SITECFG 1 -#define CTX_SESSION 2 -#define CTX_INETCFG 3 -#define CTX_VNOTE 4 -#define CTX_WHO 5 -#define CTX_PREF 6 -#define CTX_NODECONF 7 -#define CTX_USERLIST 8 -#define CTX_MAILSUM 9 -#define CTX_MIME_ATACH 10 -#define CTX_ATT 11 -#define CTX_STRBUF 12 - -void RegisterNS(const char *NSName, long len, - int nMinArgs, - int nMaxArgs, - WCHandlerFunc HandlerFunc, - int ContextRequired); -#define RegisterNamespace(a, b, c, d, e) RegisterNS(a, sizeof(a)-1, b, c, d, e) - -typedef int (*WCConditionalFunc)(WCTemplateToken *Token, void *Context, int ContextType); -typedef struct _ConditionalStruct { - const char *PlainName; - int nParams; - int ContextRequired; - WCConditionalFunc CondF; -} ConditionalStruct; -void RegisterConditional(const char *Name, long len, - int nParams, - WCConditionalFunc CondF, - int ContextRequired); - - - -typedef void (*SubTemplFunc)(StrBuf *TemplBuffer, void *Context, WCTemplateToken *Token); -typedef HashList *(*RetrieveHashlistFunc)(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType); -typedef void (*HashDestructorFunc) (HashList **KillMe); -void RegisterITERATOR(const char *Name, long len, /* Our identifier */ - int AdditionalParams, /* doe we use more parameters? */ - HashList *StaticList, /* pointer to webcit lifetime hashlists */ - RetrieveHashlistFunc GetHash, /* else retrieve the hashlist by calling this function */ - SubTemplFunc DoSubTempl, /* call this function on each iteration for svput & friends */ - HashDestructorFunc Destructor, /* use this function to shut down the hash; NULL if its a reference */ - int ContextType, /* which context do we provide to the subtemplate? */ - int XPectContextType); /* which context do we expct to be called in? */ -#define RegisterIterator(a, b, c, d, e, f, g, h) RegisterITERATOR(a, sizeof(a)-1, b, c, d, e, f, g, h) - -void GetTemplateTokenString(WCTemplateToken *Tokens, - int N, - const char **Value, - long *len); - - -void SVPut(char *keyname, size_t keylen, int keytype, char *Data); -#define svput(a, b, c) SVPut(a, sizeof(a) - 1, b, c) -void SVPutLong(char *keyname, size_t keylen, long Data); -#define svputlong(a, b) SVPutLong(a, sizeof(a) - 1, b) -void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...) __attribute__((__format__(__printf__,4,5))); -void SVPRINTF(char *keyname, int keytype, const char *format,...) __attribute__((__format__(__printf__,3,4))); -void SVCALLBACK(char *keyname, WCHandlerFunc fcn_ptr); -void SVCallback(char *keyname, size_t keylen, WCHandlerFunc fcn_ptr); -#define svcallback(a, b) SVCallback(a, sizeof(a) - 1, b) - -void SVPUTBuf(const char *keyname, int keylen, const StrBuf *Buf, int ref); -#define SVPutBuf(a, b, c); SVPUTBuf(a, sizeof(a) - 1, b, c) - -void DoTemplate(const char *templatename, long len, StrBuf *Target, void *Context, int ContextType); -#define do_template(a, b) DoTemplate(a, sizeof(a) -1, NULL, b, 0); -void url_do_template(void); - -int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup); -int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup); - -void StrBufAppendTemplate(StrBuf *Target, - int nArgs, - WCTemplateToken *Tokens, - void *Context, int ContextType, - const StrBuf *Source, int FormatTypeIndex); - - - -/* - * \brief Values for wcs_type - */ -enum { - WCS_STRING, /* its a string */ - WCS_FUNCTION, /* its a function callback */ - WCS_SERVCMD, /* its a command to send to the citadel server */ - WCS_STRBUF, /* its a strbuf we own */ - WCS_STRBUF_REF, /* its a strbuf we mustn't free */ - WCS_LONG /* its an integer */ -}; - -/* - * \brief mail attachment ??? - */ -typedef struct _wc_attachment { - size_t length; /* length of the contenttype */ - StrBuf *content_type; /* the content itself ???*/ - StrBuf *filename; /* the filename hooked to this content ??? */ - char *data; /* the data pool; aka this content */ - long lvalue; /* if we put a long... */ -} wc_attachment; -void free_attachment(void *vattach); - - -typedef struct wc_mime_attachment wc_mime_attachment; -typedef void (*RenderMimeFunc)(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset); -struct wc_mime_attachment { - int level; - StrBuf *Name; - StrBuf *FileName; - StrBuf *PartNum; - StrBuf *Disposition; - StrBuf *ContentType; - StrBuf *Charset; - StrBuf *Data; - size_t length; /* length of the mimeatachment */ - long size_known; - char content_type[SIZ]; /* the content itself ???*/ - char filename[SIZ]; /* the filename hooked to this content ??? */ - char *data; /* the data pool; aka this content */ - long lvalue; /* if we put a long... */ - long msgnum; /**< the message number on the citadel server derived from message_summary */ - RenderMimeFunc Renderer; -}; -void DestroyMime(void *vMime); - - -/* - * \brief message summary structure. ??? - */ -typedef struct _message_summary { - time_t date; /**< its creation date */ - long msgnum; /**< the message number on the citadel server */ - int nhdr; - int format_type; - StrBuf *from; /**< the author */ - StrBuf *to; /**< the recipient */ - StrBuf *subj; /**< the title / subject */ - StrBuf *reply_inreplyto; - StrBuf *reply_references; - StrBuf *reply_to; - StrBuf *cccc; - StrBuf *hnod; - StrBuf *AllRcpt; - StrBuf *Room; - StrBuf *Rfca; - StrBuf *OtherNode; - const StrBuf *PartNum; - - HashList *Attachments; /**< list of Accachments */ - HashList *Submessages; - HashList *AttachLinks; - - HashList *AllAttach; - - int is_new; /**< is it yet read? */ - int hasattachments; /* does it have atachments? */ - - - /** The mime part of the message */ - wc_mime_attachment *MsgBody; -} message_summary; -void DestroyMessageSummary(void *vMsg); -typedef void (*ExamineMsgHeaderFunc)(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset); -void evaluate_mime_part(message_summary *Msg, wc_mime_attachment *Mime); @@ -542,81 +326,116 @@ enum { * One of these is kept for each active Citadel session. * HTTP transactions are bound to one at a time. */ +typedef struct wcsession wcsession; struct wcsession { - struct wcsession *next; /**< Linked list */ +/* infrastructural members */ + wcsession *next; /**< Linked list */ + pthread_mutex_t SessionMutex; /**< mutex for exclusive access */ int wc_session; /**< WebCit session ID */ - char wc_username[128]; /**< login name of current user */ - char wc_fullname[128]; /**< Screen name of current user */ - char wc_password[128]; /**< Password of current user */ - char wc_roomname[256]; /**< Room we are currently in */ - int connected; /**< nonzero == we are connected to Citadel */ - int logged_in; /**< nonzero == we are logged in */ - 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 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) */ + +/* Session local Members */ int http_sock; /**< HTTP server socket */ int serv_sock; /**< Client socket to Citadel server */ 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 */ +/* Request local Members */ + StrBuf *CLineBuf; /**< linebuffering client stuff */ + StrBuf *UrlFragment1; /**< first urlfragment, if NEED_URL is specified by the handler*/ + StrBuf *UrlFragment2; /**< second urlfragment, if NEED_URL is specified by the handler*/ + StrBuf *UrlFragment3; /**< third urlfragment, if NEED_URL is specified by the handler*/ + StrBuf *WBuf; /**< Our output buffer */ + StrBuf *HBuf; /**< Our HeaderBuffer */ + StrBuf *this_page; /**< URL of current page */ + HashList *urlstrings; /**< variables passed to webcit in a URL */ + HashList *vars; /**< HTTP variable substitutions for this page */ + StrBuf *http_host; /**< HTTP Host: header */ + int is_ajax; /** < are we doing an ajax request? */ + int gzip_ok; /**< Nonzero if Accept-encoding: gzip */ + int nWildfireHeaders; /**< how many wildfire headers did we already send? */ + + StrBuf *trailing_javascript; /**< extra javascript to be appended to page */ + char ImportantMessage[SIZ]; /**< ??? todo */ + +/* accounting */ + StrBuf *wc_username; /**< login name of current user */ + StrBuf *httpauth_user; /**< only for GroupDAV sessions */ + 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 */ + char cs_inet_email[256]; /**< 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 */ + +/* 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 */ + +/* 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 */ + int new_mail; /**< user has new mail waiting */ int remember_new_mail; /**< last count of new mail messages */ - int need_regi; /**< This user needs to register. */ - int need_vali; /**< New users require validation. */ - char cs_inet_email[256]; /**< User's preferred Internet addr. */ - pthread_mutex_t SessionMutex; /**< mutex for exclusive access */ - time_t lastreq; /**< Timestamp of most recent HTTP */ - int killthis; /**< Nonzero == purge this session */ - struct march *march; /**< march mode room list */ - char reply_to[512]; /**< reply-to address */ - long msgarr[10000]; /**< for read operations */ + +/* Roomiew control */ HashList *summ; /**< list of messages for mailbox summary view */ - int is_mobile; /**< Client is a handheld browser */ - HashList *urlstrings; /**< variables passed to webcit in a URL */ - HashList *vars; /**< HTTP variable substitutions for this page */ - char this_page[512]; /**< URL of current page */ - char http_host[512]; /**< HTTP Host: header */ - HashList *hash_prefs; /**< WebCit preferences for this user */ + /** 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. */ - HashList *attachments; /**< list of attachments for 'enter message' */ + + char last_chat_user[256]; /**< ??? todo */ - char ImportantMessage[SIZ]; /**< ??? todo */ - int ctdl_pid; /**< Session ID on the Citadel server */ - char httpauth_user[256]; /**< only for GroupDAV sessions */ - char httpauth_pass[256]; /**< only for GroupDAV sessions */ - int gzip_ok; /**< Nonzero if Accept-encoding: gzip */ - int is_mailbox; /**< the current room is a private mailbox */ + +/* 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 *IconBarSetttings; /**< which icons should be shown / not shown? */ - long current_iconbar; /**< What is currently in the iconbar? */ + HashList *IconBarSettings; /**< which icons should be shown / not shown? */ const StrBuf *floordiv_expanded; /**< which floordiv currently expanded */ - int selected_language; /**< Language selected by user */ - time_t last_pager_check; /**< last time we polled for instant msgs */ - int nonce; /**< session nonce (to prevent session riding) */ - int time_format_cache; /**< which timeformat does our user like? */ - StrBuf *UrlFragment1; /**< first urlfragment, if NEED_URL is specified by the handler*/ - StrBuf *UrlFragment2; /**< second urlfragment, if NEED_URL is specified by the handler*/ - StrBuf *WBuf; /**< Our output buffer */ - StrBuf *HBuf; /**< Our HeaderBuffer */ - StrBuf *CLineBuf; /**< linebuffering client stuff */ - StrBuf *DefaultCharset; /**< Charset the user preferes */ + + + +/* 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 */ - StrBuf *trailing_javascript; /**< extra javascript to be appended to page */ }; /* values for WC->current_iconbar */ @@ -639,7 +458,8 @@ enum { calview_month, calview_day, calview_week, - calview_brief + calview_brief, + calview_summary }; struct calview { @@ -669,7 +489,6 @@ extern char file_crpt_file_csr[PATH_MAX]; extern char file_crpt_file_cer[PATH_MAX]; #endif -struct serv_info serv_info; extern char floorlist[128][SIZ]; extern char *axdefs[]; extern char *ctdlhost, *ctdlport; @@ -682,16 +501,8 @@ extern time_t if_modified_since; extern int follow_xff; extern HashList *HandlerHash; extern HashList *PreferenceHooks; -extern HashList *WirelessTemplateCache; -extern HashList *WirelessLocalTemplateCache; -extern HashList *TemplateCache; -extern HashList *LocalTemplateCache; -extern HashList *GlobalNS; -extern HashList *Iterators; extern HashList *ZoneHash; -extern HashList *Conditionals; -extern HashList *MsgHeaderHandler; -extern HashList *MimeRenderHandler; +extern HashList *SortHash; void InitialiseSemaphores(void); void begin_critical_section(int which_one); @@ -699,13 +510,13 @@ void end_critical_section(int which_one); void stuff_to_cookie(char *cookie, size_t clen, int session, - char *user, char *pass, char *room); + StrBuf *user, StrBuf *pass, StrBuf *room); void cookie_to_stuff(StrBuf *cookie, int *session, - char *user, size_t user_len, - char *pass, size_t pass_len, - char *room, size_t room_len); -void locate_host(char *, int); -void become_logged_in(char *, char *, char *); + StrBuf *user, + StrBuf *pass, + StrBuf *room); +void locate_host(StrBuf *TBuf, int); +void become_logged_in(const StrBuf *user, const StrBuf *pass, StrBuf *serv_response); void openid_manual_create(void); void display_login(); void display_openids(void); @@ -715,7 +526,8 @@ void display_main_menu(void); void display_aide_menu(void); void display_advanced_menu(void); void slrp_highest(void); -void get_serv_info(char *, char *); +ServInfo *get_serv_info(StrBuf *, char *); +void DeleteServInfo(ServInfo **FreeMe); int uds_connectsock(char *); int tcp_connectsock(char *, char *); int serv_getln(char *strbuf, int bufsize); @@ -734,35 +546,6 @@ void wDumpContent(int); int Flathash(const char *str, long len); -/* These may return NULL if not foud */ -#define sbstr(a) SBstr(a, sizeof(a) - 1) -const StrBuf *SBSTR(const char *key); -const StrBuf *SBstr(const char *key, size_t keylen); - -#define xbstr(a, b) (char*) XBstr(a, sizeof(a) - 1, b) -const char *XBstr(const char *key, size_t keylen, size_t *len); -const char *XBSTR(const char *key, size_t *len); - -#define lbstr(a) LBstr(a, sizeof(a) - 1) -long LBstr(const char *key, size_t keylen); -long LBSTR(const char *key); - -#define ibstr(a) IBstr(a, sizeof(a) - 1) -int IBstr(const char *key, size_t keylen); -int IBSTR(const char *key); - -#define havebstr(a) HaveBstr(a, sizeof(a) - 1) -int HaveBstr(const char *key, size_t keylen); -int HAVEBSTR(const char *key); - -#define yesbstr(a) YesBstr(a, sizeof(a) - 1) -int YesBstr(const char *key, size_t keylen); -int YESBSTR(const char *key); - -/* TODO: get rid of the non-const-typecast */ -#define bstr(a) (char*) Bstr(a, sizeof(a) - 1) -const char *BSTR(const char *key); -const char *Bstr(const char *key, size_t keylen); @@ -780,16 +563,17 @@ void output_headers( int do_httpheaders, int unset_cookies, int suppress_check, int cache); +void output_custom_content_header(const char *ctype); void wprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void hprintf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void output_static(char *what); -void display_mime_icon(void); + void print_menu_box(char* Title, char *Class, int nLines, ...); long stresc(char *target, long tSize, char *strbuf, int nbsp, int nolinebreaks); -void escputs(char *strbuf); +void escputs(const char *strbuf); void url(char *buf, size_t bufsize); void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); -void escputs1(char *strbuf, int nbsp, int nolinebreaks); +void escputs1(const char *strbuf, int nbsp, int nolinebreaks); void msgesc(char *target, size_t tlen, char *strbuf); void msgescputs(char *strbuf); void msgescputs1(char *strbuf); @@ -797,10 +581,14 @@ void stripout(char *str, char leftboundary, char rightboundary); void dump_vars(void); void embed_main_menu(void); void serv_read(char *buf, int bytes); -void readloop(char *oper); -int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, int printable_view, const StrBuf *section); + +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, const char *vcard_source, 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); @@ -810,21 +598,19 @@ void server_to_text(void); 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); -int gotoroom(char *gname); +long gotoroom(const StrBuf *gname); void confirm_delete_room(void); void validate(void); void display_graphics_upload(char *, char *, char *); void do_graphics_upload(char *upl_cmd); -void serv_read(char *buf, int bytes); void serv_gets(char *strbuf); void serv_write(const char *buf, int nbytes); -void serv_puts(const char *string); void serv_putbuf(const StrBuf *string); void serv_printf(const char *format,...)__attribute__((__format__(__printf__,1,2))); void load_floorlist(void); void shutdown_sessions(void); void do_housekeeping(void); -void smart_goto(char *); +void smart_goto(const StrBuf *); void worker_entry(void); void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *ReqType, StrBuf *ReadBuf); size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm); @@ -847,7 +633,7 @@ void remove_token(char *source, int parmnum, char separator); char *load_mimepart(long msgnum, char *partnum); void MimeLoadData(wc_mime_attachment *Mime); int pattern2(char *search, char *patn); -void do_edit_vcard(long, char *, char *, char *); +void do_edit_vcard(long, char *, char *, const char *); void striplt(char *); void stripltlen(char *, int *); void select_user_to_edit(char *message, char *preselect); @@ -856,38 +642,12 @@ void do_change_view(int); void folders(void); -void load_preferences(void); -void save_preferences(void); -#define get_preference(a, b) get_PREFERENCE(a, sizeof(a) - 1, b) -#define get_pref(a, b) get_PREFERENCE(ChrPtr(a), StrLength(a), b) -int get_PREFERENCE(const char *key, size_t keylen, StrBuf **value); -#define set_preference(a, b, c) set_PREFERENCE(a, sizeof(a) - 1, b, c) -#define set_pref(a, b, c) set_PREFERENCE(ChrPtr(a), StrLength(a), b, c) -void set_PREFERENCE(const char *key, size_t keylen, StrBuf *value, int save_to_server); - -#define get_pref_long(a, b, c) get_PREF_LONG(a, sizeof(a) - 1, b, c) -int get_PREF_LONG(const char *key, size_t keylen, long *value, long Default); -#define set_pref_long(a, b, c) set_PREF_LONG(a, sizeof(a) - 1, b, c) -void set_PREF_LONG(const char *key, size_t keylen, long value, int save_to_server); - -#define get_pref_yesno(a, b, c) get_PREF_YESNO(a, sizeof(a) - 1, b, c) -int get_PREF_YESNO(const char *key, size_t keylen, int *value, int Default); -#define set_pref_yesno(a, b, c) set_PREF_YESNO(a, sizeof(a) - 1, b, c) -void set_PREF_YESNO(const char *key, size_t keylen, int value, int save_to_server); -#define get_room_pref(a) get_ROOM_PREFS(a, sizeof(a) - 1) -StrBuf *get_ROOM_PREFS(const char *key, size_t keylen); - -#define set_room_pref(a, b, c) set_ROOM_PREFS(a, sizeof(a) - 1, b, c) -void set_ROOM_PREFS(const char *key, size_t keylen, StrBuf *value, int save_to_server); - -int is_msg_in_mset(char *mset, long msgnum); void display_addressbook(long msgnum, char alpha); -void offer_start_page(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); +void offer_start_page(StrBuf *Target, WCTemplputParams *TP); void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext); void output_html(const char *, int, int, StrBuf *, StrBuf *); void do_listsub(void); -void toggle_self_service(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); @@ -898,10 +658,8 @@ void updatenote(void); void parse_calendar_view_request(struct calview *c); void render_calendar_view(struct calview *c); void do_tasks_view(void); -void calendar_summary_view(void); -int load_msg_ptrs(char *servcmd, int with_headers); -void free_attachments(struct wcsession *sess); -void free_march_list(struct wcsession *wcf); +int calendar_summary_view(void); +void free_march_list(wcsession *wcf); void display_rules_editor_inner_div(void); void generate_uuid(char *); void CtdlMakeTempFileName(char *, int); @@ -936,31 +694,20 @@ int ical_ctdl_is_overlap( struct icaltimetype t2end ); -#ifdef ENABLE_NLS -void initialize_locales(void); -void ShutdownLocale(void); -#endif -void TmplGettext(StrBuf *Target, int nTokens, WCTemplateToken *Token); extern char *months[]; extern char *days[]; int read_server_binary(StrBuf *Ret, size_t total_len); int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize); -int read_server_text(StrBuf *Buf, long *nLines);; +int read_server_text(StrBuf *Buf, long *nLines); int goto_config_room(void); -long locate_user_vcard(char *username, long usernum); +long locate_user_vcard_in_this_room(void); 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 spawn_another_worker_thread(void); -void display_rss(char *roomname, StrBuf *request_method); -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); -void preset_locale(void); -void httplang_to_locale(StrBuf *LocaleString); +void display_rss(const StrBuf *roomname, StrBuf *request_method); void StrEndTab(StrBuf *Target, int tabnum, int num_tabs); void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs); void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]); @@ -968,16 +715,29 @@ void tabbed_dialog(int num_tabs, char *tabnames[]); void begin_tab(int tabnum, int num_tabs); void end_tab(int tabnum, int num_tabs); void str_wiki_index(char *s); +long guess_calhourformat(void); int get_time_format_cached (void); int xtoi(const char *in, size_t len); const char *get_selected_language(void); void webcit_fmt_date(char *buf, time_t thetime, int brief); 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); - +#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); /* navbar types that can be passed to embed_room_banner */ enum { navbar_none, @@ -995,12 +755,6 @@ int client_read_sslbuffer(StrBuf *buf, int timeout); void client_write_ssl(const StrBuf *Buf); #endif -#ifdef HAVE_ZLIB -#include -int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen, - const Bytef * source, uLong sourceLen, int level); -#endif - void utf8ify_rfc822_string(char *buf); void begin_burst(void); @@ -1040,3 +794,4 @@ void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc #define WC_TIMEFORMAT_24 2 +void LoadIconSettings(void);