X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=8acbcc2dc766e497599d23ad7967beab97882e5b;hb=63535dea0c5783780590a9e13fb87b2cf6999f39;hp=c46b0855edc64c1719df2edb8b1bcdc6cee14fad;hpb=8c54af14f257f07d346c29d4a828ff9f8910f213;p=citadel.git diff --git a/webcit/subst.c b/webcit/subst.c index c46b0855e..8acbcc2dc 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -389,6 +389,9 @@ void print_value_of(StrBuf *Target, const char *keyname, size_t keylen) { if (keyname[0] == '=') { DoTemplate(keyname+1, keylen - 1, NULL, NULL); } + +//////TODO: if param[1] == "U" -> urlescape +/// X -> escputs /** Page-local variables */ if ((WCC->vars!= NULL) && GetHash(WCC->vars, keyname, keylen, &vVar)) { ptr = (wcsubst*) vVar; @@ -982,7 +985,7 @@ int ConditionalVar(WCTemplateToken *Tokens, void *Context) switch(subst->wcs_type) { case WCS_STRING: if (Tokens->nParameters < 4) - return 0; + return 1; return (strcmp(Tokens->Params[3]->Start, subst->wcs_value) == 0); case WCS_SERVCMD: lprintf(1, " -> Server [%s]\n", subst->wcs_value);////todo @@ -992,7 +995,7 @@ int ConditionalVar(WCTemplateToken *Tokens, void *Context) case WCS_STRBUF: case WCS_STRBUF_REF: if (Tokens->nParameters < 4) - return 0; + return 1; return (strcmp(Tokens->Params[3]->Start, ChrPtr((StrBuf*) subst->wcs_function)) == 0); case WCS_LONG: if (Tokens->nParameters < 4)