Moved default_zone_name declaration to webcit.h

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index ecd04d886f2d78958fd073e579d4336206318ac1..a39342d4c9ab658d4a807cebdc51660325267349 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -13,7 +13,6 @@
 icaltimezone *get_default_icaltimezone(void) {
 
         icaltimezone *zone = NULL;
-       const char *default_zone_name = ChrPtr(WC->serv_info->serv_default_cal_zone);           // mmmmmm ... calzone
 
         if (!zone) {
                 zone = icaltimezone_get_builtin_timezone(default_zone_name);

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 27254455ab3f173183ea38afc139fb36d4bf6d6f..8cc1a05a5e0f048f28208831ba6b16f30c148be1 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,14 +1,5 @@
-/*
- * Copyright (c) 1987-2021 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
+// Copyright (c) 1987-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.
 
 #include "sysdep.h"
 #include <sys/select.h>
@@ -90,13 +81,13 @@ typedef struct wcsession wcsession;
 #include "sockets.h"
 #include "utils.h"
 #ifdef HAVE_OPENSSL
-/* Work around RedHat's b0rken OpenSSL includes */
+// Work around RedHat's b0rken OpenSSL includes
 #define OPENSSL_NO_KRB5
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
 extern char *ssl_cipher_list;
-#define        DEFAULT_SSL_CIPHER_LIST "DEFAULT"       /* See http://openssl.org/docs/apps/ciphers.html */
+#define        DEFAULT_SSL_CIPHER_LIST "DEFAULT"       // See http://openssl.org/docs/apps/ciphers.html
 #endif
 
 #if SIZEOF_SIZE_T == SIZEOF_INT 
@@ -182,24 +173,16 @@ extern char *ssl_cipher_list;
 #define ALREADY_EXISTS                         74      
 #define MESSAGE_NOT_FOUND              75
 
-/*
- * NLI is the string that shows up in a who's online listing for sessions
- * that are active but do not (yet) have a user logged in.
- */
+// NLI is the string that shows up in a who's online listing for sessions that are active but do not (yet) have a user logged in.
 #define NLI    "(not logged in)"
 
-/*
- * Expiry policy for the autopurger
- */
-
+// Expiry policy for the autopurger
 typedef struct __ExpirePolicy {
         int expire_mode;
         int expire_value;
 } ExpirePolicy;
 
-/*
- * Linked list of session variables encoded in an x-www-urlencoded content type
- */
+// Linked list of session variables encoded in an x-www-urlencoded content type
 typedef struct urlcontent urlcontent;
 struct urlcontent {
        char url_key[32];               /* key */
@@ -208,9 +191,7 @@ struct urlcontent {
        HashList *sub;
 };
 
-/*
- * Information about the Citadel server to which we are connected
- */ 
+// Information about the Citadel server to which we are connected
 typedef struct _serv_info {
        int serv_pid;                   /* Process ID of the Citadel server */
        StrBuf *serv_nodename;          /* Node name of the Citadel server */
@@ -383,10 +364,8 @@ typedef struct _ParsedHttpHdrs {
        HdrRefs HR;
 } ParsedHttpHdrs;
 
-/*
- * One of these is kept for each active Citadel session.
- * HTTP transactions are bound to one at a time.
- */
+// One of these is kept for each active Citadel session.
+// HTTP transactions are bound to one at a time.
 struct wcsession {
 /* infrastructural members */
        wcsession *next;                        /* Linked list */
@@ -462,15 +441,11 @@ struct wcsession {
        HashList *FloorsByName;                 /* same but hashed by its name */
        HashList *Rooms;                        /* our directory structure as loaded by LKRA */
        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. */
-
-
        char last_chat_user[256];
-
        StrBuf *IconTheme;                      /* Icontheme setting */
 
 /* Iconbar controls */
@@ -488,7 +463,7 @@ struct wcsession {
        StrBuf *ConvertBuf1;
        StrBuf *ConvertBuf2;
 
-/* cache stuff for templates. TODO: find a smarter way */
+/* cache stuff for templates. */
        HashList *ServCfg;                      /* cache our server config for editing */
        HashList *InetCfg;                      /* Our inet server config for editing */
        ExpirePolicy Policy[maxpolicy];
@@ -506,7 +481,6 @@ typedef struct _HttpHeader {
 
 void RegisterHeaderHandler(const char *Name, long Len, Header_Evaluator F);
 
-
 enum {
        S_SHUTDOWN,
        S_SPAWNER,
@@ -621,7 +595,6 @@ void TmplGettext(StrBuf *Target, WCTemplputParams *TP); /* actual supported loca
 void set_selected_language(const char *);
 void go_selected_language(void);
 const char *get_selected_language(void);
-// void utf8ify_rfc822_string(char **buf); this is in libcitadel now
 void begin_burst(void);
 long end_burst(void);
 void AppendImportantMessage(const char *pch, long len);
@@ -632,15 +605,13 @@ void display_enter(void);
 #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.
- */
+// 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
+#define WC_TIMEFORMAT_NONE     0
+#define WC_TIMEFORMAT_AMPM     1
+#define WC_TIMEFORMAT_24       2
 
 extern int time_to_die;                        /* Nonzero if server is shutting down */
 extern int DisableGzip;
@@ -649,4 +620,7 @@ void display_summary_page(void);
 HashList *GetValidDomainNames(StrBuf *Target, WCTemplputParams *TP);
 void output_error_pic(const char *ErrMsg1, const char *ErrMsg2);
 void jsonMessageListHdr(void);
-extern char *ctdl_dir;                         /* Directory where Citadel Server is running */
+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)