X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=66afe5e12e87dd818c95a461d4371fa6f9ec6fc8;hb=c73091a2ae896b6be5aa94b911c1c89d76a85688;hp=12e4e5d0c33115dc50ec71d5fba6037b90785b6a;hpb=adc9f3079beac31291ee9c94d7db00575aa4694e;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index 12e4e5d0c..66afe5e12 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -1,5 +1,10 @@ /* - * $Id$ + * Functions which handle communication with the Citadel server. + * + * Copyright (c) 1996-2018 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. */ #include "webcit.h" @@ -8,6 +13,24 @@ 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) { if (*FreeMe == NULL) @@ -18,7 +41,6 @@ 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); @@ -28,7 +50,7 @@ void DeleteServInfo(ServInfo **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, StrBuf *user_agent) @@ -36,9 +58,11 @@ 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, @@ -47,10 +71,12 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) ChrPtr(browser_host) ); StrBuf_ServGetln(Buf); - - /** Tell the server what kind of richtext we prefer */ - serv_puts("MSGP text/calendar|text/vnote|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 @@ -59,11 +85,19 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) */ 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; } @@ -71,8 +105,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)) { -/* 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); @@ -99,9 +136,6 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) 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; @@ -123,6 +157,9 @@ ServInfo *get_serv_info(StrBuf *browser_host, StrBuf *user_agent) case 23: info->serv_supports_openid = StrToi(Buf); break; + case 24: + info->serv_supports_guest = StrToi(Buf); + break; } ++a; } @@ -136,105 +173,43 @@ int GetConnected (void) wcsession *WCC = WC; if (WCC->ReadBuf == NULL) - WCC->ReadBuf = NewStrBuf(); + 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) { - do_logout(); + 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 */ - GetServerStatus(Buf, &Status); + short_status = GetServerStatus(Buf, &Status); FreeStrBuf(&Buf); - /* Are there too many users already logged in? */ - if (Status == 571) { - wprintf(_("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.")); - end_burst(); - end_webcit_session(); - return 1; - } - /* - * 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 ( (!follow_xff) || (StrLength(WCC->Hdr->browser_host) == 0) ) { - if (WCC->Hdr->browser_host == NULL) { - WCC->Hdr->browser_host = NewStrBuf(); - Put(WCC->Hdr->HTTPHeaders, HKEY("FreeMeWithTheOtherHeaders"), - WCC->Hdr->browser_host, HFreeStrBuf); + /* Server isn't ready for us? */ + if (short_status != 2) { + if (Status == 551) { + 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.")); } - locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock); - } - if (WCC->serv_info == NULL) - WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent); - if (WCC->serv_info == NULL){ - begin_burst(); - wprintf(_("Received unexpected answer from Citadel " - "server; bailing out.")); - 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; - } - if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) { - begin_burst(); - wprintf(_("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 + else { + wc_printf("%ld %s\n", + Status, + _("Received unexpected answer from Citadel server; bailing out.") ); - 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; - } - } - if (WCC->ReadBuf == NULL) - WCC->ReadBuf = NewStrBuf(); - 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) { - do_logout(); - FreeStrBuf(&WCC->ReadBuf); - return 1; - } - else { - long Status; - StrBuf *Buf; - - Buf = NewStrBuf(); - WCC->connected = 1; - StrBuf_ServGetln(Buf); - GetServerStatus(Buf,&Status); - /* get the server greeting */ - - /* Are there too many users already logged in? */ - if (Status == 571) { - wprintf(_("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.")); + hprintf("HTTP/1.1 502 Bad Gateway\r\n"); + hprintf("Content-type: text/plain; charset=utf-8\r\n"); + } end_burst(); end_webcit_session(); - FreeStrBuf(&Buf); return 1; } @@ -244,30 +219,29 @@ int GetConnected (void) * unless we are following X-Forwarded-For: headers * and such a header has already turned up something. */ - if ( (!follow_xff) || (StrLength(WCC->Hdr->browser_host) == 0) ) { - if (WCC->Hdr->browser_host == NULL) { - WCC->Hdr->browser_host = NewStrBuf(); + 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->browser_host, HFreeStrBuf); + WCC->Hdr->HR.browser_host, HFreeStrBuf); } - locate_host(WCC->Hdr->browser_host, WCC->Hdr->http_sock); + locate_host(WCC->Hdr->HR.browser_host, WCC->Hdr->http_sock); + } + if (WCC->serv_info == NULL) { + WCC->serv_info = get_serv_info(WCC->Hdr->HR.browser_host, WCC->Hdr->HR.user_agent); } - if (WCC->serv_info == NULL) - WCC->serv_info = get_serv_info(WCC->Hdr->browser_host, WCC->Hdr->user_agent); if (WCC->serv_info == NULL){ begin_burst(); - wprintf(_("Received unexpected answer from Citadel " - "server; bailing out.")); - hprintf("HTTP/1.1 200 OK\r\n"); + 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(); - FreeStrBuf(&Buf); return 1; } if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) { begin_burst(); - wprintf(_("You are connected to a Citadel " + 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" @@ -281,126 +255,83 @@ int GetConnected (void) hprintf("Content-type: text/plain; charset=utf-8\r\n"); end_burst(); end_webcit_session(); - FreeStrBuf(&Buf); return 1; } - FreeStrBuf(&Buf); + SetInlinMimeRenderers(); } 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, "
\n", align); - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { - - if ((intext == 1) && (isspace(buf[0]))) { - wprintf("
"); - } - 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))) { - StrBufAppendBufPlain(Target, HKEY("
"), 0); - bq = 1; - } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - StrBufAppendBufPlain(Target, HKEY("
"), 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) { - wprintf(""); - } - wprintf("

