#include "webcit.h"
#include "webserver.h"
+extern char *static_dirs[PATH_MAX]; /**< Disk representation */
+
HashList *WirelessTemplateCache;
HashList *WirelessLocalTemplateCache;
HashList *TemplateCache;
HashList *LocalTemplateCache;
-typedef struct _TemplateToken {
- const char *pTokenStart;
- size_t TokenStart;
- size_t TokenEnd;
- const char *pTokenEnd;
-
- const char *pName;
- size_t NameEnd;
-
- int HaveParameters;
- int nParameters;
- size_t ParamStart [10];
- size_t ParamEnd [10];
-} WCTemplateToken;
+HashList *GlobalNS;
+HashList *Iterators;
typedef struct _WCTemplate {
StrBuf *Data;
WCTemplateToken **Tokens;
} WCTemplate;
-HashList *GlobalNS;
-
typedef struct _HashHandler {
- int foo;
+ int nMinArgs;
+ int nMaxArgs;
+ WCHandlerFunc HandlerFunc;
}HashHandler;
-typedef int (*HandlerFunc)(int nArgs, va_list vaarg);
-void RegisterNS(const char *NSName, int nMinArgs, int nMaxArgs, HandlerFunc Handler)
+void RegisterNS(const char *NSName, long len, int nMinArgs, int nMaxArgs, WCHandlerFunc HandlerFunc)
{
-
+ HashHandler *NewHandler;
+
+ NewHandler = (HashHandler*) malloc(sizeof(HashHandler));
+ NewHandler->nMinArgs = nMinArgs;
+ NewHandler->nMaxArgs = nMaxArgs;
+ NewHandler->HandlerFunc = HandlerFunc;
+ Put(GlobalNS, NSName, len, NewHandler, NULL);
}
+void SVPUTBuf(const char *keyname, int keylen, StrBuf *Buf, int ref)
+{
+ wcsubst *ptr;
+ void *vPtr;
+ struct wcsession *WCC = WC;
+
+ /**
+ * First look if we're doing a replacement of
+ * an existing key
+ */
+ /*PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
+ if (GetHash(WCC->vars, keyname, keylen, &vPtr)) {
+ ptr = (wcsubst*)vPtr;
+ if (ptr->wcs_value != NULL)
+ free(ptr->wcs_value);///TODO: respect type
+ }
+ else /** Otherwise allocate a new one */
+ {
+ ptr = (wcsubst *) malloc(sizeof(wcsubst));
+ safestrncpy(ptr->wcs_key, keyname, sizeof ptr->wcs_key);
+ Put(WCC->vars, keyname, keylen, ptr, deletevar);
+ }
+
+ ptr->wcs_value = NULL;
+ ptr->wcs_type = (ref)?WCS_STRBUF:WCS_STRBUF_REF;
+ ptr->wcs_function = (var_callback_fptr) Buf; ////TODO
+}
+
/**
* \brief back end for print_value_of() ... does a server command
* \param servcmd server command to execute on the citadel server
*/
-void pvo_do_cmd(char *servcmd) {
+void pvo_do_cmd(StrBuf *Target, char *servcmd) {
char buf[SIZ];
+ int len;
serv_puts(servcmd);
- serv_getln(buf, sizeof buf);
+ len = serv_getln(buf, sizeof buf);
switch(buf[0]) {
case '2':
case '3':
case '5':
- wprintf("%s\n", &buf[4]);
+ StrBufAppendPrintf(Target, "%s\n", &buf[4]);
break;
case '1':
- fmout("CENTER");
+ _fmout(Target, "CENTER");
break;
case '4':
- wprintf("%s\n", &buf[4]);
+ StrBufAppendPrintf(Target, "%s\n", &buf[4]);
serv_puts("000");
break;
}
* \brief Print the value of a variable
* \param keyname get a key to print
*/
-void print_value_of(const char *keyname, size_t keylen) {
+void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) {
struct wcsession *WCC = WC;
wcsubst *ptr;
void *fcn();
/*if (WCC->vars != NULL) PrintHash(WCC->vars, VarPrintTransition, VarPrintEntry);*/
if (keyname[0] == '=') {
- DoTemplate(keyname+1, keylen - 1);
+ DoTemplate(keyname+1, keylen - 1, NULL, NULL);
}
/** Page-local variables */
if ((WCC->vars!= NULL) && GetHash(WCC->vars, keyname, keylen, &vVar)) {
ptr = (wcsubst*) vVar;
switch(ptr->wcs_type) {
case WCS_STRING:
- wprintf("%s", (const char*)ptr->wcs_value);
+ StrBufAppendBufPlain(Target, (const char*)ptr->wcs_value, -1, 0);
break;
case WCS_SERVCMD:
- pvo_do_cmd(ptr->wcs_value);
+ pvo_do_cmd(Target, ptr->wcs_value);
break;
case WCS_FUNCTION:
(*ptr->wcs_function) ();
break;
+ case WCS_STRBUF:
+ case WCS_STRBUF_REF:
+ StrBufAppendBuf(Target, (StrBuf*) ptr->wcs_function, 0);
+ break;
default:
lprintf(1,"WARNING: invalid value in SV-Hash at %s!", keyname);
}
}
- else {
- char ch;
- ch = keyname[keylen];
- ((char*) keyname)[keylen] = '\0'; ////TODO
- if (!strcasecmp(keyname, "SERV_PID")) {
- wprintf("%d", WCC->ctdl_pid);
- }
-
- else if (!strcasecmp(keyname, "SERV_NODENAME")) {
- escputs(serv_info.serv_nodename);
- }
-
- else if (!strcasecmp(keyname, "SERV_HUMANNODE")) {
- escputs(serv_info.serv_humannode);
- }
-
- else if (!strcasecmp(keyname, "SERV_FQDN")) {
- escputs(serv_info.serv_fqdn);
- }
-
- else if (!strcasecmp(keyname, "SERV_SOFTWARE")) {
- escputs(serv_info.serv_software);
- }
-
- else if (!strcasecmp(keyname, "SERV_REV_LEVEL")) {
- wprintf("%d.%02d",
- serv_info.serv_rev_level / 100,
- serv_info.serv_rev_level % 100
- );
- }
-
- else if (!strcasecmp(keyname, "SERV_BBS_CITY")) {
- escputs(serv_info.serv_bbs_city);
- }
-
- else if (!strcasecmp(keyname, "CURRENT_USER")) {
- escputs(WCC->wc_fullname);
- }
-
- else if (!strcasecmp(keyname, "CURRENT_ROOM")) {
- escputs(WCC->wc_roomname);
- }
- ((char*) keyname)[keylen] = ch;//// TODO
-
- }
-
}
-extern char *static_dirs[PATH_MAX]; /**< Disk representation */
-
void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
{
Template->TokenSpace *= 2;
Template->Tokens = NewTokens;
}
-
-
}
Template->Tokens[(Template->nTokensUsed)++] = NewToken;
}
-WCTemplateToken *NewTemlpateSubstitute(const char *pStart, const char *pTmplStart, const char *pTmplEnd)
+TemplateParam *GetNextParamter(StrBuf *Buf, const char **pCh, const char *pe)
{
+ const char *pch = *pCh;
+ const char *pchs, *pche;
+ TemplateParam *Parm = (TemplateParam *) malloc(sizeof(TemplateParam));
+ char quote = '\0';
+
+ /* Skip leading whitespaces */
+ while ((*pch == ' ' )||
+ (*pch == '\t')||
+ (*pch == '\r')||
+ (*pch == '\n')) pch ++;
+ if (*pch == '"')
+ quote = '"';
+ else if (*pch == '\'')
+ quote = '\'';
+ if (quote != '\0') {
+ pch ++;
+ pchs = pch;
+ Parm->Type = TYPE_STR;
+ while (pch <= pe &&
+ ((*pch != quote) ||
+ ( (pch > pchs) && (*(pch - 1) == '\\'))
+ )) {
+ pch ++;
+ }
+ pche = pch;
+ if (*pch != quote) {
+ lprintf(1, "Error evaluating template param [%s]\n", *pCh);
+ pch ++;
+ free(Parm);
+ return NULL;
+ }
+ else {
+ StrBufPeek(Buf, pch, -1, '\0');
+ lprintf(1, "DBG: got param [%s]\n", pchs);
+ Parm->Start = pchs;
+ Parm->len = pche - pchs;
+ pch ++; /* move after trailing quote */
+ }
+ }
+ else {
+ Parm->Type = TYPE_LONG;
+ pchs = pch;
+ while ((pch <= pe) &&
+ (isdigit(*pch) ||
+ (*pch == '+') ||
+ (*pch == '-')))
+ pch ++;
+ pch ++;
+ if (pch - pchs > 1){
+ StrBufPeek(Buf, pch, -1, '\0');
+ Parm->lvalue = atol(pchs);
+ Parm->Start = pchs;
+ pch++;
+ }
+ else {
+ Parm->lvalue = 0;
+ lprintf(1, "Error evaluating template long param [%s]", *pCh);
+ free(Parm);
+ return NULL;
+ }
+ }
+ while ((*pch == ' ' )||
+ (*pch == '\t')||
+ (*pch == '\r')||
+ (*pch == ',' )||
+ (*pch == '\n')) pch ++;
+
+ *pCh = pch;
+ return Parm;
+}
+
+WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
+ const char *pStart,
+ const char *pTmplStart,
+ const char *pTmplEnd)
+{
+ const char *pch;
+ TemplateParam *Param;
WCTemplateToken *NewToken = (WCTemplateToken*)malloc(sizeof(WCTemplateToken));
+ NewToken->IsGettext = 0;
NewToken->pTokenStart = pTmplStart;
NewToken->TokenStart = pTmplStart - pStart;
NewToken->TokenEnd = (pTmplEnd - pStart) - NewToken->TokenStart;
NewToken->pTokenEnd = pTmplEnd;
-
- NewToken->pName = pTmplStart + 2;
NewToken->NameEnd = NewToken->TokenEnd - 2;
+
+ StrBufPeek(Buf, pTmplStart, + 1, '\0');
+ StrBufPeek(Buf, pTmplEnd, -1, '\0');
+ pch = NewToken->pName = pTmplStart + 2;
+
NewToken->HaveParameters = 0;;
NewToken->nParameters = 0;
- NewToken->ParamStart[0] = 0;
- NewToken->ParamEnd[0] = 0;
+
+ while (pch < pTmplEnd - 1) {
+ if (*pch == '(') {
+ StrBufPeek(Buf, pch, -1, '\0');
+ NewToken->NameEnd = pch - NewToken->pName;
+ pch ++;
+ while (pch < pTmplEnd - 1) {
+ Param = GetNextParamter(Buf, &pch, pTmplEnd - 1);
+ if (Param != NULL) {
+ NewToken->HaveParameters = 1;
+ if (NewToken->nParameters > MAXPARAM) {
+ lprintf(1, "Only %ld Tokens supported!\n", MAXPARAM);
+ return NULL;
+ }
+ NewToken->Params[NewToken->nParameters++] = Param;
+ }
+ else break;
+ }
+ if((NewToken->NameEnd == 1) &&
+ (NewToken->HaveParameters == 1) &&
+ (NewToken->nParameters == 1) &&
+ (*(NewToken->pName) == '_'))
+ NewToken->IsGettext = 1;
+ }
+ else pch ++;
+ }
return NewToken;
}
free(FreeMe);
}
-void EvaluateToken(StrBuf *Target, WCTemplateToken *Token)
+void EvaluateToken(StrBuf *Target, WCTemplateToken *Token, void *Context)
{
-
-
-
- print_value_of(Token->pName, Token->NameEnd);
+ void *vVar;
+// much output, since pName is not terminated...
+// lprintf(1,"Doing token: %s\n",Token->pName);
+ if (Token->IsGettext)
+ TmplGettext(Target, Token->nParameters, Token);
+ else if (GetHash(GlobalNS, Token->pName, Token->NameEnd, &vVar)) {
+ HashHandler *Handler;
+ Handler = (HashHandler*) vVar;
+ if ((Token->nParameters < Handler->nMinArgs) ||
+ (Token->nParameters > Handler->nMaxArgs)) {
+ lprintf(1, "Handler [%s] doesn't work with %ld params",
+ Token->pName,
+ Token->nParameters);
+ }
+ else {
+ Handler->HandlerFunc(Target,
+ Token->nParameters,
+ Token,
+ Context); /*TODO: subset of that */
+
+
+ }
+ }
+ else {
+ print_value_of(Target, Token->pName, Token->NameEnd);
+ }
}
-
-void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target)
+void ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, void *Context)
{
int done = 0;
int i;
i = 0;
while (!done) {
if (i >= Tmpl->nTokensUsed) {
- StrBufAppendBufPlain(Target, pData, len, 0);
+ StrBufAppendBufPlain(Target,
+ pData,
+ len - (pData - pS), 0);
done = 1;
}
else {
StrBufAppendBufPlain(
Target, pData,
Tmpl->Tokens[i]->pTokenStart - pData, 0);
- EvaluateToken(Target, Tmpl->Tokens[i]);
+ EvaluateToken(Target, Tmpl->Tokens[i], Context);
pData = Tmpl->Tokens[i++]->pTokenEnd + 1;
}
}
-
}
fd = open(ChrPtr(filename), O_RDONLY);
if (fd <= 0) {
- wprintf(_("ERROR: could not open template "));
- wprintf("'%s' - %s<br />\n",
+ lprintf(1, "ERROR: could not open template '%s' - %s\n",
ChrPtr(filename), strerror(errno));
return NULL;
}
if (fstat(fd, &statbuf) == -1) {
- wprintf(_("ERROR: could not stat template "));
- wprintf("'%s' - %s<br />\n",
+ lprintf(1, "ERROR: could not stat template '%s' - %s\n",
ChrPtr(filename), strerror(errno));
return NULL;
}
if (StrBufReadBLOB(NewTemplate->Data, &fd, 1, statbuf.st_size, &Err) < 0) {
close(fd);
FreeWCTemplate(NewTemplate);
- wprintf(_("ERROR: reading template "));
- wprintf("'%s' - %s<br />\n",
+ lprintf(1, "ERROR: reading template '%s' - %s<br />\n",
ChrPtr(filename), strerror(errno));
return NULL;
}
if (pch + 1 >= pE)
continue;
pte = pch;
- PutNewToken(NewTemplate, NewTemlpateSubstitute(pS, pts, pte));
+ PutNewToken(NewTemplate,
+ NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte));
pch ++;
}
Put(PutThere, ChrPtr(Key), StrLength(Key), NewTemplate, FreeWCTemplate);
* \brief Display a variable-substituted template
* \param templatename template file to load
*/
-void DoTemplate(const char *templatename, long len)
+void DoTemplate(const char *templatename, long len, void *Context, StrBuf *Target)
{
HashList *Static;
HashList *StaticLocal;
void *vTmpl;
-
+
+ if (Target == NULL)
+ Target = WC->WBuf;
if (WC->is_mobile) {
Static = WirelessTemplateCache;
StaticLocal = WirelessLocalTemplateCache;
}
if (vTmpl == NULL)
return;
- ProcessTemplate(vTmpl, WC->WBuf);
-
+ ProcessTemplate(vTmpl, Target, Context);
}
int LoadTemplateDir(const char *DirName, HashList *wireless, HashList *big)
IsMobile = (strstr(filedir_entry->d_name, ".m.html")!= NULL);
PStart = filedir_entry->d_name;
- StrBufPrintf(FileName, "%s/t/%s", ChrPtr(Dir), filedir_entry->d_name);
+ StrBufPrintf(FileName, "%s/%s", ChrPtr(Dir), filedir_entry->d_name);
MinorPtr = strchr(filedir_entry->d_name, '.');
if (MinorPtr != NULL)
*MinorPtr = '\0';
void InitTemplateCache(void)
{
-
LoadTemplateDir(static_dirs[0],
WirelessTemplateCache,
TemplateCache);
LoadTemplateDir(static_dirs[1],
WirelessLocalTemplateCache,
LocalTemplateCache);
+}
+
+void tmplput_serv_ip(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ StrBufAppendPrintf(Target, "%d", WC->ctdl_pid);
+}
+void tmplput_serv_nodename(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(serv_info.serv_nodename); ////TODO: respcect Target
+}
+
+void tmplput_serv_humannode(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(serv_info.serv_humannode);////TODO: respcect Target
+}
+
+void tmplput_serv_fqdn(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(serv_info.serv_fqdn);////TODO: respcect Target
+}
+
+void tmmplput_serv_software(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(serv_info.serv_software);////TODO: respcect Target
+}
+
+void tmplput_serv_rev_level(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ StrBufAppendPrintf(Target, "%d.%02d",
+ serv_info.serv_rev_level / 100,
+ serv_info.serv_rev_level % 100);
+}
+
+void tmmplput_serv_bbs_city(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(serv_info.serv_bbs_city);////TODO: respcect Target
+}
+void tmplput_current_user(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(WC->wc_fullname);////TODO: respcect Target
+}
+
+void tmplput_current_room(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ escputs(WC->wc_roomname);////TODO: respcect Target
+}
+
+
+typedef struct _HashIterator {
+ HashList *StaticList;
+ RetrieveHashlistFunc GetHash;
+ HashDestructorFunc Destructor;
+ SubTemplFunc DoSubTemplate;
+} HashIterator;
+
+void tmpl_iterate_subtmpl(StrBuf *Target, int nArgs, WCTemplateToken *Tokens, void *Context)
+{
+ void *vIt;
+ HashIterator *It;
+ HashList *List;
+ HashPos *it;
+ long len;
+ const char *Key;
+ void *vContext;
+ StrBuf *SubBuf;
+
+ if (!GetHash(Iterators,
+ Tokens->Params[0]->Start,
+ Tokens->Params[0]->len,
+ &vIt))
+ return;
+ It = (HashIterator*) vIt;
+ if (It->StaticList == NULL)
+ List = It->GetHash();
+ else
+ List = It->StaticList;
+
+ SubBuf = NewStrBuf();
+ it = GetNewHashPos();
+ while (GetNextHashPos(List, it, &len, &Key, &vContext)) {
+ It->DoSubTemplate(SubBuf, vContext);
+ DoTemplate(Tokens->Params[1]->Start,
+ Tokens->Params[1]->len,
+ vContext, SubBuf);
+
+ StrBufAppendBuf(Target, SubBuf, 0);
+ FlushStrBuf(SubBuf);
+ }
+ DeleteHashPos(&it);
+ It->Destructor(List);
+}
+
+
+void RegisterITERATOR(const char *Name, long len,
+ HashList *StaticList,
+ RetrieveHashlistFunc GetHash,
+ SubTemplFunc DoSubTempl,
+ HashDestructorFunc Destructor)
+{
+ HashIterator *It = (HashIterator*)malloc(sizeof(HashIterator));
+ It->StaticList = StaticList;
+ It->GetHash = GetHash;
+ It->DoSubTemplate = DoSubTempl;
+ It->Destructor = Destructor;
+ Put(Iterators, Name, len, It, NULL);
}
void
InitModule_SUBST
(void)
{
-
+ RegisterNamespace("SERV_PID", 0, 0, tmplput_serv_ip);
+ RegisterNamespace("SERV_NODENAME", 0, 0, tmplput_serv_nodename);
+ RegisterNamespace("SERV_HUMANNODE", 0, 0, tmplput_serv_humannode);
+ RegisterNamespace("SERV_FQDN", 0, 0, tmplput_serv_fqdn);
+ RegisterNamespace("SERV_SOFTWARE", 0, 0, tmmplput_serv_software);
+ RegisterNamespace("SERV_REV_LEVEL", 0, 0, tmplput_serv_rev_level);
+ RegisterNamespace("SERV_BBS_CITY", 0, 0, tmmplput_serv_bbs_city);
+ RegisterNamespace("CURRENT_USER", 0, 0, tmplput_current_user);
+ RegisterNamespace("CURRENT_ROOM", 0, 0, tmplput_current_room);
+ RegisterNamespace("ITERATE", 2, 4, tmpl_iterate_subtmpl);
}
/*@}*/
projects / citadel.git / blobdiff