* straighten the calendar service define / switch /configure

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index ea572159a0be47fc7da7ed09946fc6c57ece0d07..b778d7cfe949f7437370f87bd1bd9ce08ca0a340 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,7 +1,6 @@
 /* $Id$ */
 
-#include "config.h"
-
+#include "sysdep.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -68,13 +67,6 @@ extern locale_t wc_locales[];
 #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 */
@@ -424,6 +416,10 @@ extern pthread_key_t MyConKey;
 #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;
@@ -453,6 +449,7 @@ void do_welcome(void);
 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);
@@ -589,7 +586,7 @@ long extract_token(char *dest, const char *source, int parmnum, char separator,
 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 *);
@@ -633,7 +630,7 @@ void do_tasks_view(void);
 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, int linebreaks);
+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);
 void free_attachments(struct wcsession *sess);
 void free_march_list(struct wcsession *wcf);
@@ -645,6 +642,8 @@ 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);