X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=66afe5e12e87dd818c95a461d4371fa6f9ec6fc8;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=6dcf79cd96f30e605ad7601b29c8dbd080f59d26;hpb=2f8ba8d58350ea377595b951fb7d20a5618ea0ef;p=citadel.git

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 6dcf79cd9..66afe5e12 100644
--- 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"
@@ -64,7 +72,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	);
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -78,7 +86,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	serv_puts("ICAL sgi|1");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -88,7 +96,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	serv_puts("INFO");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 1) {
-		syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+		syslog(LOG_WARNING, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -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."));
@@ -376,71 +384,13 @@ 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(char *ptr)
+void text_to_server_qp(const StrBuf *SendMeEncoded)
 {
-	unsigned char ch, buf[256];
-	int pos;
-	int output_len = 0;
-
-	pos = 0;
-	buf[0] = 0;
-	output_len = 0;
-
-	while (ptr[pos] != 0) {
-		ch = (unsigned char)(ptr[pos++]);
+	StrBuf *ServBuf;
 
-		if (ch == 13) {
-			/* ignore carriage returns */
-		}
-		else if (ch == 10) {
-			/* hard line break */
-			if (output_len > 0) {
-				if (isspace(buf[output_len-1])) {
-					sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-					output_len += 2;
-				}
-			}
-			buf[output_len++] = 0;
-			serv_puts((char *)buf);
-			output_len = 0;
-		}
-		else if (ch == 9) {
-			buf[output_len++] = ch;
-		}
-		else if ( (ch >= 32) && (ch <= 60) ) {
-			buf[output_len++] = ch;
-		}
-		else if ( (ch >= 62) && (ch <= 126) ) {
-			buf[output_len++] = ch;
-		}
-		else {
-			sprintf((char *)&buf[output_len], "=%02X", ch);
-			output_len += 3;
-		}
-		
-		if (output_len > 72) {
-			/* soft line break */
-			if (isspace(buf[output_len-1])) {
-				sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-				output_len += 2;
-			}
-			buf[output_len++] = '=';
-			buf[output_len++] = 0;
-			serv_puts((char *)buf);
-			output_len = 0;
-		}
-	}
-
-	/* end of data - transmit anything that's left */
-	if (output_len > 0) {
-		if (isspace(buf[output_len-1])) {
-			sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
-			output_len += 2;
-		}
-		buf[output_len++] = 0;
-		serv_puts((char *)buf);
-		output_len = 0;
-	}
+	ServBuf = StrBufRFC2047encodeMessage(SendMeEncoded);
+	serv_putbuf(ServBuf);
+	FreeStrBuf(&ServBuf);
 }
 
 
@@ -560,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)
 {
@@ -649,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)
 {
@@ -710,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);
+
+
 }