Finished the WebCit screen for the Global Alias Table.

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index dd1cc4deef70c1247a727dc9710237506682a481..dab21f8f88752e44bb6562a6551f84a003624178 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,3 +1,9 @@
+// Functions which handle communication with the Citadel server.
+//
+// Copyright (c) 1996-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.
 
 #include "webcit.h"
 #include "webserver.h"
@@ -9,8 +15,7 @@ HashList *EmbeddableMimes = NULL;
 StrBuf *EmbeddableMimeStrs = NULL;
 
 
-void SetInlinMimeRenderers(void)
-{
+void SetInlinMimeRenderers(void) {
        StrBuf *Buf;
 
        Buf = NewStrBuf();
@@ -23,8 +28,7 @@ void SetInlinMimeRenderers(void)
 }
 
 
-void DeleteServInfo(ServInfo **FreeMe)
-{
+void DeleteServInfo(ServInfo **FreeMe) {
        if (*FreeMe == NULL)
                return;
        FreeStrBuf(&(*FreeMe)->serv_nodename);
@@ -45,8 +49,7 @@ void DeleteServInfo(ServInfo **FreeMe)
  * browser_host                the citadel we want to connect to
  * user_agent          which browser uses our client?
  */
-ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
-{
+ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) {
        ServInfo *info;
        StrBuf *Buf;
        int a;
@@ -159,8 +162,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
        return info;
 }
 
-int GetConnected (void)
-{
+int GetConnected (void) {
        StrBuf *Buf;
        wcsession *WCC = WC;
 
@@ -187,7 +189,7 @@ int GetConnected (void)
 
                /* Server isn't ready for us? */
                if (short_status != 2) {
-                       if (Status == 571) {
+                       if (Status == 551) {
                                hprintf("HTTP/1.1 503 Service Unavailable\r\n");
                                hprintf("Content-type: text/plain; charset=utf-8\r\n");
                                wc_printf(_("This server is already serving its maximum number of users and cannot accept any additional logins at this time.  Please try again later or contact your system administrator."));
@@ -238,10 +240,10 @@ int GetConnected (void)
                                  "In order to run this version of WebCit "
                                  "you must also have Citadel %d.%02d or"
                                  " newer.\n\n\n"),
-                               WCC->serv_info->serv_rev_level / 100,
-                               WCC->serv_info->serv_rev_level % 100,
-                               MINIMUM_CIT_VERSION / 100,
-                               MINIMUM_CIT_VERSION % 100
+                               WCC->serv_info->serv_rev_level,
+                               0,
+                               MINIMUM_CIT_VERSION,
+                               0
                                );
                        hprintf("HTTP/1.1 200 OK\r\n");
                        hprintf("Content-type: text/plain; charset=utf-8\r\n");
@@ -255,8 +257,7 @@ int GetConnected (void)
 }
 
 
-void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
-{
+void FmOut(StrBuf *Target, const char *align, const StrBuf *Source) {
        const char *ptr, *pte;
        const char *BufPtr = NULL;
        StrBuf *Line = NewStrBufPlain(NULL, SIZ);
@@ -335,8 +336,7 @@ void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
 /*
  *  Transmit message text (in memory) to the server.
  */
-void text_to_server(char *ptr)
-{
+void text_to_server(char *ptr) {
        char buf[256];
        int ch, a, pos, len;
 
@@ -345,7 +345,10 @@ void text_to_server(char *ptr)
 
        while (ptr[pos] != 0) {
                ch = ptr[pos++];
-               if (ch == 10) {
+               if (ch == 13) {
+                       // ignore CR characters
+               }
+               else if (ch == 10) {
                        len = strlen(buf);
                        while ( (isspace(buf[len - 1]))
                                && (buf[0] !=  '\0') 
@@ -376,8 +379,7 @@ void text_to_server(char *ptr)
 /*
  * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go.
  */
-void text_to_server_qp(const StrBuf *SendMeEncoded)
-{
+void text_to_server_qp(const StrBuf *SendMeEncoded) {
        StrBuf *ServBuf;
 
        ServBuf = StrBufRFC2047encodeMessage(SendMeEncoded);
@@ -391,8 +393,7 @@ void text_to_server_qp(const StrBuf *SendMeEncoded)
 /*
  * translate server message output to text (used for editing room info files and such)
  */
-void server_to_text()
-{
+void server_to_text() {
        char buf[SIZ];
 
        int count = 0;
@@ -414,8 +415,7 @@ void server_to_text()
  * usual 000 terminator is found.  Caller is responsible for freeing
  * the returned pointer.
  */
-int read_server_text(StrBuf *Buf, long *nLines)
-{
+int read_server_text(StrBuf *Buf, long *nLines) {
        wcsession *WCC = WC;
        StrBuf *ReadBuf;
        long nRead;
@@ -439,8 +439,7 @@ int read_server_text(StrBuf *Buf, long *nLines)
 }
 
 
-int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK)
-{
+int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK) {
        int rc;
        if (FullState != NULL)
                *FullState = StrTol(Line);
@@ -455,110 +454,92 @@ int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, i
 }
 
 
-void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) {
        StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
-void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_sysadm, 0);
 }
 
-void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0);
 }
 
-void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0);
 }
 
-void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0);
 }
 
-void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_software, 0);
 }
 
-void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP)
-{
-       wcsession *WCC = WC;
-       if (WCC->serv_info == NULL)
-               return;
-       StrBufAppendPrintf(Target, "%d.%02d",
-                           WCC->serv_info->serv_rev_level / 100,
-                           WCC->serv_info->serv_rev_level % 100);
+void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) {
+       if (WC->serv_info == NULL) return;
+       StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level);
 }
-int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP)
-{
+int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return 0;
        return WCC->serv_info->serv_newuser_disabled != 0;
 }
 
-int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP)                                                                                                                                       
-{
+int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
         if (WCC->serv_info == NULL)
                return 0;
         return WCC->serv_info->serv_supports_guest != 0;
 }
 
-int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
-{
+int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return 0;
        return WCC->serv_info->serv_supports_openid != 0;
 }
 
-int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
-{
+int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return 0;
        return WCC->serv_info->serv_fulltext_enabled != 0;
 }
 
-int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP)
-{
+int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return 0;
        return WCC->serv_info->serv_supports_ldap != 0;
 }
 
-void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) {
        wcsession *WCC = WC;
        if (WCC->serv_info == NULL)
                return;
        StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0);
 }
 
-void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) {
        int n = 0;
        int Done = 0;
        StrBuf *Line;
@@ -591,16 +572,20 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
        FreeStrBuf(&Line);
 }
 
+void tmplput_site_prefix(StrBuf *Target, WCTemplputParams *TP) {
+       wcsession *WCC = WC;
+       if ((WCC != NULL) && (WCC->Hdr->HostHeader != NULL)) {
+               StrBufAppendTemplate(Target, TP, WCC->Hdr->HostHeader, 0);
+       }
+}
 
-void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority)
-{
+void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority) {
        StrBuf *MT;
        MT = NewStrBufPlain(MimeType, MTLen);
        Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf);
 }
 
-void CreateMimeStr(void)
-{
+void CreateMimeStr(void) {
        HashPos  *it;
        void *vMime;
        long len = 0;
@@ -652,11 +637,16 @@ InitModule_SERVFUNC
        RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
        RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
        RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE);
+       
        RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, NULL, CTX_NONE);
        RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, NULL, CTX_NONE);
        RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, NULL, CTX_NONE);
        RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, NULL, CTX_NONE);
        RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
+
+       RegisterNamespace("SERV:SITE:PREFIX", 0, 1, tmplput_site_prefix, NULL, CTX_NONE);
+
+
 }