X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=873a3ffde67114687c9492af222b5273a31a1e0a;hb=d50cb4fb0a9d5c05841dad2d2f8ce4c35e5a6847;hp=6e2bdb98929bd237f03c655119ce242cad9cf6ff;hpb=1533619a044012ab46b460c4560763fb82d7ee74;p=citadel.git

diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 6e2bdb989..873a3ffde 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -172,6 +172,7 @@ int GetConnected (void)
 		WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
 	
 	if (WCC->serv_sock < 0) {
+		WCC->connected = 0;
 		FreeStrBuf(&WCC->ReadBuf);
 		return 1;
 	}
@@ -257,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;
@@ -303,7 +304,7 @@ void _fmout(StrBuf *Target, char *align)
 	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;
@@ -379,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.
@@ -586,11 +545,19 @@ int read_server_text(StrBuf *Buf, long *nLines)
 }
 
 
-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;
 }
 
 
@@ -786,7 +753,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);
-	RegisterNamespace("SERV:ADMIN", 1, 2, tmplput_serv_admin, NULL, CTX_NONE);
+	RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
 }