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("
tags. - */ - if (i > 0) StrBufCutLeft(Line, i); + // Quoted text should be displayed in italics and in a + // different colour. This code understands Citadel-style + // " >" quotes and will convert totags. + if (i > 0) StrBufCutLeft(Line, i); - for (i = bn; i < bq; i++) - StrBufAppendBufPlain(Target, HKEY(""), 0); + } 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("
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) -{ +// Transmit message text (in memory) to the server. +void text_to_server(char *ptr) { char buf[256]; int ch, a, pos, len; @@ -389,7 +326,10 @@ void text_to_server(char *ptr) while (ptr[pos] != 0) { ch = ptr[pos++]; - if (ch == 10) { + if (ch == 13) { + // ignore CR characters + } + else if (ch == 10) { len = strlen(buf); while ( (isspace(buf[len - 1])) && (buf[0] != '\0') @@ -417,266 +357,148 @@ 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 - */ -void text_to_server_qp(char *ptr) -{ - 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++]); +// Transmit message text (in memory) to the server, converting to Quoted-Printable encoding as we go. +void text_to_server_qp(const StrBuf *SendMeEncoded) { + 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 = StrBufQuotedPrintableEncode(SendMeEncoded); + serv_putbuf(ServBuf); + FreeStrBuf(&ServBuf); } - - -/** - * translate server message output to text - * (used for editing room info files and such) - */ -void server_to_text() -{ +// translate server message output to text (used for editing room info files and such) +void server_to_text() { char buf[SIZ]; int count = 0; 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 - * usual 000 terminator is found. Caller is responsible for freeing - * the returned pointer. - */ -int read_server_text(StrBuf *Buf, long *nLines) -{ - wcsession *WCC = WC; +// 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) { + StrBuf *ReadBuf; long nRead; long nTotal = 0; long nlines; nlines = 0; - while ((WCC->serv_sock!=-1) && - (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) )) + ReadBuf = NewStrBuf(); + while ((WC->serv_sock!=-1) && + (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; } -void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) { StrBufAppendPrintf(Target, "%d", WC->ctdl_pid); } -void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +void tmplput_serv_admin(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; - StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0); + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_sysadm, 0); } -void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; - StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0); + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_nodename, 0); } -void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; - StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0); + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_humannode, 0); } -void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; - StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_software, 0); + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_fqdn, 0); } -void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; - StrBufAppendPrintf(Target, "%d.%02d", - WCC->serv_info->serv_rev_level / 100, - WCC->serv_info->serv_rev_level % 100); + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_software, 0); } -int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) + +void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; + StrBufAppendPrintf(Target, "%d", WC->serv_info->serv_rev_level); +} +int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return 0; - return WCC->serv_info->serv_newuser_disabled != 0; + return WC->serv_info->serv_newuser_disabled != 0; } -int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) + +int conditional_serv_supports_guest(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return 0; - return WCC->serv_info->serv_supports_openid != 0; + return WC->serv_info->serv_supports_guest != 0; } -void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) -{ - wcsession *WCC = WC; - if (WCC->serv_info == NULL) +int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) + return 0; + return WC->serv_info->serv_supports_openid != 0; +} + +int conditional_serv_fulltext_enabled(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) + return 0; + return WC->serv_info->serv_fulltext_enabled != 0; +} + +int conditional_serv_ldap_enabled(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) + return 0; + return WC->serv_info->serv_supports_ldap != 0; +} + +void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) { + if (WC->serv_info == NULL) return; StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0); } - -void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) -{ +void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) { int n = 0; int Done = 0; StrBuf *Line; @@ -709,25 +531,76 @@ void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) FreeStrBuf(&Line); } +void tmplput_site_prefix(StrBuf *Target, WCTemplputParams *TP) { + if ((WC != NULL) && (WC->Hdr->HostHeader != NULL)) { + StrBufAppendTemplate(Target, TP, WC->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) { - is_uds = strcasecmp(ctdlhost, "uds") == 0; - 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); + + } @@ -738,4 +611,3 @@ SessionDestroyModule_SERVFUNC { DeleteServInfo(&sess->serv_info); } -/*@}*/