/* $Id$ */
-#include "config.h"
+#include "sysdep.h"
+#include <sys/select.h>
+
#include <ctype.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#define _(string) (string)
#endif
+#define IsEmptyStr(a) ((a)[0] == '\0')
/*
* Uncomment to dump an HTTP trace to stderr
#define HTTP_TRACING 1
#include <zlib.h>
#endif
-#ifdef HAVE_ICAL_H
-#ifdef HAVE_LIBICAL
-#define WEBCIT_WITH_CALENDAR_SERVICE 1
-#endif
-#endif
-
-
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
/* Work around PACKAGE/VERSION defs that are (not supposed to be?) in ical.h */
#ifdef PACKAGE
# define CTDL_PACKAGE PACKAGE
# undef PACKAGE
#endif
+
+#ifdef PACKAGE_STRING
+# define CTDL_PACKAGE_STRING PACKAGE_STRING
+//# undef PACKAGE_STRING
+#endif
+
#ifdef VERSION
# define CTDL_VERSION VERSION
# undef VERSION
#endif
+
#include <ical.h>
-#ifdef CTDL_PACKAGE
-# ifdef PACKAGE
-# undef PACKAGE
-# endif
-# define PACKAGE CTDL_PACKAGE
-# undef CTDL_PACKAGE
-#endif
-#ifdef CTDL_VERSION
-# ifdef VERSION
-# undef VERSION
-# endif
-# define VERSION CTDL_VERSION
-# undef CTDL_VERSION
-#endif
-#endif
+
+#undef PACKAGE
+#undef VERSION
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+#include "sysdep.h"
#define SLEEPING 180 /* TCP connection timeout */
#define WEBCIT_TIMEOUT 900 /* WebCit session timeout */
#define PORT_NUM 2000 /* port number to listen on */
-#define SERVER "WebCit v6.84" /* who's in da house */
#define DEVELOPER_ID 0
#define CLIENT_ID 4
-#define CLIENT_VERSION 684 /* This version of WebCit */
-#define MINIMUM_CIT_VERSION 684 /* min required Citadel ver. */
+#define CLIENT_VERSION 723 /* This version of WebCit */
+#define MINIMUM_CIT_VERSION 723 /* min required Citadel ver. */
#define DEFAULT_HOST "localhost" /* Default Citadel server */
#define DEFAULT_PORT "504"
#define LB (1) /* Internal escape chars */
*/
#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 */
/**
* user/room access
US_NOPROMPT | US_DISAPPEAR | US_PAGINATOR | \
US_FLOORS | US_COLOR | US_PROMPTCTL )
+/*
+ * NLI is the string that shows up in a who's online listing for sessions
+ * that are active, but for which no user has yet authenticated.
+ */
+#define NLI "(not logged in)"
/** \brief Linked list of lines appearing in an HTTP client request */
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 serv_sock; /**< Client socket to Citadel server */
int chat_sock; /**< Client socket to Citadel server - for chat */
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 */
char floordiv_expanded[32]; /**< 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? */
};
/** values for WC->current_iconbar */
current_iconbar_menu, /**< view the icon menue */
current_iconbar_roomlist /**< view the roomtree */
};
-
+enum {
+ S_SELECT,
+ S_SHUTDOWN,
+ MAX_SEMAPHORES
+};
#define num_parms(source) num_tokens(source, '|')
#ifdef HAVE_OPENSSL
#define THREADSSL ((SSL *)pthread_getspecific(ThreadSSL))
extern pthread_key_t ThreadSSL;
+extern char ctdl_key_dir[PATH_MAX];
+extern char file_crpt_file_key[PATH_MAX];
+extern char file_crpt_file_csr[PATH_MAX];
+extern char file_crpt_file_cer[PATH_MAX];
#endif
struct serv_info serv_info;
extern int follow_xff;
void do_setup_wizard(void);
+
+void InitialiseSemaphores(void);
+void begin_critical_section(int which_one);
+void end_critical_section(int which_one);
+
+
void stuff_to_cookie(char *cookie, int session,
char *user, char *pass, char *room);
void cookie_to_stuff(char *cookie, int *session,
void do_logout(void);
void display_main_menu(void);
void display_aide_menu(void);
+void display_shutdown(void);
void display_advanced_menu(void);
void slrp_highest(void);
void gotonext(void);
void serv_puts(char *string);
void who(void);
void who_inner_div(void);
+void wholist_section(void);
+void tasks_section(void);
+void calendar_section(void);
+void ajax_mini_calendar(void);
+void new_messages_section(void);
void fmout(char *align);
void pullquote_fmout(void);
void wDumpContent(int);
int cache);
void wprintf(const char *format,...);
void output_static(char *what);
-void stresc(char *target, char *strbuf, int nbsp, int nolinebreaks);
+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 url(char *buf);
void escputs1(char *strbuf, int nbsp, int nolinebreaks);
void msgesc(char *target, char *strbuf);
void msgescputs(char *strbuf);
+void msgescputs1(char *strbuf);
int extract_int(const char *source, int parmnum);
long extract_long(const char *source, int parmnum);
void stripout(char *str, char leftboundary, char rightboundary);
void dump_vars(void);
void embed_main_menu(void);
void serv_read(char *buf, int bytes);
-int haschar(char *, char);
+int haschar(const char *, char);
void readloop(char *oper);
void read_message(long msgnum, int printable_view, char *section);
void embed_message(char *msgnum_as_string);
void display_confirm_delete_node(void);
void delete_node(void);
void display_add_node(void);
-void add_node(void);
void terminate_session(void);
+void shutdown_sessions(void);
+void do_housekeeping(void);
void edit_me(void);
void display_siteconfig(void);
void siteconfig(void);
void do_template(void *templatename);
int lingering_close(int fd);
char *memreadline(char *start, char *buf, int maxlen);
+char *memreadlinelen(char *start, char *buf, int maxlen, int *retlen);
int num_tokens (char *source, char tok);
-void extract_token(char *dest, const char *source, int parmnum, char separator, int maxlen);
+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);
int pattern2(char *search, char *patn);
-void do_edit_vcard(long, char *, char *);
+void do_edit_vcard(long, char *, char *, char *);
void edit_vcard(void);
void submit_vcard(void);
void striplt(char *);
+void stripltlen(char *, int *);
void select_user_to_edit(char *message, char *preselect);
void delete_user(char *);
void display_edituser(char *who, int is_new);
void free_calendar_buffer(void);
void calendar_summary_view(void);
int load_msg_ptrs(char *servcmd, int with_headers);
-void CtdlEncodeBase64(char *dest, const char *source, size_t sourcelen);
+size_t CtdlEncodeBase64(char **dest, const char *source, size_t sourcelen, size_t *destlen, int linebreaks);
int CtdlDecodeBase64(char *dest, const char *source, size_t length);
+int CtdlDecodeQuotedPrintable(char *decoded, char *encoded, int sourcelen);
void free_attachments(struct wcsession *sess);
void free_march_list(struct wcsession *wcf);
void set_room_policy(void);
void save_inetconf(void);
void display_smtpqueue(void);
void display_smtpqueue_inner_div(void);
+void display_sieve(void);
+void display_rules_editor_inner_div(void);
+void save_sieve(void);
+void display_pushemail(void);
+void save_pushemail(void);
+void display_add_remove_scripts(char *);
+void create_script(void);
+void delete_script(void);
void generate_uuid(char *);
void CtdlMakeTempFileName(char *, int);
void display_preferences(void);
void set_preferences(void);
void recp_autocomplete(char *);
+void address_book_popup(void);
+void display_address_book_middle_div(void);
+void display_address_book_inner_div(void);
void begin_ajax_response(void);
void end_ajax_response(void);
void initialize_viewdefs(void);
void initialize_axdefs(void);
void list_all_rooms_by_floor(char *viewpref);
+void display_room_directory(void);
+void download_file(char *);
+void upload_file(void);
#ifdef WEBCIT_WITH_CALENDAR_SERVICE
void display_edit_task(void);
icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp);
void check_attendee_availability(icalcomponent *supplied_vevent);
void do_freebusy(char *req);
+int ical_ctdl_is_overlap(
+ struct icaltimetype t1start,
+ struct icaltimetype t1end,
+ struct icaltimetype t2start,
+ struct icaltimetype t2end
+);
#endif
#ifdef ENABLE_NLS
void str_wiki_index(char *s);
void display_wiki_page(void);
char *bmstrcasestr(char *text, char *pattern);
+int get_time_format_cached (void);
+int xtoi(char *in, size_t len);
#ifdef HAVE_ICONV
iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode);
#define VIEW_NOTES 5 /**< Notes view */
#define VIEW_WIKI 6 /**< Wiki view */
#define VIEW_CALBRIEF 7 /**< Brief Calendar view */
-
+#define VIEW_JOURNAL 8 /**< Journal view (not yet implemented in webcit) */
/* These should be empty, but we have them for testing */
#define DEFAULT_HTTPAUTH_USER ""
#define DEFAULT_HTTPAUTH_PASS ""
+
+/* Exit codes 101 through 109 are initialization failures so we don't want to
+ * just keep respawning indefinitely.
+ */
+#define WC_EXIT_BIND 101 /* Can't bind to the port */
+#define WC_EXIT_SSL 102 /* Can't initialize SSL */
+
+
+#define WC_TIMEFORMAT_NONE 0
+#define WC_TIMEFORMAT_AMPM 1
+#define WC_TIMEFORMAT_24 2
+
+