X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebcit.h;h=2d64f5dca98d73ffe85bd9419bd65c3b507005fe;hb=c1bfa993f32198515f9994cde602f7bcd4da35d8;hp=468d1ae79e1b96ef722222e34ff1952363006214;hpb=965dc19512d1f0873b23623fb8803f7ac989f993;p=citadel.git diff --git a/webcit/webcit.h b/webcit/webcit.h index 468d1ae79..2d64f5dca 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -1,3 +1,4 @@ + /* $Id$ */ #include "sysdep.h" @@ -49,11 +50,11 @@ #endif #ifdef ENABLE_NLS +#ifdef HAVE_XLOCALE_H +#include +#endif #include #include -#ifdef HAVE_USELOCALE -extern locale_t wc_locales[]; -#endif #define _(string) gettext(string) #else #define _(string) (string) @@ -85,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 */ @@ -107,9 +113,9 @@ extern locale_t wc_locales[]; #define PORT_NUM 2000 /* port number to listen on */ #define DEVELOPER_ID 0 #define CLIENT_ID 4 -#define CLIENT_VERSION 739 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 739 /* min required Citadel ver */ -#define LIBCITADEL_MIN 739 /* min required libcitadel ver */ +#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 DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ @@ -134,33 +140,33 @@ extern locale_t wc_locales[]; * * 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 */ +#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_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 @@ -169,22 +175,22 @@ extern locale_t wc_locales[]; #define UA_ZAPPED 16 -/** +/* * 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_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 ) @@ -196,48 +202,48 @@ extern locale_t wc_locales[]; #define NLI "(not logged in)" -/** +/* * \brief 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]; /* the variable name */ + StrBuf *url_data; /* its value */ }; -/** +/* * \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; -/** +/* * \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 */ + 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 */ }; /* * @@ -245,272 +251,208 @@ struct march { * 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 */ + 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 */ }; -#define TYPE_STR 1 -#define TYPE_LONG 2 -#define MAXPARAM 20 -typedef struct _TemplateParam { - const char *Start; - int Type; - long len; - long lvalue; -} TemplateParam; -typedef struct _TemplateToken { - 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)(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType); -/** - * \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 - - -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 { - 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)(WCTemplateToken *Token); -typedef void (*HashDestructorFunc) (HashList **KillMe); -void RegisterITERATOR(const char *Name, long len, - int AdditionalParams, - HashList *StaticList, - RetrieveHashlistFunc GetHash, - SubTemplFunc DoSubTempl, - HashDestructorFunc Destructor, - int ContextType); -#define RegisterIterator(a, b, c, d, e, f, g) RegisterITERATOR(a, sizeof(a)-1, b, c, d, e, f, g) - -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, void *Context, StrBuf *Target, int ContextType); -#define do_template(a, b) DoTemplate(a, sizeof(a) -1, b, NULL, 0); -void url_do_template(void); - -int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup); -int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup); - - - - -/** - * \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 ??? - */ -struct wc_attachment { - struct wc_attachment *next;/**< pointer to next in list */ - size_t length; /**< length of the contenttype */ - 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... */ -}; - -/** - * \brief message summary structure. ??? - */ -struct message_summary { - time_t date; /**< its creation date */ - long msgnum; /**< the message number on the citadel server */ - char from[128]; /**< the author */ - char to[128]; /**< the recipient */ - char subj[256]; /**< the title / subject */ - int hasattachments; /**< does it have atachments? */ - int is_new; /**< is it yet read? */ -}; - /** * \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 */ + 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 */ - char *from; /**< owner of this component */ - int unread; /**< already seen by the user? */ + icalcomponent *cal; /* cal items for display */ + long cal_msgnum; /* cal msgids for display */ + char *from; /* owner of this component */ + int unread; /* already seen by the user? */ time_t event_start; time_t event_end; int multi_day_event; int is_repeat; + icalcomponent *SortBy; /* cal items for display */ + icalproperty_status Status; } disp_cal; +typedef struct _IcalEnumMap { + const char *Name; + long NameLen; + icalproperty_kind map; +} IcalEnumMap; -/** - * \brief One of these is kept for each active Citadel session. - * HTTP transactions are bound to on e at a time. +/* + * 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; + + +typedef struct _headereval { + ExamineMsgHeaderFunc evaluator; + int Type; +} headereval; + + +struct attach_link { + char partnum[32]; + char html[1024]; +}; + + +enum { + eUp, + eDown, + eNone +}; + +/* + * 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 */ + 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 */ +/* 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 *UrlFragment4; /**< fourth 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 */ + StrBuf *ImportantMsg; + +/* 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 */ + 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 */ + +/* 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 */ - int num_summ; /**< number of messages in mailbox summary view */ - struct message_summary *summ; /**< array 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 */ + +/* Roomiew control */ + 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. */ - struct wc_attachment *first_attachment; /**< linked 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 */ + + +/* 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 */ + }; -/** values for WC->current_iconbar */ +/* values for WC->current_iconbar */ enum { - current_iconbar_menu, /**< view the icon menue */ - current_iconbar_roomlist /**< view the roomtree */ + current_iconbar_menu, /* view the icon menue */ + current_iconbar_roomlist /* view the roomtree */ }; enum { S_SELECT, @@ -518,6 +460,28 @@ enum { MAX_SEMAPHORES }; + +/* + * 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 @@ -536,7 +500,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; @@ -549,15 +512,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 *Contitionals; - +extern HashList *SortHash; void InitialiseSemaphores(void); void begin_critical_section(int which_one); @@ -565,15 +521,15 @@ 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(char *mesg); +void display_login(); void display_openids(void); void do_welcome(void); void do_logout(void); @@ -581,49 +537,26 @@ 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); 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); +void FmOut(StrBuf *Target, char *align, StrBuf *Source); void pullquote_fmout(void); void wDumpContent(int); -/* 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); +int Flathash(const char *str, long len); -#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); @@ -641,24 +574,30 @@ 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 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(char *strbuf); +void escputs(const char *strbuf); void url(char *buf, size_t bufsize); -void escputs1(char *strbuf, int nbsp, int nolinebreaks); +void UrlizeText(StrBuf* Target, StrBuf *Source, StrBuf *WrkBuf); +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); -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); -void read_message(long msgnum, int printable_view, char *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, StrBuf *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); @@ -668,25 +607,27 @@ 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 load_floorlist(StrBuf *Buf); 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); +void session_loop(HashList *HTTPHeaders, + StrBuf *ReqLine, + StrBuf *ReqType, + StrBuf *ReadBuf, + const char **Pos); size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm); -void fmt_time(char *buf, time_t thetime); +void fmt_time(char *buf, size_t siz, time_t thetime); void httpdate(char *buf, time_t thetime); time_t httpdate_to_timestamp(StrBuf *buf); void end_webcit_session(void); @@ -702,61 +643,39 @@ char *memreadline(char *start, char *buf, int maxlen); char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen); long extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen); void remove_token(char *source, int parmnum, char separator); -char *load_mimepart(long msgnum, char *partnum); +StrBuf *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 striplt(char *); -void stripltlen(char *, int *); -void select_user_to_edit(char *message, char *preselect); +void do_edit_vcard(long msgnum, char *partnum, + message_summary *VCMsg, + wc_mime_attachment *VCAtt, + char *return_to, + const char *force_room); + +void select_user_to_edit(const char *preselect); void delete_user(char *); 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 convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext); -void output_html(char *, int, int); +void offer_start_page(StrBuf *Target, WCTemplputParams *TP); +void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const 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(char *part_source, long msgnum, char *cal_partnum); -void display_calendar(long msgnum, int unread); -void display_task(long msgnum, int unread); -void display_note(long msgnum, int unread); +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 do_calendar_view(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); @@ -772,11 +691,13 @@ void display_pictureview(void); void display_edit_task(void); void display_edit_event(void); icaltimezone *get_default_icaltimezone(void); -void display_icaltimetype_as_webform(struct icaltimetype *, char *); +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); -void save_individual_event(icalcomponent *supplied_vtodo, long msgnum, char *from, int unread); +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); @@ -789,32 +710,22 @@ 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 read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf); int StrBuf_ServGetBLOB(StrBuf *buf, long BlobSize); -int read_server_text(StrBuf *Buf, long *nLines);; +int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize); +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(message_summary **VCMsg, + wc_mime_attachment **VCAtt); void sleeeeeeeeeep(int); void http_transmit_thing(const char *content_type, int is_static); long unescape_input(char *buf); void do_selected_iconbar(void); -int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen); 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[]); @@ -822,19 +733,34 @@ 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); -void webcit_fmt_date(char *buf, time_t thetime, int brief); +const char *get_selected_language(void); + +#define DATEFMT_FULL 0 +#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); 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); -#ifdef HAVE_ICONV -iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode); -#endif - 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, @@ -852,21 +778,16 @@ 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); long end_burst(void); -extern char *hourname[]; /**< Names of hours (12am, 1am, etc.) */ +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 *); typedef void (*WebcitHandlerFunc)(void); typedef struct _WebcitHandler{ @@ -897,3 +818,4 @@ void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, WebcitHandlerFunc #define WC_TIMEFORMAT_24 2 +void LoadIconSettings(void);