X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=a6c41f711e858a9ec61cc87c88570d2d3cba6450;hb=2c1eedd6a74e856c5c2a48868c987a5ef38680fa;hp=493b380f1bad0dcfacbf41fbe3be714aadcf7c73;hpb=5b6e73afc7dafc549bb179b6610689b1be64322e;p=citadel.git

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 493b380f1..a6c41f711 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "webcit.h"
 #include "webserver.h"
@@ -17,7 +14,8 @@ void SetInlinMimeRenderers(void)
 	StrBuf *Buf;
 
 	Buf = NewStrBuf();
-	/** Tell the server what kind of richtext we prefer */
+
+	/* Tell the server what kind of richtext we prefer */
 	serv_putbuf(EmbeddableMimeStrs);
 	StrBuf_ServGetln(Buf);
 
@@ -35,7 +33,6 @@ void DeleteServInfo(ServInfo **FreeMe)
 	FreeStrBuf(&(*FreeMe)->serv_software);
 	FreeStrBuf(&(*FreeMe)->serv_bbs_city);
 	FreeStrBuf(&(*FreeMe)->serv_sysadm);
-	FreeStrBuf(&(*FreeMe)->serv_moreprompt);
 	FreeStrBuf(&(*FreeMe)->serv_default_cal_zone);
 	FreeStrBuf(&(*FreeMe)->serv_svn_revision);
 	free(*FreeMe);
@@ -53,9 +50,11 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	ServInfo *info;
 	StrBuf *Buf;
 	int a;
+	int rc;
 
 	Buf = NewStrBuf();