\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; - 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, "
\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("
"), 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
tags. - */ - if (i > 0) StrBufCutLeft(Line, i); + if ((intext == 1) && (isspace(*ptr))) { + StrBufAppendBufPlain(Target, HKEY("
"), 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
tags. + */ + if (i > 0) StrBufCutLeft(Line, i); - for (i = bn; i < bq; i++) - StrBufAppendBufPlain(Target, HKEY("
"), 0); - for (i = bq; i < bn; i++) - StrBufAppendBufPlain(Target, HKEY("
"), 0); - bn = bq; + for (i = bn; i < bq; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + for (i = bq; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 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("
"), 0); + } StrBufAppendBufPlain(Target, HKEY("

\n"), 0); FreeStrBuf(&Line); FreeStrBuf(&Line1); @@ -409,54 +340,8 @@ 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]))) { - wprintf("
"); - } - 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))) { - wprintf("
"); - bq = 1; - } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf("
"); - bq = 0; - } - if ((bq == 1) && (!strncmp(buf, " >", 2))) { - strcpy(buf, &buf[2]); - } - - msgescputs(buf); - } - if (bq == 1) { - wprintf(""); - } -} - - - - -/** +/* * Transmit message text (in memory) to the server. - * - * ptr Pointer to the message being transmitted */ void text_to_server(char *ptr) { @@ -496,85 +381,23 @@ 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++]); + StrBuf *ServBuf; - 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; - } - } - - /* 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() { @@ -584,103 +407,59 @@ 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; } @@ -689,6 +468,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; @@ -723,12 +510,8 @@ void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) { - wcsession *WCC = WC; - if (WCC->serv_info == NULL) - return; - StrBufAppendPrintf(Target, "%d.%02d", - WCC->serv_info->serv_rev_level / 100, - WCC->serv_info->serv_rev_level % 100); + if (WC->serv_info == NULL) return; + StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level); } int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) { @@ -737,6 +520,15 @@ int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) 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; @@ -745,6 +537,22 @@ int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) 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; @@ -753,7 +561,6 @@ void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0); } - void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) { int n = 0; @@ -788,6 +595,56 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) FreeStrBuf(&Line); } +void tmplput_site_prefix(StrBuf *Target, WCTemplputParams *TP) { + wcsession *WCC = WC; + if ((WCC != NULL) && (WCC->Hdr->HostHeader != NULL)) { + StrBufAppendTemplate(Target, TP, WCC->Hdr->HostHeader, 0); + } +} + +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) @@ -796,17 +653,25 @@ InitModule_SERVFUNC 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); - 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); */ + 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); + + RegisterNamespace("SERV:SITE:PREFIX", 0, 1, tmplput_site_prefix, NULL, CTX_NONE); + + } @@ -817,4 +682,3 @@ SessionDestroyModule_SERVFUNC { DeleteServInfo(&sess->serv_info); } -/*@}*/