* persistantly handle the bufferlengths for dates; snprintf doesn't terminate strings...

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 3812042992204ffb2485e4ffd16219e5086ca33a..90404821dd92b6403b38be60dd6e5b72c202d52b 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -113,9 +113,9 @@
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         743             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    743             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          743             /* 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 */
@@ -290,9 +290,15 @@ typedef struct _disp_cal {
 
        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;
 
 /*
  * Address book entry (keep it short and sweet, it's just a quickie lookup
@@ -340,7 +346,8 @@ struct wcsession {
 /* Session local Members */
        int http_sock;                          /**< HTTP server socket */
        int serv_sock;                          /**< Client socket to Citadel server */
-       StrBuf *ReadBuf;
+       StrBuf *ReadBuf;                        /**< here we keep our stuff while reading linebuffered from the server. */
+       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 */
@@ -616,7 +623,7 @@ 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);
-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);
@@ -636,8 +643,6 @@ 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 *, const char *);
-void striplt(char *);
-void stripltlen(char *, int *);
 void select_user_to_edit(char *message, char *preselect);
 void delete_user(char *);
 void do_change_view(int);
@@ -726,7 +731,7 @@ const char *get_selected_language(void);
 #define DATEFMT_BRIEF 1
 #define DATEFMT_RAWDATE 2
 #define DATEFMT_LOCALEDATE 3
-void webcit_fmt_date(char *buf, time_t thetime, int Format);
+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);