-	/** Tell the server what kind of client is connecting */
+
+	/* Tell the server what kind of client is connecting */
 	serv_printf("IDEN %d|%d|%d|%s|%s",
 		    DEVELOPER_ID,
 		    CLIENT_ID,
@@ -65,7 +64,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	);
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		lprintf(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
+		syslog(0, "get_serv_info(IDEN): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -79,17 +78,17 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	serv_puts("ICAL sgi|1");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 2) {
-		lprintf(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
+		syslog(0, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
 	}
 
-	/** Now ask the server to tell us a little bit about itself... */
+	/* Now ask the server to tell us a little bit about itself... */
 	serv_puts("INFO");
 	StrBuf_ServGetln(Buf);
 	if (GetServerStatus(Buf, NULL) != 1) {
-		lprintf(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
+		syslog(0, "get_serv_info(INFO sgi|1): unexpected answer [%s]\n",
 			ChrPtr(Buf));
 		FreeStrBuf(&Buf);
 		return NULL;
@@ -98,8 +97,11 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 	info = (ServInfo*)malloc(sizeof(ServInfo));
 	memset(info, 0, sizeof(ServInfo));
 	a = 0;
-	while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) {
-/*		lprintf (1, "a: %d [%s]", a, ChrPtr(Buf));*/
+	while (rc = StrBuf_ServGetln(Buf),
+	       (rc >= 0) &&
+	       ((rc != 3) || 
+		strcmp(ChrPtr(Buf), "000")))
+	{
 		switch (a) {
 		case 0:
 			info->serv_pid = StrToi(Buf);
@@ -126,9 +128,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 		case 7:
 			info->serv_sysadm = NewStrBufDup(Buf);
 			break;
-		case 9:
-			info->serv_moreprompt = NewStrBufDup(Buf);
-			break;
 		case 14:
 			info->serv_supports_ldap = StrToi(Buf);
 			break;
@@ -150,6 +149,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
 		case 23:
 			info->serv_supports_openid = StrToi(Buf);
 			break;
+		case 24:
+			info->serv_supports_guest = StrToi(Buf);
+			break;
 		}
 		++a;
 	}
@@ -170,21 +172,34 @@ int GetConnected (void)
 		WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
 	
 	if (WCC->serv_sock < 0) {
-		do_logout();
+		WCC->connected = 0;
 		FreeStrBuf(&WCC->ReadBuf);
 		return 1;
 	}
 	else {
 		long Status;
+		int short_status;
 		Buf = NewStrBuf();
 		WCC->connected = 1;
 		StrBuf_ServGetln(Buf);	/* get the server greeting */
-		GetServerStatus(Buf, &Status);
+		short_status = GetServerStatus(Buf, &Status);
 		FreeStrBuf(&Buf);
 
-		/* Are there too many users already logged in? */
-		if (Status == 571) {
-			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."));
+		/* Server isn't ready for us? */
+		if (short_status != 2) {
+			if (Status == 571) {
+				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."));
+			}
+			else {
+				wc_printf("%ld %s\n",
+					Status,
+					_("Received unexpected answer from Citadel server; bailing out.")
+				);
+				hprintf("HTTP/1.1 502 Bad Gateway\r\n");
+				hprintf("Content-type: text/plain; charset=utf-8\r\n");
+			}
 			end_burst();
 			end_webcit_session();
 			return 1;
@@ -204,13 +219,13 @@ int GetConnected (void)
 			}
 			locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
 		}
-		if (WCC->serv_info == NULL)
+		if (WCC->serv_info == NULL) {
 			WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
+		}
 		if (WCC->serv_info == NULL){
 			begin_burst();
-			wc_printf(_("Received unexpected answer from Citadel "
-				  "server; bailing out."));
-			hprintf("HTTP/1.1 200 OK\r\n");
+			wc_printf(_("Received unexpected answer from Citadel server; bailing out."));
+			hprintf("HTTP/1.1 502 Bad Gateway\r\n");
 			hprintf("Content-type: text/plain; charset=utf-8\r\n");
 			end_burst();
 			end_webcit_session();
@@ -243,12 +258,12 @@ int GetConnected (void)
  *  Read Citadel variformat text and spit it out as HTML.
  *  align html align string
  */
-inline void fmout(char *align)
+inline void fmout(const char *align)
 {
 	_fmout(WC->WBuf, align);
 }
 
-void _fmout(StrBuf *Target, char *align)
+void _fmout(StrBuf *Target, const char *align)
 {
 	int intext = 0;
 	int bq = 0;
@@ -258,7 +273,7 @@ void _fmout(StrBuf *Target, char *align)
 	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
 
 		if ((intext == 1) && (isspace(buf[0]))) {
-			wc_printf("<br />");
+			wc_printf("<br>");
 		}
 		intext = 1;
 
@@ -286,10 +301,10 @@ void _fmout(StrBuf *Target, char *align)
 	if (bq == 1) {
 		wc_printf("</I>");
 	}
-	wc_printf("</div><br />\n");
+	wc_printf("</div><br>\n");
 }
 
-void FmOut(StrBuf *Target, char *align, StrBuf *Source)
+void FmOut(StrBuf *Target, const char *align, const StrBuf *Source)
 {
 	const char *ptr, *pte;
 	const char *BufPtr = NULL;
@@ -328,7 +343,7 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source)
 						   i++;
 					   }
 
-			/**
+			/*
 			 * Quoted text should be displayed in italics and in a
 			 * different colour.  This code understands Citadel-style
 			 * " >" quotes and will convert to <BLOCKQUOTE> tags.
@@ -344,7 +359,8 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source)
 
 			if (StrLength(Line) == 0)
 				continue;
-			/** Activate embedded URL's */
+
+			/* Activate embedded URL's */
 			UrlizeText(Line1, Line, Line2);
 
 			StrEscAppend(Target, Line1, NULL, 0, 0);
@@ -364,48 +380,6 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source)
 }
 
 
-/*
- * Read Citadel variformat text and spit it out as HTML in a form
- * suitable for embedding in another message (forward/quote).
- * (NO LINEBREAKS ALLOWED HERE!)
- */
-void pullquote_fmout(void) {
-	int intext = 0;
-	int bq = 0;
-	char buf[SIZ];
-
-	while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-
-		if ((intext == 1) && (isspace(buf[0]))) {
-			wc_printf("<br />");
-		}
-		intext = 1;
-
-		/**
-		 * Quoted text should be displayed in italics and in a
-		 * different colour.  This code understands Citadel-style
-		 * " >" quotes and will convert to <BLOCKQUOTE> tags.
-		 */
-		if ((bq == 0) && (!strncmp(buf, " >", 2))) {
-			wc_printf("<BLOCKQUOTE>");
-			bq = 1;
-		} else if ((bq == 1) && (strncmp(buf, " >", 2))) {
-			wc_printf("</BLOCKQUOTE>");
-			bq = 0;
-		}
-		if ((bq == 1) && (!strncmp(buf, " >", 2))) {
-			strcpy(buf, &buf[2]);
-		}
-
-		msgescputs(buf);
-	}
-	if (bq == 1) {
-		wc_printf("</I>");
-	}
-}
-
-
-
 
 /*
  *  Transmit message text (in memory) to the server.
@@ -550,32 +524,41 @@ void server_to_text()
 int read_server_text(StrBuf *Buf, long *nLines)
 {
 	wcsession *WCC = WC;
+	StrBuf *ReadBuf;
 	long nRead;
 	long nTotal = 0;
 	long nlines;
 	
 	nlines = 0;
+	ReadBuf = NewStrBuf();
 	while ((WCC->serv_sock!=-1) &&
-	       (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) ))
+	       (nRead = StrBuf_ServGetln(ReadBuf), (nRead >= 0) &&
+		((nRead != 3)||(strcmp(ChrPtr(ReadBuf), "000") != 0))))
 	{
-		if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) {
-			StrBufCutRight(Buf, nRead);
-			break;
-		}
+		StrBufAppendBuf(Buf, ReadBuf, 0);
+		StrBufAppendBufPlain(Buf, HKEY("\n"), 0);
 		nTotal += nRead;
 		nlines ++;
 	}
-
+	FreeStrBuf(&ReadBuf);
 	*nLines = nlines;
 	return nTotal;
 }
 
 
-int GetServerStatus(StrBuf *Line, long* FullState)
+int GetServerStatusMsg(StrBuf *Line, long* FullState, int PutImportantMessage, int MajorOK)
 {
+	int rc;
 	if (FullState != NULL)
 		*FullState = StrTol(Line);
-	return ChrPtr(Line)[0] - 48;
+	rc = ChrPtr(Line)[0] - 48;
+	if ((!PutImportantMessage) || 
+	    (MajorOK == rc)||
+	    (StrLength(Line) <= 4))
+		return rc;
+
+	AppendImportantMessage(ChrPtr(Line) + 4, StrLength(Line) - 4);
+	return rc;
 }
 
 
@@ -584,6 +567,14 @@ void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
 }
 
+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)
 {
 	wcsession *WCC = WC;
@@ -649,6 +640,14 @@ int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
 	return WCC->serv_info->serv_fulltext_enabled != 0;
 }
 
+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)
 {
 	wcsession *WCC = WC;
@@ -745,7 +744,8 @@ InitModule_SERVFUNC
 
 	RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
 	RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERV:HAVEFULLTEXT"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+	RegisterConditional(HKEY("COND:SERV:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+	RegisterConditional(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_enabled, CTX_NONE);
 	RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, NULL, CTX_NONE);
 	RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, NULL, CTX_NONE);
 	RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, NULL, CTX_NONE);
@@ -754,7 +754,7 @@ InitModule_SERVFUNC
 	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);
-/*TODO //	RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */
+	RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
 }