X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fserv_func.c;h=7dbc16c940d10037122e841f8e2df9d115492a78;hb=c1bfa993f32198515f9994cde602f7bcd4da35d8;hp=a01184f35b88907007f55059495a00f7e73a8225;hpb=9cf809f80eb6bf3f864eeeeb20c7ad277500ccf6;p=citadel.git diff --git a/webcit/serv_func.c b/webcit/serv_func.c index a01184f35..7dbc16c94 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,63 +62,69 @@ 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; } @@ -146,7 +170,7 @@ void _fmout(StrBuf *Target, char *align) /** Activate embedded URL's */ url(buf, sizeof(buf)); - escputs(buf);//// TODO: Target + escputs(buf); StrBufAppendBufPlain(Target, HKEY("\n"), 0); } if (bq == 1) { @@ -168,7 +192,7 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) long len; int intext = 0; - StrBufAppendPrintf(Target, "
\n", align); + StrBufAppendPrintf(Target, "
\n", align); while ((n = StrBufSipLine(Line, Source, &BufPtr), n >= 0) && !done) { done = n == 0; @@ -179,7 +203,7 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) pte = ptr + len; if ((intext == 1) && (isspace(*ptr))) { - StrBufAppendBufPlain(Target, HKEY("
"), 0); + StrBufAppendBufPlain(Target, HKEY("
"), 0); } intext = 1; if (isspace(*ptr)) while ((ptr < pte) && @@ -217,7 +241,7 @@ void FmOut(StrBuf *Target, char *align, StrBuf *Source) } for (i = 0; i < bn; i++) StrBufAppendBufPlain(Target, HKEY(""), 0); - StrBufAppendBufPlain(Target, HKEY("

\n"), 0); + StrBufAppendBufPlain(Target, HKEY("

\n"), 0); FreeStrBuf(&Line); FreeStrBuf(&Line1); FreeStrBuf(&Line2); @@ -414,14 +438,12 @@ void server_to_text() * server READ commands. * \return the read content as StrBuf */ -int read_server_binary(StrBuf *Ret, 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; - Buf = NewStrBuf(); if (Ret == NULL) return -1; @@ -438,16 +460,16 @@ int read_server_binary(StrBuf *Ret, size_t total_len) serv_printf("READ %d|%d", (int)bytes, (int)thisblock); if (StrBuf_ServGetln(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) { FlushStrBuf(Ret); FreeStrBuf(&Buf); return -1; } - StrBuf_ServGetBLOB(Ret, thisblock); + StrBuf_ServGetBLOBBuffered(Ret, thisblock); bytes += thisblock; } else { @@ -457,7 +479,6 @@ int read_server_binary(StrBuf *Ret, size_t total_len) } } } - FreeStrBuf(&Buf); return StrLength(Ret); } @@ -469,7 +490,7 @@ int read_server_binary(StrBuf *Ret, size_t total_len) */ int read_server_text(StrBuf *Buf, long *nLines) { - struct wcsession *WCC = WC; + wcsession *WCC = WC; long nRead; long nTotal = 0; long nlines; @@ -503,71 +524,126 @@ int GetServerStatus(StrBuf *Line, long* FullState) } -void tmplput_serv_ip(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_ip(StrBuf *Target, WCTemplputParams *TP) { StrBufAppendPrintf(Target, "%d", WC->ctdl_pid); } -void tmplput_serv_nodename(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_nodename(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, serv_info.serv_nodename, 0, 0); + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_nodename, 0); } -void tmplput_serv_humannode(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_humannode(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, serv_info.serv_humannode, 0, 0); + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_humannode, 0); } -void tmplput_serv_fqdn(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_fqdn(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, serv_info.serv_fqdn, 0, 0); + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; + StrBufAppendTemplate(Target, TP, WCC->serv_info->serv_fqdn, 0); } -void tmmplput_serv_software(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_software(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, serv_info.serv_software, 0, 0); + 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, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_rev_level(StrBuf *Target, WCTemplputParams *TP) { + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return; StrBufAppendPrintf(Target, "%d.%02d", - serv_info.serv_rev_level / 100, - serv_info.serv_rev_level % 100); + WCC->serv_info->serv_rev_level / 100, + WCC->serv_info->serv_rev_level % 100); } - -void tmmplput_serv_bbs_city(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +int conditional_serv_newuser_disabled(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, serv_info.serv_bbs_city, 0, 0); + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_newuser_disabled != 0; } - -void tmplput_current_user(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +int conditional_serv_supports_openid(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, WC->wc_fullname, 0, 0); + wcsession *WCC = WC; + if (WCC->serv_info == NULL) + return 0; + return WCC->serv_info->serv_supports_openid != 0; } -void tmplput_current_room(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context, int ContextType) +void tmplput_serv_bbs_city(StrBuf *Target, WCTemplputParams *TP) { - StrEscAppend(Target, NULL, WC->wc_roomname, 0, 0); + 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) { - RegisterNamespace("CURRENT_USER", 0, 0, tmplput_current_user, CTX_NONE); - RegisterNamespace("CURRENT_ROOM", 0, 0, tmplput_current_room, CTX_NONE); + + 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, 0, tmplput_serv_nodename, CTX_NONE); - RegisterNamespace("SERV:HUMANNODE", 0, 0, tmplput_serv_humannode, CTX_NONE); - RegisterNamespace("SERV:FQDN", 0, 0, tmplput_serv_fqdn, CTX_NONE); - RegisterNamespace("SERV:SOFTWARE", 0, 0, tmmplput_serv_software, 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, 0, tmmplput_serv_bbs_city, CTX_NONE); -/// RegisterNamespace("SERV:LDAP_SUPP", 0, 0, tmmplput_serv_ldap_enabled, 0); + 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); */ } /*@}*/