Changed the display logic for message author. New conditional COND:MAIL:LOCAL which...

[citadel.git] / webcit / serv_func.c

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index dd1cc4deef70c1247a727dc9710237506682a481..9f9f89c8cfce0edb927cf46206c15e77653efd20 100644 (file)
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,3 +1,11 @@
+/*
+ * Functions which handle communication with the Citadel server.
+ *
+ * Copyright (c) 1996-2018 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"
@@ -187,7 +195,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 +246,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");
@@ -502,12 +510,8 @@ void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP)
 
 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);
+       if (WC->serv_info == NULL) return;
+       StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level);
 }
 int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -591,6 +595,12 @@ 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)
 {
@@ -652,11 +662,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);
+
+
 }