X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=a6c41f711e858a9ec61cc87c88570d2d3cba6450;hb=2c1eedd6a74e856c5c2a48868c987a5ef38680fa;hp=8585744af915c810dfe857cc6223457feac72127;hpb=5bca824db94fa46095ee558df45236f083b9cb28;p=citadel.git
diff --git a/webcit/serv_func.c b/webcit/serv_func.c
index 8585744af..a6c41f711 100644
--- a/webcit/serv_func.c
+++ b/webcit/serv_func.c
@@ -50,6 +50,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
ServInfo *info;
StrBuf *Buf;
int a;
+ int rc;
Buf = NewStrBuf();
@@ -63,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;
@@ -77,7 +78,7 @@ 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;
@@ -87,7 +88,7 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent)
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;
@@ -96,7 +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)) {
+ while (rc = StrBuf_ServGetln(Buf),
+ (rc >= 0) &&
+ ((rc != 3) ||
+ strcmp(ChrPtr(Buf), "000")))
+ {
switch (a) {
case 0:
info->serv_pid = StrToi(Buf);
@@ -167,7 +172,7 @@ 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;
}
@@ -200,8 +205,6 @@ int GetConnected (void)
return 1;
}
- /* 2010jun03: every now and then the connection to Citadel dies before this point. why? */
-
/*
* From what host is our user connecting? Go with
* the host at the other end of the HTTP socket,
@@ -255,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;
@@ -301,7 +304,7 @@ void _fmout(StrBuf *Target, char *align)
wc_printf("
\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;
@@ -377,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("
");
- }
- intext = 1;
-
- /*
- * Quoted text should be displayed in italics and in a
- * different colour. This code understands Citadel-style
- * " >" quotes and will convert to tags.
- */
- if ((bq == 0) && (!strncmp(buf, " >", 2))) {
- wc_printf("");
- bq = 1;
- } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- wc_printf("
");
- bq = 0;
- }
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
- }
-
- msgescputs(buf);
- }
- if (bq == 1) {
- wc_printf("");
- }
-}
-
-
-
/*
* Transmit message text (in memory) to the server.
@@ -563,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;
}
@@ -597,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;
@@ -776,6 +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);
+ RegisterNamespace("SERV:ADMIN", 0, 1, tmplput_serv_admin, NULL, CTX_NONE);
}