X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=50dd83b52b9212bfc6bce34ce01b4793b26fe8bf;hb=3395b2dbe9d460d5381497850ed833c60befb746;hp=a5604c2257fa1c93bf36b733a68ab3a804720b0c;hpb=5685e790de93f77083ea240f474a4870b194c550;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index a5604c225..50dd83b52 100644 --- a/webcit/serv_func.c +++ b/webcit/serv_func.c @@ -5,31 +5,49 @@ #include "webcit.h" #include "webserver.h" -struct serv_info serv_info; /**< our connection data to the server */ -HashList *ServHash = NULL;//// TODO; + +void DeleteServInfo(ServInfo **FreeMe) +{ + if (*FreeMe == NULL) + return; + FreeStrBuf(&(*FreeMe)->serv_nodename); + FreeStrBuf(&(*FreeMe)->serv_humannode); + FreeStrBuf(&(*FreeMe)->serv_fqdn); + 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); + *FreeMe = NULL; +} + /* * get info about the server we've connected to * * browser_host the citadell we want to connect to * user_agent which browser uses our client? */ -void get_serv_info(char *browser_host, char *user_agent) +ServInfo *get_serv_info(StrBuf *browser_host, char *user_agent) { + ServInfo *info; + StrBuf *Buf; char buf[SIZ]; int a; /** 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, - browser_host + DEVELOPER_ID, + CLIENT_ID, + CLIENT_VERSION, + user_agent, + ChrPtr(browser_host) ); serv_getln(buf, sizeof buf); /** Tell the server what kind of richtext we prefer */ - serv_puts("MSGP text/html|text/plain"); + serv_puts("MSGP text/calendar|text/html|text/plain"); serv_getln(buf, sizeof buf); /* @@ -44,78 +62,89 @@ void get_serv_info(char *browser_host, char *user_agent) serv_puts("INFO"); serv_getln(buf, sizeof buf); if (buf[0] != '1') - return; + return NULL; + info = (ServInfo*)malloc(sizeof(ServInfo)); + memset(info, 0, sizeof(ServInfo)); a = 0; - while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { + Buf = NewStrBuf(); + while (StrBuf_ServGetln(Buf), (strcmp(ChrPtr(Buf), "000")!= 0)) { +/* lprintf (1, "a: %d [%s]", a, ChrPtr(Buf));*/ switch (a) { case 0: - serv_info.serv_pid = atoi(buf); - WC->ctdl_pid = serv_info.serv_pid; + info->serv_pid = StrToi(Buf); + WC->ctdl_pid = info->serv_pid; break; case 1: - safestrncpy(serv_info.serv_nodename, buf, sizeof serv_info.serv_nodename); + info->serv_nodename = NewStrBufDup(Buf); break; case 2: - safestrncpy(serv_info.serv_humannode, buf, sizeof serv_info.serv_humannode); + info->serv_humannode = NewStrBufDup(Buf); break; case 3: - safestrncpy(serv_info.serv_fqdn, buf, sizeof serv_info.serv_fqdn); + info->serv_fqdn = NewStrBufDup(Buf); break; case 4: - safestrncpy(serv_info.serv_software, buf, sizeof serv_info.serv_software); + info->serv_software = NewStrBufDup(Buf); break; case 5: - serv_info.serv_rev_level = atoi(buf); + info->serv_rev_level = StrToi(Buf); break; case 6: - safestrncpy(serv_info.serv_bbs_city, buf, sizeof serv_info.serv_bbs_city); + info->serv_bbs_city = NewStrBufDup(Buf); break; case 7: - safestrncpy(serv_info.serv_sysadm, buf, sizeof serv_info.serv_sysadm); + info->serv_sysadm = NewStrBufDup(Buf); break; case 9: - safestrncpy(serv_info.serv_moreprompt, buf, sizeof serv_info.serv_moreprompt); + info->serv_moreprompt = NewStrBufDup(Buf); break; case 14: - serv_info.serv_supports_ldap = atoi(buf); + info->serv_supports_ldap = StrToi(Buf); break; case 15: - serv_info.serv_newuser_disabled = atoi(buf); + info->serv_newuser_disabled = StrToi(Buf); break; case 16: - safestrncpy(serv_info.serv_default_cal_zone, buf, sizeof serv_info.serv_default_cal_zone); + info->serv_default_cal_zone = NewStrBufDup(Buf); break; case 20: - serv_info.serv_supports_sieve = atoi(buf); + info->serv_supports_sieve = StrToi(Buf); break; case 21: - serv_info.serv_fulltext_enabled = atoi(buf); + info->serv_fulltext_enabled = StrToi(Buf); break; case 22: - safestrncpy(serv_info.serv_svn_revision, buf, sizeof serv_info.serv_svn_revision); + info->serv_svn_revision = NewStrBufDup(Buf); break; case 23: - serv_info.serv_supports_openid = atoi(buf); + info->serv_supports_openid = StrToi(Buf); break; } ++a; } + FreeStrBuf(&Buf); + return info; } /** - * \brief Read Citadel variformat text and spit it out as HTML. - * \param align html align string + * Read Citadel variformat text and spit it out as HTML. + * align html align string */ -void fmout(char *align) +inline void fmout(char *align) +{ + _fmout(WC->WBuf, align); +} + +void _fmout(StrBuf *Target, char *align) { int intext = 0; int bq = 0; char buf[SIZ]; - wprintf("
\n", align); + StrBufAppendPrintf(Target, "
\n", align); while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) { if ((intext == 1) && (isspace(buf[0]))) { @@ -129,10 +158,10 @@ void fmout(char *align) * " >" quotes and will convert to
tags. */ if ((bq == 0) && (!strncmp(buf, " >", 2))) { - wprintf("
"); + StrBufAppendBufPlain(Target, HKEY("
"), 0); bq = 1; } else if ((bq == 1) && (strncmp(buf, " >", 2))) { - wprintf("
"); + StrBufAppendBufPlain(Target, HKEY("
"), 0); bq = 0; } if ((bq == 1) && (!strncmp(buf, " >", 2))) { @@ -142,7 +171,7 @@ void fmout(char *align) url(buf, sizeof(buf)); escputs(buf); - wprintf("\n"); + StrBufAppendBufPlain(Target, HKEY("\n"), 0); } if (bq == 1) { wprintf(""); @@ -150,11 +179,79 @@ void fmout(char *align) wprintf("

\n"); } +void FmOut(StrBuf *Target, char *align, StrBuf *Source) +{ + const char *ptr, *pte; + const char *BufPtr = NULL; + StrBuf *Line = NewStrBuf(); + StrBuf *Line1 = NewStrBuf(); + StrBuf *Line2 = NewStrBuf(); + int bn = 0; + int bq = 0; + int i, n, done = 0; + 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 (*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; + + if (StrLength(Line) == 0) + continue; + /** Activate embedded URL's */ + UrlizeText(Line1, Line, Line2); + + StrEscAppend(Target, Line1, NULL, 0, 0); + + StrBufAppendBufPlain(Target, HKEY("\n"), 0); + } + for (i = 0; i < bn; i++) + StrBufAppendBufPlain(Target, HKEY("
"), 0); + StrBufAppendBufPlain(Target, HKEY("

\n"), 0); + FreeStrBuf(&Line); + FreeStrBuf(&Line1); + FreeStrBuf(&Line2); +} + /** - * \brief Read Citadel variformat text and spit it out as HTML in a form + * 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!) */ @@ -197,9 +294,9 @@ void pullquote_fmout(void) { /** - * \brief Transmit message text (in memory) to the server. + * Transmit message text (in memory) to the server. * - * \param ptr Pointer to the message being transmitted + * ptr Pointer to the message being transmitted */ void text_to_server(char *ptr) { @@ -240,10 +337,10 @@ void text_to_server(char *ptr) /** - * \brief Transmit message text (in memory) to the server, + * Transmit message text (in memory) to the server, * converting to Quoted-Printable encoding as we go. * - * \param ptr Pointer to the message being transmitted + * ptr Pointer to the message being transmitted */ void text_to_server_qp(char *ptr) { @@ -316,7 +413,7 @@ void text_to_server_qp(char *ptr) /** - * \brief translate server message output to text + * translate server message output to text * (used for editing room info files and such) */ void server_to_text() @@ -341,81 +438,212 @@ void server_to_text() * server READ commands. * \return the read content as StrBuf */ -StrBuf *read_server_binary(size_t total_len) +int read_server_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf) { char buf[SIZ]; size_t bytes = 0; size_t thisblock = 0; - StrBuf *Buf; - StrBuf *Ret = NULL; - - Buf = NewStrBuf(); + if (Ret == NULL) + return -1; + while (bytes < total_len) { thisblock = 4095; if ((total_len - bytes) < thisblock) { thisblock = total_len - bytes; if (thisblock == 0) { - FreeStrBuf(&Ret); + FlushStrBuf(Ret); FreeStrBuf(&Buf); - return NULL; + return -1; } } serv_printf("READ %d|%d", (int)bytes, (int)thisblock); - if (StrBuf_ServGetln(Buf) > 0) + if (StrBuf_ServGetlnBuffered(Buf) > 0) { - if (ChrPtr(Buf)[0] == '6') - { - StrBufCutLeft(Buf, 4); //thisblock = (size_t)atoi(&buf[4]); + if (GetServerStatus(Buf, NULL) == 6) + { + StrBufCutLeft(Buf, 4); thisblock = StrTol(Buf); if (!WC->connected) { - FreeStrBuf(&Ret); + FlushStrBuf(Ret); FreeStrBuf(&Buf); - return NULL; + return -1; } - if (Ret == NULL) Ret = NewStrBuf(); - StrBuf_ServGetBLOB(Ret, thisblock); + StrBuf_ServGetBLOBBuffered(Ret, thisblock); bytes += thisblock; } else { FreeStrBuf(&Buf); lprintf(3, "Error: %s\n", &buf[4]); - return NULL; + return -1; } } } - return Ret; + return StrLength(Ret); } /** - * \brief 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. */ -StrBuf *read_server_text(long *nLines) +int read_server_text(StrBuf *Buf, long *nLines) { - struct wcsession *WCC = WC; - StrBuf *Buf; + wcsession *WCC = WC; long nRead; + long nTotal = 0; long nlines; - const char *buf; - Buf = NewStrBuf(); - buf = ChrPtr(Buf); nlines = 0; while ((WCC->serv_sock!=-1) && - (nRead = StrBuf_ServGetln(Buf)), - (nRead >= 0) && - (buf += nRead), (strcmp(buf, "000") != 0)) { - + (nRead = StrBuf_ServGetln(Buf), (nRead >= 0) )) + { + if (strcmp(ChrPtr(Buf) + nTotal, "000") != 0) { + StrBufCutRight(Buf, nRead); + break; + } + nTotal += nRead; nlines ++; } *nLines = nlines; - return Buf; + return nTotal; } + + + +int GetServerStatus(StrBuf *Line, long* FullState) +{ + if (FullState != NULL) + *FullState = StrTol(Line); + return ChrPtr(Line)[0] - 48; +} + + +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) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0); +} + +void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0); +} + +void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0); +} + +void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_software, 0); +} + +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); +} +int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_newuser_disabled != 0; +} +int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_supports_openid != 0; +} + +void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) +{ + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WC->serv_info->serv_bbs_city, 0); +} + + +void tmplput_mesg(StrBuf *Target, WCTemplputParams *TP) +{ + int n = 0; + int Done = 0; + StrBuf *Line; + StrBuf *Buf; + + Buf = NewStrBuf(); + Line = NewStrBuf(); + serv_printf("MESG %s", TP->Tokens->Params[0]->Start); + + StrBuf_ServGetln(Line); + if (GetServerStatus(Line, NULL) == 1) { + while (!Done && (StrBuf_ServGetln(Line)>=0)) { + if ( (StrLength(Line)==3) && + !strcmp(ChrPtr(Line), "000")) + Done = 1; + else + { + if (n > 0) + StrBufAppendBufPlain(Buf, "\n", 1, 0); + StrBufAppendBuf(Buf, Line, 0); + } + n++; + } + + FlushStrBuf(Line); + FmOut(Line, "center", Buf); + StrBufAppendTemplate(Target, TP, Line, 1); + } + FreeStrBuf(&Buf); + FreeStrBuf(&Line); +} + +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); */ +} + /*@}*/