-/*
- * $Id$
- */
#include "webcit.h"
#include "webserver.h"
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);
ServInfo *info;
StrBuf *Buf;
int a;
+ int rc;
Buf = NewStrBuf();
);
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 2) {
- lprintf(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;
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(LOG_WARNING, "get_serv_info(ICAL sgi|1): unexpected answer [%s]\n",
ChrPtr(Buf));
FreeStrBuf(&Buf);
return NULL;
serv_puts("INFO");
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) != 1) {
- lprintf(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;
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);
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;
case 23:
info->serv_supports_openid = StrToi(Buf);
break;
+ case 24:
+ info->serv_supports_guest = StrToi(Buf);
+ break;
}
++a;
}
if (is_uds) /* unix domain socket */
WCC->serv_sock = uds_connectsock(serv_sock_name);
else /* tcp socket */
- WCC->serv_sock = tcp_connectsock(ctdlhost, atoi(ctdlport));
+ WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
if (WCC->serv_sock < 0) {
- do_logout();
+ WCC->connected = 0;
FreeStrBuf(&WCC->ReadBuf);
return 1;
}
/* 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 {
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;
}
- /* 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,
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");
+ 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 0;
}
-/*
- * Read Citadel variformat text and spit it out as HTML.
- * align html align string
- */
-inline void fmout(char *align)
-{
- _fmout(WC->WBuf, align);
-}
-
-void _fmout(StrBuf *Target, char *align)
-{
- int intext = 0;
- int bq = 0;
- char buf[SIZ];
-
- StrBufAppendPrintf(Target, "<div align=%s>\n", align);
- 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))) {
- StrBufAppendBufPlain(Target, HKEY("<BLOCKQUOTE>"), 0);
- bq = 1;
- } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- StrBufAppendBufPlain(Target, HKEY("</BLOCKQUOTE>"), 0);
- bq = 0;
- }
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
- }
- /* Activate embedded URL's */
- url(buf, sizeof(buf));
-
- escputs(buf);
- StrBufAppendBufPlain(Target, HKEY("\n"), 0);
- }
- if (bq == 1) {
- wc_printf("</I>");
- }
- 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;
}
-/*
- * 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.
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;
}
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;
return WCC->serv_info->serv_newuser_disabled != 0;
}
+int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ if (WCC->serv_info == NULL)
+ return 0;
+ return WCC->serv_info->serv_supports_guest != 0;
+}
+
int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP)
{
wcsession *WCC = WC;
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;
if (is_uds)
snprintf(serv_sock_name, PATH_MAX, "%s/citadel.socket", ctdlport);
- 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:FULLTEXT_ENABLED"), 2, conditional_serv_fulltext_enabled, CTX_NONE);
+ RegisterConditional("COND:SERV:OPENID", 2, conditional_serv_supports_openid, CTX_NONE);
+ RegisterConditional("COND:SERV:NEWU", 2, conditional_serv_newuser_disabled, CTX_NONE);
+ RegisterConditional("COND:SERV:FULLTEXT_ENABLED", 2, conditional_serv_fulltext_enabled, CTX_NONE);
+ RegisterConditional("COND:SERV:LDAP_ENABLED", 2, conditional_serv_ldap_enabled, CTX_NONE);
+ RegisterConditional("COND:SERV:SUPPORTS_GUEST", 2, conditional_serv_supports_guest, 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);
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);
}