In webcit-classic, include webserver.h from webcit.h.

This makes it easier to port ical_dezonify.c between webcit generations.

diff --git a/webcit-ng/server/caldav_reports.c b/webcit-ng/server/caldav_reports.c
index d2d323f43d95d25acd4ee17e5f1160342fe2f1bf..9dece4c795cbb5a5af9ce4d721c44fe0f0ae1740 100644 (file)
--- a/webcit-ng/server/caldav_reports.c
+++ b/webcit-ng/server/caldav_reports.c
@@ -261,7 +261,6 @@ void caldav_report_one_item(struct http_transaction *h, struct ctdlsession *c, S
 // Returns nonzero if the supplied icalcomponent occurs within the specified time range
 int caldav_time_range_filter_matches(icalcomponent *cal, char *start_str, char *end_str) {
 
-
        struct icaltimetype start = (start_str ? icaltime_from_string(start_str) : icaltime_null_time());
        struct icaltimetype end = (end_str ? icaltime_from_string(end_str) : icaltime_null_time());
 

diff --git a/webcit-ng/server/ical_dezonify.c b/webcit-ng/server/ical_dezonify.c
new file mode 120000 (symlink)
index 0000000..c3ad895
--- /dev/null
+++ b/webcit-ng/server/ical_dezonify.c
@@ -0,0 +1 @@
+../../webcit/ical_dezonify.c
\ No newline at end of file

diff --git a/webcit/auth.c b/webcit/auth.c
index 57f8adb6b8f688f9e6df720abae6e2e40128603b..0628d223d613255641eab3587c5cbbed6f5492a6 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include <ctype.h>
 
 

diff --git a/webcit/availability.c b/webcit/availability.c
index dcb6f143682b7f82723db2081e6f886049a025a8..44e9ecf12a28756b81de9e8a88e6e70c45a6c4ff 100644 (file)
--- a/webcit/availability.c
+++ b/webcit/availability.c
@@ -12,7 +12,7 @@
 
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 /*

diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index 67f42b12fb025aa4f9d7079bbcefcb2d5247c5bf..d06045d0bdeddafe264f7a0333860df8d3827490 100644 (file)
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -20,7 +20,7 @@
 #define RANGE 5
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 /*

diff --git a/webcit/blogview_renderer.c b/webcit/blogview_renderer.c
index 5cec69676e69439aa4428ab1b35ee50b30e9cfc4..2e80f7a89de3ac9ecd170c3e241e79a45c97d853 100644 (file)
--- a/webcit/blogview_renderer.c
+++ b/webcit/blogview_renderer.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 CtxType CTX_BLOGPOST = CTX_NONE;

diff --git a/webcit/calendar.c b/webcit/calendar.c
index ce49b34558729079dd231829963decab134a7db7..f0e662226258aaf8757b1ae3a353041cb40ef883 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 // Process a calendar object.  At this point it's already been deserialized by cal_process_attachment()

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 3d875c307bdbc738c73b86a7072cf5b0ab5a55f1..488296ca7ed7b12a315708ed98b2edf392145185 100644 (file)
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "time.h"
 #include "calendar.h"
 

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 6231da9aacf518f56fb79d2a5e07bfdcfe9f9a11..c6b4a9ff3d04cca7e3259b5c00ca5bd507451f7b 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -6,7 +6,7 @@
 // is subject to the terms of the GNU General Public License, version 3.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 // These define how high the hour rows are in the day view

diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index f1035e71f2b33a47bd50f8f28d19894b5a41efd4..bb0c1cb97a2fd944a2fbe599a44df771288aacbc 100644 (file)
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -16,7 +16,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "modules_init.h"
 
 /* Only one thread may manipulate SessionList at a time... */

diff --git a/webcit/crypto.c b/webcit/crypto.c
index 0a91289571e62850dca1d520d02233af6416a3d5..845113791c0175a9029941ed8793c214844587bf 100644 (file)
--- a/webcit/crypto.c
+++ b/webcit/crypto.c
@@ -12,7 +12,7 @@
 #ifdef HAVE_OPENSSL
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 
 SSL_CTX *ssl_ctx;              // Global SSL context

diff --git a/webcit/dav_delete.c b/webcit/dav_delete.c
index 6abd8ce8e787b5f26c887624832b62e9dc88fb84..85ae54e0881dc7effb88bf81c8b48e592a17486c 100644 (file)
--- a/webcit/dav_delete.c
+++ b/webcit/dav_delete.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 

diff --git a/webcit/dav_get.c b/webcit/dav_get.c
index 9c57f52ad0cde7c1430dd2a4127cc91ea3b6852c..bbf013ffbb061166df6cc1bc4371541fdebe8e4d 100644 (file)
--- a/webcit/dav_get.c
+++ b/webcit/dav_get.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 

diff --git a/webcit/dav_main.c b/webcit/dav_main.c
index 31cbfafffe1399af58ecc6876a1404b7515c2374..acabf94f6219d639e20ae53792a2ac9ed035c421 100644 (file)
--- a/webcit/dav_main.c
+++ b/webcit/dav_main.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 CtxType CTX_DAVNS = CTX_NONE;

diff --git a/webcit/dav_options.c b/webcit/dav_options.c
index f7687cf4ef347269c42029f79c50eb181e69c90f..cbb8f4421dc10d6baf0958078504981f1906bb50 100644 (file)
--- a/webcit/dav_options.c
+++ b/webcit/dav_options.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 /*

diff --git a/webcit/dav_propfind.c b/webcit/dav_propfind.c
index 76df63d21f35607f5abe38bd97d56d9fb7e385fc..b09b52c175aa782a574a6125586984e67010ca02 100644 (file)
--- a/webcit/dav_propfind.c
+++ b/webcit/dav_propfind.c
@@ -27,7 +27,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 /*

diff --git a/webcit/dav_put.c b/webcit/dav_put.c
index 8b6935ef1a2cbc94bd39d02b7668f7dd74dc42b8..65e4a42250cb0f2ac2c63cb0eab91e7acf06103f 100644 (file)
--- a/webcit/dav_put.c
+++ b/webcit/dav_put.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 

diff --git a/webcit/dav_report.c b/webcit/dav_report.c
index 9331ffd49d13dd29f93d3608e3f3e559b0f0ddbb..8780e3f305b1c50b0d762134050425b49c9c2830 100644 (file)
--- a/webcit/dav_report.c
+++ b/webcit/dav_report.c
@@ -51,7 +51,7 @@ Content-length: 255
 */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 

diff --git a/webcit/downloads.c b/webcit/downloads.c
index 0decb250ad14e0186231f91bcfc70bda28f2c85a..9b7dde993c47f254174d3040a2540292ece34b3a 100644 (file)
--- a/webcit/downloads.c
+++ b/webcit/downloads.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_FILELIST = CTX_NONE;
 

diff --git a/webcit/event.c b/webcit/event.c
index a2e473b8fa0601c5d3b2649a1e1cabd97c8d8911..ffe0688aba78ab67e9cbbb6e107dd4a8e1d8a67c 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 /*

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index 00bc5074f6f31ada34ffe77cdf44066bb25a58ad..119001bd837315d334980f2be73e229779ad4ecb 100644 (file)
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * RSS feed generator -- do one message

diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index a14c3d5c3026ca60c1a0263689273572bd4a52d7..5050c1cceed4b7a917eb024b78a525770f367cf7 100644 (file)
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 #ifdef HAVE_USELOCALE
 extern locale_t *wc_locales;

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 1bc40c8f40a5dbe18f08331d85dd8a8ccf46578f..8c749cb279df79a45b6968cb153d5c4c5d0e18ba 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #define SEARCH_LANG 20         /* how many langs should we parse? */
 
 #ifdef ENABLE_NLS

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 3122c75ac45f23c97ada09c15770a635d81ce2d4..a631eb81b44d168894b377d9ad4da91ba4ff62e7 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -14,7 +14,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 
 /*

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index a39342d4c9ab658d4a807cebdc51660325267349..b0342beeeaf97c1017c94efa53aa103eda3ae675 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -6,8 +6,10 @@
 // Copyright (c) 2002-2024 by the citadel.org team (Art Cancro et al)
 // This program is open source software.  Use, duplication, or disclosure is subject to the GNU General Public License v3.
 
+// NOTE: this file is symlinked between different generations of WebCit.  When we retire WebCit-classic, copy the file over.
+
 #include "webcit.h"
-#include "webserver.h"
+
 
 // Figure out which time zone needs to be used for timestamps that are not UTC and do not have a time zone specified.
 icaltimezone *get_default_icaltimezone(void) {

diff --git a/webcit/icontheme.c b/webcit/icontheme.c
index 28643aedb1dca8ac50d1cb00c4ea526ba808cfa2..723839369f947b0567d0561d12396086d29d4d8a 100644 (file)
--- a/webcit/icontheme.c
+++ b/webcit/icontheme.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 HashList *AvailableThemes = NULL;
 

diff --git a/webcit/inetconf.c b/webcit/inetconf.c
index 265f3f6bd1f61fc177eef28bd72c247fb0df1ca5..3b7d82de50a5bf6517c9ac200ab88f1158cc9fe9 100644 (file)
--- a/webcit/inetconf.c
+++ b/webcit/inetconf.c
@@ -3,7 +3,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 
 typedef enum _e_cfg {

diff --git a/webcit/jsonview_renderer.c b/webcit/jsonview_renderer.c
index 5a097b0a433406a2d70b00a4cd9814276a8e9f7e..b5442584e46489a64d9bb31a1d4b4dfc713f55b7 100644 (file)
--- a/webcit/jsonview_renderer.c
+++ b/webcit/jsonview_renderer.c
@@ -1,5 +1,5 @@
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 int json_GetParamsGetServerCall(SharedMessageStatus *Stat, 

diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index d015f53f54ab1e6df2e7186a0f346ef2e5e297a5..d3ba6170798870a9d898d787ffbb12d3c1c4b6b0 100644 (file)
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * IPv4/IPv6 locate_host()

diff --git a/webcit/mailview_renderer.c b/webcit/mailview_renderer.c
index 309095130ac6e8d842b496aee4a974dc6eb06753..9d38e6689258cf283b450c8c637824d94b455002 100644 (file)
--- a/webcit/mailview_renderer.c
+++ b/webcit/mailview_renderer.c
@@ -1,5 +1,5 @@
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 static inline void CheckConvertBufs(struct wcsession *WCC)

diff --git a/webcit/marchlist.c b/webcit/marchlist.c
index 7031d264309cf01101e3d923d89b12e74b537b35..8888c5d3c6057567843c824af10962d92d0538cb 100644 (file)
--- a/webcit/marchlist.c
+++ b/webcit/marchlist.c
@@ -1,5 +1,5 @@
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * Free a session's march list

diff --git a/webcit/messages.c b/webcit/messages.c
index f8da6aa73d06fe5a777069dee792438611ff450b..ec6306ecc57c960fce531c7b212c216651aba8da 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 #include "calendar.h"
 

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 2dfb30324f1147cf3dc217f562c9ba745ffd60f2..c32661081a6eb47af8dc148fef73855928a61d48 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -1,5 +1,5 @@
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 CtxType CTX_MAILSUM = CTX_NONE;

diff --git a/webcit/notes.c b/webcit/notes.c
index 584e8d99704b37f39da63087d3a3d1866c7c529c..60c4d83a12654eaa83b293d3a3e576e2f6cf1634 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -1,7 +1,7 @@
 
 #include "webcit.h"
 #include "dav.h"
-#include "webserver.h"
+
 
 CtxType CTX_VNOTE = CTX_NONE;
 

diff --git a/webcit/openid.c b/webcit/openid.c
index ca71d6793c51ab72ebae517599022a92d599e618..b56c01c2418b82e8ba2812dde0467062598a54b7 100644 (file)
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * Display the OpenIDs associated with an account

diff --git a/webcit/paramhandling.c b/webcit/paramhandling.c
index 1e07fcfb3aa018440580b65670c9061555d5b77c..1c301a5ee271f41f320091fb2f60c2885818c303 100644 (file)
--- a/webcit/paramhandling.c
+++ b/webcit/paramhandling.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /* uncomment to see all parameters sent to the server by the browser. */
 /* #define DEBUG_URLSTRINGS */

diff --git a/webcit/preferences.c b/webcit/preferences.c
index ae381cc1e5b45afe68b9246c695f154a51b872a9..e438b03185571fde8ed216b88c7faec40581b446 100644 (file)
--- a/webcit/preferences.c
+++ b/webcit/preferences.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 HashList *PreferenceHooks;

diff --git a/webcit/roomchat.c b/webcit/roomchat.c
index 3b0091e441a3d55799b1ce56e836c03705990eb7..ea43afde006139e07623a81fef0ad9e2d9c88be6 100644 (file)
--- a/webcit/roomchat.c
+++ b/webcit/roomchat.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * Display the screen containing multiuser chat for a room.

diff --git a/webcit/roomlist.c b/webcit/roomlist.c
index b9f967ce6cd6fd988e9897130c2d931c9b1fdd81..ccd54e07484411e852f0edccb3abf4c7fd05970c 100644 (file)
--- a/webcit/roomlist.c
+++ b/webcit/roomlist.c
@@ -3,7 +3,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 typedef enum __eRoomParamType {
        eNotSet,

diff --git a/webcit/roomops.c b/webcit/roomops.c
index 4e48be902352e69601e8f2dbe89a3338e7f060a2..2adf938d7f693a41865b894f928ffe9a22cb993a 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -11,7 +11,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 ConstStr QRFlagList[] = {
        {HKEY(strof(QR_PERMANENT))},

diff --git a/webcit/roomtokens.c b/webcit/roomtokens.c
index 199cc3c1edd14466d650a9aad99d4541550a805d..6999939ae400f4fd49550f5cfda97bc4e0e1b507 100644 (file)
--- a/webcit/roomtokens.c
+++ b/webcit/roomtokens.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_ROOMS = CTX_NONE;
 CtxType CTX_FLOORS = CTX_NONE;

diff --git a/webcit/roomviews.c b/webcit/roomviews.c
index 18563000db4ebc8062d6d7c76d42627c2d4319d2..d16b70530bb0ec48124e36248cf4491110beede6 100644 (file)
--- a/webcit/roomviews.c
+++ b/webcit/roomviews.c
@@ -3,7 +3,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 char *viewdefs[VIEW_MAX];
 

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 10bea4657f2832acd3bee8b2f83ac4452e37792a..e987c8216714e413f13bddf62429e8eac50713d4 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -6,7 +6,7 @@
 // modify it under the terms of the GNU General Public License, version 3.
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 HashList *EmbeddableMimes = NULL;
 StrBuf *EmbeddableMimeStrs = NULL;

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 76e0ef0a359a8993f855d46496eca80c0e240a07..39e90e614e43a312690b9aeb4bf139f526d6b38f 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -8,7 +8,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 /*
  * Expiry policy for the autopurger

diff --git a/webcit/sitemap.c b/webcit/sitemap.c
index 50618e63608ef2609b10d20b45b911c21707f9b1..a0fec9ad7537c791b15c6bd9d7f5fc87f4782a52 100644 (file)
--- a/webcit/sitemap.c
+++ b/webcit/sitemap.c
@@ -13,7 +13,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 
 /*

diff --git a/webcit/sockets.c b/webcit/sockets.c
index 57ca654668c15c587e7dcd96f8964ab70c9ce791..609af3ce6dea5ec0efafde64e3fef874fedd5fa9 100644 (file)
--- a/webcit/sockets.c
+++ b/webcit/sockets.c
@@ -16,7 +16,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 long MaxRead = -1; /* should we do READ scattered or all at once? */
 

diff --git a/webcit/static.c b/webcit/static.c
index e729d74796b723122cd49cd7099e53facb411b35..7a12b4d0e4d70429d2dd3a4452a2c2e8831a56d1 100644 (file)
--- a/webcit/static.c
+++ b/webcit/static.c
@@ -14,7 +14,7 @@
 #include <stdarg.h>
 #include <stddef.h>
 #include "webcit.h"
-#include "webserver.h"
+
 
 unsigned char OnePixelGif[37] = {
                0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x01, 0x00,

diff --git a/webcit/subst.c b/webcit/subst.c
index baaa5460c831c33584ca45802d738fe0c2647b08..f6725cd58aa654b84465fe41a9bc8ac3fc9168bc 100644 (file)
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -15,7 +15,7 @@
 #define SHOW_ME_VAPPEND_PRINTF
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 extern char *static_dirs[PATH_MAX];  /* Disk representation */
 

diff --git a/webcit/sysdep.c b/webcit/sysdep.c
index 7c699699afb83939feddd2410f390111ff82ece5..e5f928d521caf8b85b4bc56ead6a50beb6eec9dd 100644 (file)
--- a/webcit/sysdep.c
+++ b/webcit/sysdep.c
@@ -48,7 +48,7 @@
 #include <sys/select.h>
 #endif
 
-#include "webserver.h"
+
 #include "modules_init.h"
 #if HAVE_BACKTRACE
 #include <execinfo.h>

diff --git a/webcit/tasks.c b/webcit/tasks.c
index b3543826f112313c83c196badcc6c449981d1e04..89910eba44162e3fb160f5d8bf89675150bbb408 100644 (file)
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -1,6 +1,6 @@
 #include "webcit.h"
 #include "calendar.h"
-#include "webserver.h"
+
 
 /*
  * qsort filter to move completed tasks to bottom of task list

diff --git a/webcit/useredit.c b/webcit/useredit.c
index 05cab0d453ac7e394e56cd17e3bf716e39c66cc8..ce94a343dc508b8e41353677c7a7068599b44d85 100644 (file)
--- a/webcit/useredit.c
+++ b/webcit/useredit.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 
 CtxType CTX_USERLIST = CTX_NONE;
 /*

diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 8bd4a7841d880b78b845baaf00ab5d4c020141aa..e08a227feb7aafbe201c583cfae377edc31c4535 100644 (file)
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -11,7 +11,7 @@
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "calendar.h"
 
 CtxType CTX_VCARD = CTX_NONE;

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 7cc9768b9fc20de15dab0b656e59322a876dc3b8..b24007f0938159d5771c0cd347bbab81c71e9bb1 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -13,7 +13,7 @@
 #include <stdarg.h>
 #include "webcit.h"
 #include "dav.h"
-#include "webserver.h"
+
 
 StrBuf *csslocal = NULL;
 HashList *HandlerHash = NULL;

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 8cc1a05a5e0f048f28208831ba6b16f30c148be1..8528505619b54adc8f930b25bb9bcc2faa59afbd 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -624,3 +624,5 @@ extern char *ctdl_dir;                      /* Directory where Citadel Server is running */
 
 // ical_dezonify() references this, but it's also used in WebCit Classic so we abstract it
 #define default_zone_name      ChrPtr(WC->serv_info->serv_default_cal_zone)
+
+#include "webserver.h"

diff --git a/webcit/webserver.c b/webcit/webserver.c
index a12143eef51ba3f9f9fbd2f9c2b9a5d8e4bf5c3d..b10d5e9c34c0bd1f55858010333c32c82e543574 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -4,7 +4,7 @@
 // is subject to the terms of the GNU General Public License version 3.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "modules_init.h"
 
 extern int msock;                              /* master listening socket */