WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
if (WCC->serv_sock < 0) {
+ WCC->connected = 0;
FreeStrBuf(&WCC->ReadBuf);
return 1;
}
return 0;
}
-/*
- * Read Citadel variformat text and spit it out as HTML.
- * align html align string
- */
-inline void fmout(const char *align)
-{
- _fmout(WC->WBuf, align);
-}
-
-void _fmout(StrBuf *Target, const 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, const char *align, const StrBuf *Source)
{
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;
}
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;
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(HKEY("COND:SERV:LDAP_ENABLED"), 2, conditional_serv_ldap_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);