-/*
- * $Id$
- */
#include "webcit.h"
#include "webserver.h"
+int is_uds = 0;
+char serv_sock_name[PATH_MAX] = "";
+
+HashList *EmbeddableMimes = NULL;
+StrBuf *EmbeddableMimeStrs = NULL;
+
+
+void SetInlinMimeRenderers(void)
+{
+ StrBuf *Buf;
+
+ Buf = NewStrBuf();
+
+ /* Tell the server what kind of richtext we prefer */
+ serv_putbuf(EmbeddableMimeStrs);
+ StrBuf_ServGetln(Buf);
+
+ FreeStrBuf(&Buf);
+}
+
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);
/*
* get info about the server we've connected to
*
- * browser_host the citadell we want to connect to
+ * browser_host the citadel we want to connect to
* user_agent which browser uses our client?
*/
-ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent)
+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,
CLIENT_VERSION,
- user_agent,
+ ChrPtr(user_agent),
ChrPtr(browser_host)
);
StrBuf_ServGetln(Buf);
-
- /** Tell the server what kind of richtext we prefer */
- serv_puts("MSGP text/calendar|text/html|text/plain");
- StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ syslog(LOG_WARNING, "get_serv_info(IDEN): unexpected answer [%s]\n",
+ ChrPtr(Buf));
+ FreeStrBuf(&Buf);
+ return NULL;
+ }
/*
* Tell the server that when we save a calendar event, we
*/
serv_puts("ICAL sgi|1");
StrBuf_ServGetln(Buf);
+ if (GetServerStatus(Buf, NULL) != 2) {
+ syslog(LOG_WARNING, "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) {
+ 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)) {
-/* 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);
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;
}
return info;
}
-
-
-/**
- * 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 GetConnected (void)
{
- int intext = 0;
- int bq = 0;
- char buf[SIZ];
+ StrBuf *Buf;
+ wcsession *WCC = WC;
- StrBufAppendPrintf(Target, "<div align=%s>\n", align);
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ if (WCC->ReadBuf == NULL)
+ WCC->ReadBuf = NewStrBufPlain(NULL, SIZ * 4);
+ if (is_uds) /* unix domain socket */
+ WCC->serv_sock = uds_connectsock(serv_sock_name);
+ else /* tcp socket */
+ WCC->serv_sock = tcp_connectsock(ctdlhost, ctdlport);
+
+ if (WCC->serv_sock < 0) {
+ 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 */
+ short_status = GetServerStatus(Buf, &Status);
+ FreeStrBuf(&Buf);
- if ((intext == 1) && (isspace(buf[0]))) {
- wprintf("<br />");
+ /* 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;
}
- 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.
+ /*
+ * From what host is our user connecting? Go with
+ * the host at the other end of the HTTP socket,
+ * unless we are following X-Forwarded-For: headers
+ * and such a header has already turned up something.
*/
- 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 ( (!follow_xff) || (StrLength(WCC->Hdr->HR.browser_host) == 0) ) {
+ if (WCC->Hdr->HR.browser_host == NULL) {
+ WCC->Hdr->HR.browser_host = NewStrBuf();
+ Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"),
+ WCC->Hdr->HR.browser_host, HFreeStrBuf);
+ }
+ locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock);
}
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
+ if (WCC->serv_info == NULL) {
+ WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent);
}
- /** Activate embedded URL's */
- url(buf, sizeof(buf));
-
- escputs(buf);
- StrBufAppendBufPlain(Target, HKEY("\n"), 0);
- }
- if (bq == 1) {
- wprintf("</I>");
+ if (WCC->serv_info == NULL){
+ begin_burst();
+ 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();
+ return 1;
+ }
+ if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
+ begin_burst();
+ wc_printf(_("You are connected to a Citadel "
+ "server running Citadel %d.%02d. \n"
+ "In order to run this version of WebCit "
+ "you must also have Citadel %d.%02d or"
+ " newer.\n\n\n"),
+ WCC->serv_info->serv_rev_level / 100,
+ WCC->serv_info->serv_rev_level % 100,
+ MINIMUM_CIT_VERSION / 100,
+ MINIMUM_CIT_VERSION % 100
+ );
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ return 1;
+ }
+ SetInlinMimeRenderers();
}
- wprintf("</div><br />\n");
+ return 0;
}
-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;
- StrBuf *Line = NewStrBuf();
- StrBuf *Line1 = NewStrBuf();
- StrBuf *Line2 = NewStrBuf();
+ StrBuf *Line = NewStrBufPlain(NULL, SIZ);
+ StrBuf *Line1 = NewStrBufPlain(NULL, SIZ);
+ StrBuf *Line2 = NewStrBufPlain(NULL, SIZ);
int bn = 0;
int bq = 0;
- int i, n, done = 0;
+ int i;
long len;
int intext = 0;
StrBufAppendPrintf(Target, "<div class=\"fmout-%s\">\n", align);
- while ((n = StrBufSipLine(Line, Source, &BufPtr), n >= 0) && !done)
- {
- done = n == 0;
- bq = 0;
- i = 0;
- ptr = ChrPtr(Line);
- len = StrLength(Line);
- pte = ptr + len;
-
- if ((intext == 1) && (isspace(*ptr))) {
- StrBufAppendBufPlain(Target, HKEY("<br>"), 0);
- }
- intext = 1;
- if (isspace(*ptr)) while ((ptr < pte) &&
- ((*ptr == '>') ||
- isspace(*ptr)))
+
+ if (StrLength(Source) > 0)
+ do
{
- if (*ptr == '>')
- bq++;
- ptr ++;
- i++;
- }
+ StrBufSipLine(Line, Source, &BufPtr);
+ bq = 0;
+ i = 0;
+ ptr = ChrPtr(Line);
+ len = StrLength(Line);
+ pte = ptr + len;
- /**
- * 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 (i > 0) StrBufCutLeft(Line, i);
+ if ((intext == 1) && (isspace(*ptr))) {
+ StrBufAppendBufPlain(Target, HKEY("<br>"), 0);
+ }
+ intext = 1;
+ if (isspace(*ptr)) while ((ptr < pte) &&
+ ((*ptr == '>') ||
+ isspace(*ptr)))
+ {
+ if (*ptr == '>')
+ bq++;
+ ptr ++;
+ 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.
+ */
+ if (i > 0) StrBufCutLeft(Line, i);
- for (i = bn; i < bq; i++)
- StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
- for (i = bq; i < bn; i++)
- StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
- bn = bq;
+ for (i = bn; i < bq; i++)
+ StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
+ for (i = bq; i < bn; i++)
+ StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+ bn = bq;
- if (StrLength(Line) == 0)
- continue;
- /** Activate embedded URL's */
- UrlizeText(Line1, Line, Line2);
+ if (StrLength(Line) == 0)
+ continue;
- StrEscAppend(Target, Line1, NULL, 0, 0);
+ /* Activate embedded URL's */
+ UrlizeText(Line1, Line, Line2);
- StrBufAppendBufPlain(Target, HKEY("\n"), 0);
- }
- for (i = 0; i < bn; i++)
+ StrEscAppend(Target, Line1, NULL, 0, 0);
+
+ StrBufAppendBufPlain(Target, HKEY("\n"), 0);
+ }
+ while ((BufPtr != StrBufNOTNULL) &&
+ (BufPtr != NULL));
+
+ for (i = 0; i < bn; i++) {
StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
+ }
StrBufAppendBufPlain(Target, HKEY("</div><br>\n"), 0);
FreeStrBuf(&Line);
FreeStrBuf(&Line1);
-
-/**
- * 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]))) {
- wprintf("<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))) {
- wprintf("<BLOCKQUOTE>");
- bq = 1;
- } else if ((bq == 1) && (strncmp(buf, " >", 2))) {
- wprintf("</BLOCKQUOTE>");
- bq = 0;
- }
- if ((bq == 1) && (!strncmp(buf, " >", 2))) {
- strcpy(buf, &buf[2]);
- }
-
- msgescputs(buf);
- }
- if (bq == 1) {
- wprintf("</I>");
- }
-}
-
-
-
-
-/**
+/*
* Transmit message text (in memory) to the server.
- *
- * ptr Pointer to the message being transmitted
*/
void text_to_server(char *ptr)
{
}
-/**
- * Transmit message text (in memory) to the server,
- * converting to Quoted-Printable encoding as we go.
- *
- * ptr Pointer to the message being transmitted
+/*
+ * Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go.
*/
-void text_to_server_qp(char *ptr)
+void text_to_server_qp(const StrBuf *SendMeEncoded)
{
- unsigned char ch, buf[256];
- int pos;
- int output_len = 0;
-
- pos = 0;
- buf[0] = 0;
- output_len = 0;
-
- while (ptr[pos] != 0) {
- ch = (unsigned char)(ptr[pos++]);
-
- if (ch == 13) {
- /* ignore carriage returns */
- }
- else if (ch == 10) {
- /* hard line break */
- if (output_len > 0) {
- if (isspace(buf[output_len-1])) {
- sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
- output_len += 2;
- }
- }
- buf[output_len++] = 0;
- serv_puts((char *)buf);
- output_len = 0;
- }
- else if (ch == 9) {
- buf[output_len++] = ch;
- }
- else if ( (ch >= 32) && (ch <= 60) ) {
- buf[output_len++] = ch;
- }
- else if ( (ch >= 62) && (ch <= 126) ) {
- buf[output_len++] = ch;
- }
- else {
- sprintf((char *)&buf[output_len], "=%02X", ch);
- output_len += 3;
- }
-
- if (output_len > 72) {
- /* soft line break */
- if (isspace(buf[output_len-1])) {
- sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
- output_len += 2;
- }
- buf[output_len++] = '=';
- buf[output_len++] = 0;
- serv_puts((char *)buf);
- output_len = 0;
- }
- }
+ StrBuf *ServBuf;
- /* end of data - transmit anything that's left */
- if (output_len > 0) {
- if (isspace(buf[output_len-1])) {
- sprintf((char *)&buf[output_len-1], "=%02X", buf[output_len-1]);
- output_len += 2;
- }
- buf[output_len++] = 0;
- serv_puts((char *)buf);
- output_len = 0;
- }
+ ServBuf = StrBufRFC2047encodeMessage(SendMeEncoded);
+ serv_putbuf(ServBuf);
+ FreeStrBuf(&ServBuf);
}
-/**
- * translate server message output to text
- * (used for editing room info files and such)
+/*
+ * translate server message output to text (used for editing room info files and such)
*/
void server_to_text()
{
while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
if ((buf[0] == 32) && (count > 0)) {
- wprintf("\n");
+ wc_printf("\n");
}
- wprintf("%s", buf);
+ wc_printf("%s", buf);
++count;
}
}
-/**
- * Read binary data from server into memory using a series of
- * server READ commands.
- * \return the read content as StrBuf
- */
-int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf)
-{
- char buf[SIZ];
- size_t bytes = 0;
- size_t thisblock = 0;
-
- if (Ret == NULL)
- return -1;
-
- while (bytes < total_len) {
- thisblock = 4095;
- if ((total_len - bytes) < thisblock) {
- thisblock = total_len - bytes;
- if (thisblock == 0) {
- FlushStrBuf(Ret);
- FreeStrBuf(&Buf);
- return -1;
- }
- }
- serv_printf("READ %d|%d", (int)bytes, (int)thisblock);
- if (StrBuf_ServGetln(Buf) > 0)
- {
- if (GetServerStatus(Buf, NULL) == 6)
- {
- StrBufCutLeft(Buf, 4);
- thisblock = StrTol(Buf);
- if (!WC->connected) {
- FlushStrBuf(Ret);
- FreeStrBuf(&Buf);
- return -1;
- }
- StrBuf_ServGetBLOBBuffered(Ret, thisblock);
- bytes += thisblock;
- }
- else {
- FreeStrBuf(&Buf);
- lprintf(3, "Error: %s\n", &buf[4]);
- return -1;
- }
- }
- }
- return StrLength(Ret);
-}
-
-/**
- * Read text from server, appending to a string buffer until the
+/*
+ * Read text from server, appending to a string buffer until the
* usual 000 terminator is found. Caller is responsible for freeing
* the returned pointer.
*/
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 0;
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_supports_openid != 0;
}
+int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP)
+{
+ wcsession *WCC = WC;
+ if (WCC->serv_info == NULL)
+ return 0;
+ 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;
StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0);
}
-
void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP)
{
int n = 0;
FreeStrBuf(&Line);
}
+
+void RegisterEmbeddableMimeType(const char *MimeType, long MTLen, int Priority)
+{
+ StrBuf *MT;
+ MT = NewStrBufPlain(MimeType, MTLen);
+ Put(EmbeddableMimes, IKEY(Priority), MT, HFreeStrBuf);
+}
+
+void CreateMimeStr(void)
+{
+ HashPos *it;
+ void *vMime;
+ long len = 0;
+ const char *Key;
+
+ it = GetNewHashPos(EmbeddableMimes, 0);
+ while (GetNextHashPos(EmbeddableMimes, it, &len, &Key, &vMime) &&
+ (vMime != NULL)) {
+ if (StrLength(EmbeddableMimeStrs) > 0)
+ StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("|"), 0);
+ else
+ StrBufAppendBufPlain(EmbeddableMimeStrs, HKEY("MSGP "), 0);
+ StrBufAppendBuf(EmbeddableMimeStrs, (StrBuf*) vMime, 0);
+ }
+ DeleteHashPos(&it);
+}
+
+void
+ServerStartModule_SERV_FUNC
+(void)
+{
+ EmbeddableMimes = NewHash(1, Flathash);
+ EmbeddableMimeStrs = NewStrBuf();
+}
+
+
+void
+ServerShutdownModule_SERV_FUNC
+(void)
+{
+ FreeStrBuf(&EmbeddableMimeStrs);
+ DeleteHash(&EmbeddableMimes);
+}
+
void
InitModule_SERVFUNC
(void)
{
-
- RegisterConditional(HKEY("COND:SERV:OPENID"), 2, conditional_serv_supports_openid, CTX_NONE);
- RegisterConditional(HKEY("COND:SERV:NEWU"), 2, conditional_serv_newuser_disabled, CTX_NONE);
- RegisterNamespace("SERV:PID", 0, 0, tmplput_serv_ip, CTX_NONE);
- RegisterNamespace("SERV:NODENAME", 0, 1, tmplput_serv_nodename, CTX_NONE);
- RegisterNamespace("SERV:HUMANNODE", 0, 1, tmplput_serv_humannode, CTX_NONE);
- RegisterNamespace("SERV:FQDN", 0, 1, tmplput_serv_fqdn, CTX_NONE);
- RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, CTX_NONE);
- RegisterNamespace("SERV:REV_LEVEL", 0, 0, tmplput_serv_rev_level, CTX_NONE);
- RegisterNamespace("SERV:BBS_CITY", 0, 1, tmplput_serv_bbs_city, CTX_NONE);
- RegisterNamespace("SERV:MESG", 1, 2, tmplput_mesg, CTX_NONE);
-/*TODO // RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmplput_serv_ldap_enabled, 0); */
+ is_uds = strcasecmp(ctdlhost, "uds") == 0;
+ if (is_uds)
+ snprintf(serv_sock_name, PATH_MAX, "%s/citadel.socket", ctdlport);
+
+ 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:FQDN", 0, 1, tmplput_serv_fqdn, NULL, CTX_NONE);
+ RegisterNamespace("SERV:SOFTWARE", 0, 1, tmplput_serv_software, 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);
}
{
DeleteServInfo(&sess->serv_info);
}
-/*@}*/