Hdr->http_host is now gone.

[citadel.git] / webcit / webcit.h

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 279c540e2e76629c816ad56f358d0d61866e8928..33f87cd8066e4dec58126d7c91cf347fe160ba04 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * Copyright (c) 1987-2010 by the citadel.org team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -39,10 +38,11 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <sys/un.h>
 #include <netdb.h>
+#include <sys/un.h>
 #include <sys/poll.h>
 #include <string.h>
 #include <pwd.h>
@@ -53,10 +53,6 @@
 #include <sys/utsname.h>
 #include <libcitadel.h>
 
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif
@@ -297,20 +293,20 @@ struct urlcontent {
 typedef struct _serv_info {
        int serv_pid;                   /* Process ID of the Citadel server */
        StrBuf *serv_nodename;          /* Node name of the Citadel server */
-       StrBuf *serv_humannode;         /* human readable node name of the Citadel server */
-       StrBuf *serv_fqdn;              /* fully quallified Domain Name (such as uncensored.citadel.org) */
-       StrBuf *serv_software;          /* What version does our connected citadel server use */
-       int serv_rev_level;             /* Whats the citadel server revision */
+       StrBuf *serv_humannode;         /* Juman readable node name of the Citadel server */
+       StrBuf *serv_fqdn;              /* Fully qualified Domain Name (such as uncensored.citadel.org) */
+       StrBuf *serv_software;          /* Free form text description of the server software in use */
+       int serv_rev_level;             /* Server version number (times 100) */
        StrBuf *serv_bbs_city;          /* Geographic location of the Citadel server */
        StrBuf *serv_sysadm;            /* Name of system administrator */
-       StrBuf *serv_moreprompt;        /* Whats the commandline textprompt */
        int serv_supports_ldap;         /* is the server linked against an ldap tree for adresses? */
        int serv_newuser_disabled;      /* Has the server disabled self-service new user creation? */
        StrBuf *serv_default_cal_zone;  /* Default timezone for unspecified calendar items */
-       int serv_supports_sieve;        /* Does the server support Sieve mail filtering? */
-       int serv_fulltext_enabled;      /* Does the server have the full text index enabled? */
-       StrBuf *serv_svn_revision;      /* SVN revision of the server */
-       int serv_supports_openid;       /* Does the server support authentication via OpenID? */
+       int serv_supports_sieve;        /* Server supports Sieve mail filtering */
+       int serv_fulltext_enabled;      /* Full text index is enabled */
+       StrBuf *serv_svn_revision;      /* svn or git revision of the server */
+       int serv_supports_openid;       /* Server supports authentication via OpenID */
+       int serv_supports_guest;        /* Server supports unauthenticated guest logins */
 } ServInfo;
 
 
@@ -433,7 +429,6 @@ typedef struct _HdrRefs {
        StrBuf *ContentType;
        StrBuf *RawCookie;
        StrBuf *ReqLine;
-       StrBuf *http_host;                      /* HTTP Host: header */
        StrBuf *browser_host;
        StrBuf *browser_language;
        StrBuf *user_agent;
@@ -497,7 +492,6 @@ struct wcsession {
        StrBuf *HBuf;                           /* Our HeaderBuffer */
        StrBuf *WFBuf;                          /* Wildfire error logging buffer */
 
-       HashList *vars;                         /* HTTP variable substitutions for this page */
        StrBuf *trailing_javascript;            /* extra javascript to be appended to page */
        char ImportantMessage[SIZ];
        StrBuf *ImportantMsg;
@@ -556,10 +550,8 @@ struct wcsession {
        char last_chat_user[256];
 
 /* Iconbar controls */
-       struct __ofolder *cache_fold;           /* cache the iconbar room list */
        int cache_max_folders;
        int cache_num_floors;
-       time_t cache_timestamp;
        long *IBSettingsVec;                    /* which icons should be shown / not shown? */
        const StrBuf *floordiv_expanded;        /* which floordiv currently expanded */
 
@@ -619,6 +611,7 @@ extern char wizard_filename[];
 extern int follow_xff;
 extern int num_threads_existing;
 extern int num_threads_executing;
+extern StrBuf *site_prefix;
 
 void InitialiseSemaphores(void);
 void begin_critical_section(int which_one);
@@ -649,7 +642,7 @@ void CreateMimeStr(void);
 int GetConnected(void);
 void DeleteServInfo(ServInfo **FreeMe);
 int uds_connectsock(char *);
-int tcp_connectsock(char *, int);
+int tcp_connectsock(char *, char *);
 int serv_getln(char *strbuf, int bufsize);
 int StrBuf_ServGetln(StrBuf *buf);
 int GetServerStatus(StrBuf *Line, long* FullState);
@@ -774,7 +767,6 @@ void CtdlMakeTempFileName(char *, int);
 void address_book_popup(void);
 void begin_ajax_response(void);
 void end_ajax_response(void);
-void burn_folder_cache(time_t age);
 
 void display_edit_task(void);
 void display_edit_event(void);
@@ -807,7 +799,7 @@ long unescape_input(char *buf);
 void check_thread_pool_size(void);
 void spawn_another_worker_thread(void);
 void StrEndTab(StrBuf *Target, int tabnum, int num_tabs);
-void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs);
+void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names);
 void StrTabbedDialog(StrBuf *Target, int num_tabs, StrBuf *tabnames[]);
 void tabbed_dialog(int num_tabs, char *tabnames[]);
 void begin_tab(int tabnum, int num_tabs);
@@ -827,11 +819,6 @@ void summary(void);
 
 int is_mobile_ua(char *user_agent);
 
-void embed_room_banner(void);
-HashList *GetFloorListHash(StrBuf *Target, WCTemplputParams *TP);
-HashList *GetRoomListHash(StrBuf *Target, WCTemplputParams *TP);
-int SortRoomsByListOrder(const void *room1, const void *room2);
-
 /* actual supported locales */
 void TmplGettext(StrBuf *Target, WCTemplputParams *TP);
 void offer_languages(StrBuf *Target, int nArgs, WCTemplateToken *Token, void *Context, int ContextType);