X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=1370ca5b5fd7e6af2507b95c712bc14f4a3c6a17;hb=82f8cebefd325c7eb8b98c6025bd43633fa9cd90;hp=49723377ae23f235662e81b9fb3e52a679063530;hpb=7242d7c3fcd5865bebd5f273980374fdef21f851;p=citadel.git
diff --git a/webcit/subst.c b/webcit/subst.c
index 49723377a..1370ca5b5 100644
--- a/webcit/subst.c
+++ b/webcit/subst.c
@@ -71,7 +71,7 @@ typedef struct _HashHandler {
WCHandlerFunc HandlerFunc;
}HashHandler;
-void *load_template(WCTemplate *NewTemplate);
+void *load_template(StrBuf *Target, WCTemplate *NewTemplate);
int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP);
@@ -83,36 +83,107 @@ typedef struct _SortStruct {
CompareFunc Reverse;
CompareFunc GroupChange;
- long ContextType;
+ CtxType ContextType;
}SortStruct;
-const char *CtxNames[] = {
- "Context NONE",
- "Context SITECFG",
- "Context SESSION",
- "Context INETCFG",
- "Context VNOTE",
- "Context WHO",
- "Context PREF",
- "Context NODECONF",
- "Context USERLIST",
- "Context MAILSUM",
- "Context MIME_ATACH",
- "Context FILELIST",
- "Context STRBUF",
- "Context STRBUFARR",
- "Context LONGVECTOR",
- "Context ROOMS",
- "Context FLOORS",
- "Context ITERATE",
- "Context ICAL",
- "Context DavNamespace",
- "Context TAB",
- "Context VCARD",
- "Context UNKNOWN"
-};
+HashList *CtxList = NULL;
+
+static CtxType CtxCounter = CTX_NONE;
+
+CtxType CTX_STRBUF = CTX_NONE;
+CtxType CTX_STRBUFARR = CTX_NONE;
+CtxType CTX_LONGVECTOR = CTX_NONE;
+
+CtxType CTX_ITERATE = CTX_NONE;
+CtxType CTX_TAB = CTX_NONE;
+
+void HFreeContextType(void *pCtx)
+{
+ CtxTypeStruct *FreeStruct = (CtxTypeStruct *) pCtx;
+ FreeStrBuf(&FreeStruct->Name);
+ free(FreeStruct);
+}
+void PutContextType(const char *name, long len, CtxType TheCtx)
+{
+ CtxTypeStruct *NewStruct;
+
+ NewStruct = (CtxTypeStruct*) malloc(sizeof(CtxTypeStruct));
+ NewStruct->Name = NewStrBufPlain(name, len);
+ NewStruct->Type = TheCtx;
+
+ Put(CtxList, IKEY(NewStruct->Type), NewStruct, HFreeContextType);
+}
+void RegisterContextType(const char *name, long len, CtxType *TheCtx)
+{
+ if (*TheCtx != CTX_NONE)
+ return;
+
+ *TheCtx = ++CtxCounter;
+ PutContextType(name, len, *TheCtx);
+}
+
+CtxTypeStruct *GetContextType(CtxType Type)
+{
+ void *pv = NULL;
+ GetHash(CtxList, IKEY(Type), &pv);
+ return pv;
+}
+
+const char *UnknownContext = "CTX_UNKNOWN";
+
+const char *ContextName(CtxType ContextType)
+{
+ CtxTypeStruct *pCtx;
+
+ pCtx = GetContextType(ContextType);
+
+ if (pCtx != NULL)
+ return ChrPtr(pCtx->Name);
+ else
+ return UnknownContext;
+}
+
+void StackContext(WCTemplputParams *Super,
+ WCTemplputParams *Sub,
+ void *Context,
+ CtxType ContextType,
+ int nArgs,
+ WCTemplateToken *Tokens)
+{
+ memset(Sub, 0, sizeof(WCTemplputParams));
+
+ if (Super != NULL) {
+ Sub->Sub = Super->Sub;
+ Super->Sub = Sub;
+ }
+ Sub->Super = Super;
+
+ Sub->Context = Context;
+ Sub->Filter.ContextType = ContextType;
+ Sub->nArgs = nArgs;
+ Sub->Tokens = Tokens;
+}
+
+void UnStackContext(WCTemplputParams *Sub)
+{
+ if (Sub->Super != NULL)
+ {
+ Sub->Super->Sub = Sub->Sub;
+ }
+}
+void *GetContextPayload(WCTemplputParams *TP, CtxType ContextType)
+{
+ WCTemplputParams *whichTP = TP;
+ if (ContextType == CTX_NONE)
+ return TP->Context;
+
+ while ((whichTP != NULL) && (whichTP->Filter.ContextType != ContextType))
+ whichTP = whichTP->Super;
+
+ return whichTP->Context;
+}
void DestroySortStruct(void *vSort)
{
@@ -122,13 +193,6 @@ void DestroySortStruct(void *vSort)
free (Sort);
}
-const char *ContextName(int ContextType)
-{
- if (ContextType < CTX_UNKNOWN)
- return CtxNames[ContextType];
- else
- return CtxNames[CTX_UNKNOWN];
-}
void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplputParams *TP, const char *Format, ...)
{
@@ -158,23 +222,19 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu
if (TP->Tokens != NULL)
{
syslog(1, "%s [%s] (in '%s' line %ld); %s; [%s]\n",
- Type,
- Err,
- ChrPtr(TP->Tokens->FileName),
- TP->Tokens->Line,
- ChrPtr(Error),
- ChrPtr(TP->Tokens->FlatToken));
+ Type,
+ Err,
+ ChrPtr(TP->Tokens->FileName),
+ TP->Tokens->Line,
+ ChrPtr(Error),
+ ChrPtr(TP->Tokens->FlatToken));
}
else
{
syslog(1, "%s: %s;\n",
- Type,
- ChrPtr(Error));
+ Type,
+ ChrPtr(Error));
}
-/*
- if (Target == NULL)
- return;
-*/
WCC = WC;
if (WCC == NULL) {
FreeStrBuf(&Info);
@@ -281,7 +341,7 @@ void RegisterNS(const char *NSName,
int nMaxArgs,
WCHandlerFunc HandlerFunc,
WCPreevalFunc PreevalFunc,
- int ContextRequired)
+ CtxType ContextRequired)
{
HashHandler *NewHandler;
@@ -290,38 +350,31 @@ void RegisterNS(const char *NSName,
NewHandler->Filter.nMinArgs = nMinArgs;
NewHandler->Filter.nMaxArgs = nMaxArgs;
NewHandler->Filter.ContextType = ContextRequired;
- NewHandler->Filter.ControlContextType = CTX_NONE;
NewHandler->PreEvalFunc = PreevalFunc;
NewHandler->HandlerFunc = HandlerFunc;
Put(GlobalNS, NSName, len, NewHandler, NULL);
}
-void RegisterControlNS(const char *NSName,
- long len,
- int nMinArgs,
- int nMaxArgs,
- WCHandlerFunc HandlerFunc,
- int ControlContextRequired)
+
+
+int CheckContext(StrBuf *Target, ContextFilter *Need, WCTemplputParams *TP, const char *ErrType)
{
- HashHandler *NewHandler;
+ WCTemplputParams *TPP = TP;
- NewHandler = (HashHandler*) malloc(sizeof(HashHandler));
- memset(NewHandler, 0, sizeof(HashHandler));
- NewHandler->Filter.nMinArgs = nMinArgs;
- NewHandler->Filter.nMaxArgs = nMaxArgs;
- NewHandler->Filter.ContextType = CTX_NONE;
- NewHandler->Filter.ControlContextType = ControlContextRequired;
- NewHandler->HandlerFunc = HandlerFunc;
- Put(GlobalNS, NSName, len, NewHandler, NULL);
-}
+ if ((Need != NULL) &&
+ (Need->ContextType != CTX_NONE) &&
+ (Need->ContextType != TPP->Filter.ContextType)) {
+ while ((TPP != NULL) &&
+ (Need->ContextType != TPP->Filter.ContextType))
+ {
+ TPP = TPP->Super;
+ }
+ if (TPP != NULL)
+ return 1;
-int CheckContext(StrBuf *Target, ContextFilter *Need, WCTemplputParams *TP, const char *ErrType)
-{
- if ((Need->ContextType != CTX_NONE) &&
- (Need->ContextType != TP->Filter.ContextType)) {
LogTemplateError(
Target, ErrType, ERR_PARM1, TP,
" WARNING: requires Context: [%s], have [%s]!",
@@ -329,16 +382,6 @@ int CheckContext(StrBuf *Target, ContextFilter *Need, WCTemplputParams *TP, cons
ContextName(TP->Filter.ContextType));
return 0;
}
-
- if ((Need->ControlContextType != CTX_NONE) &&
- (Need->ControlContextType != TP->Filter.ControlContextType)) {
- LogTemplateError(
- Target, ErrType, ERR_PARM1, TP,
- " WARNING: requires Control Context: [%s], have [%s]!",
- ContextName(Need->ControlContextType),
- ContextName(TP->Filter.ControlContextType));
- return 0;
- }
/*
if (TP->Tokens->nParameters < Need->nMinArgs) {
LogTemplateError(Target, ErrType, ERR_NAME, TP,
@@ -390,35 +433,6 @@ void FreeWCTemplate(void *vFreeMe)
free(FreeMe);
}
-
-
-/**
- * \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(StrBuf *Target, StrBuf *servcmd) {
- char buf[SIZ];
- int len;
-
- serv_puts(ChrPtr(servcmd));
- len = serv_getln(buf, sizeof buf);
-
- switch(buf[0]) {
- case '2':
- case '3':
- case '5':
- StrBufAppendPrintf(Target, "%s\n", &buf[4]);
- break;
- case '1':
- _fmout(Target, "CENTER");
- break;
- case '4':
- StrBufAppendPrintf(Target, "%s\n", &buf[4]);
- serv_puts("000");
- break;
- }
-}
-
int HaveTemplateTokenString(StrBuf *Target,
WCTemplputParams *TP,
int N,
@@ -434,6 +448,7 @@ int HaveTemplateTokenString(StrBuf *Target,
case TYPE_STR:
case TYPE_BSTR:
case TYPE_PREFSTR:
+ case TYPE_ROOMPREFSTR:
case TYPE_GETTEXT:
case TYPE_SUBTEMPLATE:
return 1;
@@ -451,7 +466,7 @@ void GetTemplateTokenString(StrBuf *Target,
long *len)
{
StrBuf *Buf;
- WCTemplputParams SubTP;
+/// WCTemplputParams SubTP;
if (N >= TP->Tokens->nParameters) {
LogTemplateError(Target,
@@ -495,6 +510,19 @@ void GetTemplateTokenString(StrBuf *Target,
*Value = ChrPtr(Buf);
*len = StrLength(Buf);
break;
+ case TYPE_ROOMPREFSTR:
+ if (TP->Tokens->Params[N]->len == 0) {
+ LogTemplateError(Target,
+ "TokenParameter", N, TP,
+ "Requesting parameter %d; of type PREFSTR, empty lookup string not admitted.", N);
+ *len = 0;
+ *Value = EmptyStr;
+ break;
+ }
+ Buf = get_ROOM_PREFS(TKEY(N));
+ *Value = ChrPtr(Buf);
+ *len = StrLength(Buf);
+ break;
case TYPE_LONG:
LogTemplateError(Target,
"TokenParameter", N, TP,
@@ -519,11 +547,9 @@ void GetTemplateTokenString(StrBuf *Target,
break;
}
- memset(&SubTP, 0, sizeof(WCTemplputParams *));
- SubTP.Context = TP->Context;
- SubTP.Filter.ContextType = TP->Filter.ContextType;
Buf = NewStrBuf();
- DoTemplate(TKEY(N), Buf, &SubTP);
+ DoTemplate(TKEY(N), Buf, TP);
+
*Value = ChrPtr(Buf);
*len = StrLength(Buf);
/* we can't free it here, so we put it into the subst so its discarded later on. */
@@ -576,6 +602,19 @@ long GetTemplateTokenNumber(StrBuf *Target, WCTemplputParams *TP, int N, long df
if (get_PREF_LONG(TKEY(N), &Ret, dflt))
return Ret;
return 0;
+ case TYPE_ROOMPREFSTR:
+ LogTemplateError(Target,
+ "TokenParameter", N, TP,
+ "requesting a prefstring in param %d want a number", N);
+ if (TP->Tokens->Params[N]->len == 0) {
+ LogTemplateError(Target,
+ "TokenParameter", N, TP,
+ "Requesting parameter %d; of type PREFSTR, empty lookup string not admitted.", N);
+ return 0;
+ }
+ if (get_ROOM_PREFS_LONG(TKEY(N), &Ret, dflt))
+ return Ret;
+ return 0;
case TYPE_INTDEFINE:
case TYPE_LONG:
return TP->Tokens->Params[N]->lvalue;
@@ -608,28 +647,28 @@ long GetTemplateTokenNumber(StrBuf *Target, WCTemplputParams *TP, int N, long df
}
-/**
- * \brief puts string into the template and computes which escape methon we should use
- * \param Source the string we should put into the template
- * \param FormatTypeIndex where should we look for escape types if?
+/*
+ * puts string into the template and computes which escape methon we should use
+ * Source = the string we should put into the template
+ * FormatTypeIndex = where should we look for escape types if?
*/
void StrBufAppendTemplate(StrBuf *Target,
WCTemplputParams *TP,
const StrBuf *Source, int FormatTypeIndex)
{
- wcsession *WCC;
+ const char *pFmt = NULL;
char EscapeAs = ' ';
if ((FormatTypeIndex < TP->Tokens->nParameters) &&
(TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
- (TP->Tokens->Params[FormatTypeIndex]->len == 1)) {
- EscapeAs = *TP->Tokens->Params[FormatTypeIndex]->Start;
+ (TP->Tokens->Params[FormatTypeIndex]->len >= 1)) {
+ pFmt = TP->Tokens->Params[FormatTypeIndex]->Start;
+ EscapeAs = *pFmt;
}
switch(EscapeAs)
{
case 'H':
- WCC = WC;
StrEscAppend(Target, Source, NULL, 0, 2);
break;
case 'X':
@@ -644,11 +683,66 @@ void StrBufAppendTemplate(StrBuf *Target,
case 'U':
StrBufUrlescAppend(Target, Source, NULL);
break;
+ case 'F':
+ if (pFmt != NULL) pFmt++;
+ else pFmt = "JUSTIFY";
+ if (*pFmt == '\0') pFmt = "JUSTIFY";
+ FmOut(Target, pFmt, Source);
+ break;
default:
StrBufAppendBuf(Target, Source, 0);
}
}
+/*
+ * puts string into the template and computes which escape methon we should use
+ * Source = the string we should put into the template
+ * FormatTypeIndex = where should we look for escape types if?
+ */
+void StrBufAppendTemplateStr(StrBuf *Target,
+ WCTemplputParams *TP,
+ const char *Source, int FormatTypeIndex)
+{
+ const char *pFmt = NULL;
+ char EscapeAs = ' ';
+
+ if ((FormatTypeIndex < TP->Tokens->nParameters) &&
+ (TP->Tokens->Params[FormatTypeIndex]->Type == TYPE_STR) &&
+ (TP->Tokens->Params[FormatTypeIndex]->len >= 1)) {
+ pFmt = TP->Tokens->Params[FormatTypeIndex]->Start;
+ EscapeAs = *pFmt;
+ }
+
+ switch(EscapeAs)
+ {
+ case 'H':
+ StrEscAppend(Target, NULL, Source, 0, 2);
+ break;
+ case 'X':
+ StrEscAppend(Target, NULL, Source, 0, 0);
+ break;
+ case 'J':
+ StrECMAEscAppend(Target, NULL, Source);
+ break;
+ case 'K':
+ StrHtmlEcmaEscAppend(Target, NULL, Source, 0, 0);
+ break;
+ case 'U':
+ StrBufUrlescAppend(Target, NULL, Source);
+ break;
+/*
+ case 'F':
+ if (pFmt != NULL) pFmt++;
+ else pFmt = "JUSTIFY";
+ if (*pFmt == '\0') pFmt = "JUSTIFY";
+ FmOut(Target, pFmt, Source);
+ break;
+*/
+ default:
+ StrBufAppendBufPlain(Target, Source, 0, 0);
+ }
+}
+
void PutNewToken(WCTemplate *Template, WCTemplateToken *NewToken)
{
@@ -712,6 +806,14 @@ int GetNextParameter(StrBuf *Buf,
ParamBrace = 1;
}
}
+ else if (*pch == '.') {
+ Parm->Type = TYPE_ROOMPREFSTR;
+ pch ++;
+ if (*pch == '(') {
+ pch ++;
+ ParamBrace = 1;
+ }
+ }
else if (*pch == ';') {
Parm->Type = TYPE_PREFINT;
pch ++;
@@ -779,8 +881,10 @@ int GetNextParameter(StrBuf *Buf,
else {
StrBufPeek(Buf, pch, -1, '\0');
if (LoadTemplates > 1) {
- syslog(1, "DBG: got param [%s] %ld %ld\n",
- pchs, pche - pchs, strlen(pchs));
+ syslog(1,
+ "DBG: got param [%s] %d %d\n",
+ pchs, pche - pchs, strlen(pchs)
+ );
}
Parm->Start = pchs;
Parm->len = pche - pchs;
@@ -1037,6 +1141,25 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
switch (NewToken->Flags) {
case 0:
/* If we're able to find out more about the token, do it now while its fresh. */
+ pch = NewToken->pName;
+ while (pch < NewToken->pName + NewToken->NameEnd)
+ {
+ if (((*pch >= 'A') && (*pch <= 'Z')) ||
+ ((*pch >= '0') && (*pch <= '9')) ||
+ (*pch == ':') ||
+ (*pch == '-') ||
+ (*pch == '_'))
+ pch ++;
+ else
+ {
+ LogTemplateError(
+ NULL, "Token Name", ERR_NAME, &TP,
+ "contains illegal char: '%c'",
+ *pch);
+ pch++;
+ }
+
+ }
if (GetHash(GlobalNS, NewToken->pName, NewToken->NameEnd, &vVar)) {
HashHandler *Handler;
Handler = (HashHandler*) vVar;
@@ -1054,6 +1177,10 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf,
if (Handler->PreEvalFunc != NULL)
Handler->PreEvalFunc(NewToken);
}
+ } else {
+ LogTemplateError(
+ NULL, "Token ", ERR_NAME, &TP,
+ " isn't known to us.");
}
break;
case SV_GETTEXT:
@@ -1195,17 +1322,62 @@ void *duplicate_template(WCTemplate *OldTemplate)
return NewTemplate;
}
+
+void SanityCheckTemplate(StrBuf *Target, WCTemplate *CheckMe)
+{
+ int i = 0;
+ int j;
+ int FoundConditionalEnd;
+
+ for (i = 0; i < CheckMe->nTokensUsed; i++)
+ {
+ switch(CheckMe->Tokens[i]->Flags)
+ {
+ case SV_CONDITIONAL:
+ case SV_NEG_CONDITIONAL:
+ FoundConditionalEnd = 0;
+ if ((CheckMe->Tokens[i]->Params[0]->len == 1) &&
+ (CheckMe->Tokens[i]->Params[0]->Start[0] == 'X'))
+ break;
+ for (j = i + 1; j < CheckMe->nTokensUsed; j++)
+ {
+ if (((CheckMe->Tokens[j]->Flags == SV_CONDITIONAL) ||
+ (CheckMe->Tokens[j]->Flags == SV_NEG_CONDITIONAL)) &&
+ (CheckMe->Tokens[i]->Params[1]->lvalue ==
+ CheckMe->Tokens[j]->Params[1]->lvalue))
+ {
+ FoundConditionalEnd = 1;
+ break;
+ }
+
+ }
+ if (!FoundConditionalEnd)
+ {
+ WCTemplputParams TP;
+ memset(&TP, 0, sizeof(WCTemplputParams));
+ TP.Tokens = CheckMe->Tokens[i];
+ LogTemplateError(
+ Target, "Token", ERR_PARM1, &TP,
+ "Conditional without Endconditional"
+ );
+ }
+ break;
+ default:
+ break;
+ }
+ }
+}
+
/**
* \brief Display a variable-substituted template
* \param templatename template file to load
*/
-void *load_template(WCTemplate *NewTemplate)
+void *load_template(StrBuf *Target, WCTemplate *NewTemplate)
{
int fd;
struct stat statbuf;
const char *pS, *pE, *pch, *Err;
long Line;
- int pos;
fd = open(ChrPtr(NewTemplate->FileName), O_RDONLY);
if (fd <= 0) {
@@ -1225,7 +1397,6 @@ void *load_template(WCTemplate *NewTemplate)
close(fd);
syslog(1, "ERROR: reading template '%s' - %s
\n",
ChrPtr(NewTemplate->FileName), strerror(errno));
- //FreeWCTemplate(NewTemplate);/////tODO
return NULL;
}
close(fd);
@@ -1237,12 +1408,10 @@ void *load_template(WCTemplate *NewTemplate)
pE = pS + StrLength(NewTemplate->Data);
while (pch < pE) {
const char *pts, *pte;
- int InQuotes = 0;
- int InDoubleQuotes = 0;
+ char InQuotes = '\0';
void *pv;
/** Find one */
- pos = (-1);
for (; pch < pE; pch ++) {
if ((*pch=='<')&&(*(pch + 1)=='?') &&
!((pch == pS) && /* we must ommit a '))) {
- pch ++;
+ if ((!InQuotes) &&
+ ((*pch == '\'') || (*pch == '"')))
+ {
+ InQuotes = *pch;
+ }
+ else if (InQuotes && (InQuotes == *pch))
+ {
+ InQuotes = '\0';
+ }
+ else if ((InQuotes) &&
+ (*pch == '\\') &&
+ (*(pch + 1) == InQuotes))
+ {
+ pch++;
+ }
+ else if ((!InQuotes) &&
+ (*pch == '>'))
+ {
break;
}
}
@@ -1277,6 +1457,8 @@ void *load_template(WCTemplate *NewTemplate)
pch ++;
}
}
+
+ SanityCheckTemplate(NULL, NewTemplate);
return NewTemplate;
}
@@ -1323,7 +1505,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
(filedir_entry != NULL))
{
char *MinorPtr;
- char *PStart;
+
#ifdef _DIRENT_HAVE_D_NAMELEN
d_namelen = filedir_entry->d_namelen;
d_type = filedir_entry->d_type;
@@ -1400,7 +1582,6 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey)
(strcmp(&filedir_entry->d_name[d_without_ext], ".orig") == 0) ||
(strcmp(&filedir_entry->d_name[d_without_ext], ".swp") == 0))
continue; /* Ignore backup files... */
- PStart = filedir_entry->d_name;
StrBufPrintf(FileName, "%s/%s", ChrPtr(DirName), filedir_entry->d_name);
MinorPtr = strchr(filedir_entry->d_name, '.');
if (MinorPtr != NULL)
@@ -1476,7 +1657,7 @@ void InitTemplateCache(void)
&vTemplate) &&
(vTemplate != NULL))
{
- load_template((WCTemplate *)vTemplate);
+ load_template(NULL, (WCTemplate *)vTemplate);
}
DeleteHashPos(&At);
}
@@ -1516,12 +1697,24 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP)
TmplGettext(Target, TP);
break;
case SV_CONDITIONAL: /** Forward conditional evaluation */
+ Handler = (HashHandler*) TP->Tokens->PreEval;
+ if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
+ return -1;
+ }
return EvaluateConditional(Target, 1, state, TP);
break;
case SV_NEG_CONDITIONAL: /** Reverse conditional evaluation */
+ Handler = (HashHandler*) TP->Tokens->PreEval;
+ if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
+ return -1;
+ }
return EvaluateConditional(Target, 0, state, TP);
break;
case SV_CUST_STR_CONDITIONAL: /** Conditional put custom strings from params */
+ Handler = (HashHandler*) TP->Tokens->PreEval;
+ if (!CheckContext(Target, &Handler->Filter, TP, "Conditional")) {
+ return -1;
+ }
if (TP->Tokens->nParameters >= 6) {
if (EvaluateConditional(Target, 0, state, TP)) {
GetTemplateTokenString(Target, TP, 5, &AppendMe, &AppendMeLen);
@@ -1588,14 +1781,15 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams
memcpy(&TP.Filter, &CallingTP->Filter, sizeof(ContextFilter));
TP.Context = CallingTP->Context;
- TP.ControlContext = CallingTP->ControlContext;
+ TP.Sub = CallingTP->Sub;
+ TP.Super = CallingTP->Super;
if (LoadTemplates != 0) {
if (LoadTemplates > 1)
syslog(1, "DBG: ----- loading: [%s] ------ \n",
ChrPtr(Tmpl->FileName));
pTmpl = duplicate_template(Tmpl);
- if(load_template(pTmpl) == NULL) {
+ if(load_template(Target, pTmpl) == NULL) {
StrBufAppendPrintf(
Target,
"\nError loading Template [%s]\n See Logfile for details\n
\n",
@@ -1723,8 +1917,8 @@ void tmplput_Comment(StrBuf *Target, WCTemplputParams *TP)
typedef struct _HashIterator {
HashList *StaticList;
int AdditionalParams;
- int ContextType;
- int XPectContextType;
+ CtxType ContextType;
+ CtxType XPectContextType;
int Flags;
RetrieveHashlistFunc GetHash;
HashDestructorFunc Destructor;
@@ -1737,8 +1931,8 @@ void RegisterITERATOR(const char *Name, long len,
RetrieveHashlistFunc GetHash,
SubTemplFunc DoSubTempl,
HashDestructorFunc Destructor,
- int ContextType,
- int XPectContextType,
+ CtxType ContextType,
+ CtxType XPectContextType,
int Flags)
{
HashIterator *It;
@@ -1820,6 +2014,7 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
void *vContext;
void *vLastContext = NULL;
StrBuf *SubBuf;
+ WCTemplputParams IterateTP;
WCTemplputParams SubTP;
IterateStruct Status;
@@ -1828,7 +2023,6 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
long StopAt = -1;
memset(&Status, 0, sizeof(IterateStruct));
- memcpy (&SubTP, &TP, sizeof(WCTemplputParams));
It = (HashIterator*) TP->Tokens->Preeval2;
if (It == NULL) {
@@ -1883,42 +2077,47 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
}
}
nMembersUsed = GetCount(List);
- SubBuf = NewStrBuf();
- SubTP.Filter.ContextType = It->ContextType;
- SubTP.Filter.ControlContextType = CTX_ITERATE;
- SubTP.ControlContext = &Status;
+
+ StackContext (TP, &IterateTP, &Status, CTX_ITERATE, 0, TP->Tokens);
+ {
+ SubBuf = NewStrBuf();
- if (HAVE_PARAM(2)) {
- StartAt = GetTemplateTokenNumber(Target, TP, 2, 0);
- }
- if (HAVE_PARAM(3)) {
- StepWidth = GetTemplateTokenNumber(Target, TP, 3, 0);
- }
- if (HAVE_PARAM(4)) {
- StopAt = GetTemplateTokenNumber(Target, TP, 4, -1);
- }
- it = GetNewHashPos(List, StepWidth);
- if (StopAt < 0) {
- StopAt = GetCount(List);
- }
- while (GetNextHashPos(List, it, &Status.KeyLen, &Status.Key, &vContext)) {
- if ((Status.n >= StartAt) && (Status.n <= StopAt)) {
- if (DetectGroupChange && Status.n > 0) {
- Status.GroupChange = SortBy->GroupChange(vContext, vLastContext);
+ if (HAVE_PARAM(2)) {
+ StartAt = GetTemplateTokenNumber(Target, TP, 2, 0);
+ }
+ if (HAVE_PARAM(3)) {
+ StepWidth = GetTemplateTokenNumber(Target, TP, 3, 0);
+ }
+ if (HAVE_PARAM(4)) {
+ StopAt = GetTemplateTokenNumber(Target, TP, 4, -1);
+ }
+ it = GetNewHashPos(List, StepWidth);
+ if (StopAt < 0) {
+ StopAt = GetCount(List);
+ }
+ while (GetNextHashPos(List, it, &Status.KeyLen, &Status.Key, &vContext)) {
+ if ((Status.n >= StartAt) && (Status.n <= StopAt)) {
+ if (DetectGroupChange && Status.n > 0) {
+ Status.GroupChange = SortBy->GroupChange(vContext, vLastContext);
+ }
+ Status.LastN = (Status.n + 1) == nMembersUsed;
+ StackContext(&IterateTP, &SubTP, vContext, It->ContextType, 0, NULL);
+ {
+ if (It->DoSubTemplate != NULL)
+ It->DoSubTemplate(SubBuf, &SubTP);
+ DoTemplate(TKEY(1), SubBuf, &SubTP);
+
+ StrBufAppendBuf(Target, SubBuf, 0);
+ FlushStrBuf(SubBuf);
+ }
+ UnStackContext(&SubTP);
+ Status.oddeven = ! Status.oddeven;
+ vLastContext = vContext;
}
- Status.LastN = (Status.n + 1) == nMembersUsed;
- SubTP.Context = vContext;
- if (It->DoSubTemplate != NULL)
- It->DoSubTemplate(SubBuf, &SubTP);
- DoTemplate(TKEY(1), SubBuf, &SubTP);
-
- StrBufAppendBuf(Target, SubBuf, 0);
- FlushStrBuf(SubBuf);
- Status.oddeven = ! Status.oddeven;
- vLastContext = vContext;
+ Status.n++;
}
- Status.n++;
}
+ UnStackContext(&IterateTP);
FreeStrBuf(&SubBuf);
DeleteHashPos(&it);
if (It->Destructor != NULL)
@@ -1928,7 +2127,7 @@ void tmpl_iterate_subtmpl(StrBuf *Target, WCTemplputParams *TP)
int conditional_ITERATE_ISGROUPCHANGE(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
if (TP->Tokens->nParameters < 3)
return Ctx->GroupChange;
@@ -1937,7 +2136,7 @@ int conditional_ITERATE_ISGROUPCHANGE(StrBuf *Target, WCTemplputParams *TP)
void tmplput_ITERATE_ODDEVEN(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
if (Ctx->oddeven)
StrBufAppendBufPlain(Target, HKEY("odd"), 0);
else
@@ -1947,7 +2146,7 @@ void tmplput_ITERATE_ODDEVEN(StrBuf *Target, WCTemplputParams *TP)
void tmplput_ITERATE_KEY(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
StrBufAppendBufPlain(Target, Ctx->Key, Ctx->KeyLen, 0);
}
@@ -1955,19 +2154,19 @@ void tmplput_ITERATE_KEY(StrBuf *Target, WCTemplputParams *TP)
void tmplput_ITERATE_LASTN(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
StrBufAppendPrintf(Target, "%d", Ctx->n);
}
int conditional_ITERATE_FIRSTN(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
return Ctx->n == 0;
}
int conditional_ITERATE_LASTN(StrBuf *Target, WCTemplputParams *TP)
{
- IterateStruct *Ctx = CCTX;
+ IterateStruct *Ctx = CTX(CTX_ITERATE);
return Ctx->LastN;
}
@@ -1997,6 +2196,7 @@ int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP
if (!CheckContext(Target, &Cond->Filter, TP, "Conditional")) {
return 0;
}
+
res = Cond->CondF(Target, TP);
if (res == Neg)
rc = TP->Tokens->Params[1]->lvalue;
@@ -2021,25 +2221,6 @@ void RegisterConditional(const char *Name, long len,
Cond->Filter.nMinArgs = nParams;
Cond->CondF = CondF;
Cond->Filter.ContextType = ContextRequired;
- Cond->Filter.ControlContextType = CTX_NONE;
- Put(Conditionals, Name, len, Cond, NULL);
-}
-
-void RegisterControlConditional(const char *Name, long len,
- int nParams,
- WCConditionalFunc CondF,
- int ControlContextRequired)
-{
- ConditionalStruct *Cond;
-
- Cond = (ConditionalStruct*)malloc(sizeof(ConditionalStruct));
- memset(Cond, 0, sizeof(ConditionalStruct));
- Cond->PlainName = Name;
- Cond->Filter.nMaxArgs = nParams;
- Cond->Filter.nMinArgs = nParams;
- Cond->CondF = CondF;
- Cond->Filter.ContextType = CTX_NONE;
- Cond->Filter.ControlContextType = ControlContextRequired;
Put(Conditionals, Name, len, Cond, NULL);
}
@@ -2093,11 +2274,11 @@ HashList *Defines;
*/
void tmplput_ContextString(StrBuf *Target, WCTemplputParams *TP)
{
- StrBufAppendTemplate(Target, TP, (StrBuf*)CTX, 0);
+ StrBufAppendTemplate(Target, TP, (StrBuf*)CTX(CTX_STRBUF), 0);
}
int ConditionalContextStr(StrBuf *Target, WCTemplputParams *TP)
{
- StrBuf *TokenText = (StrBuf*) CTX;
+ StrBuf *TokenText = (StrBuf*) CTX((CTX_STRBUF));
const char *CompareToken;
long len;
@@ -2107,7 +2288,7 @@ int ConditionalContextStr(StrBuf *Target, WCTemplputParams *TP)
void tmplput_ContextStringArray(StrBuf *Target, WCTemplputParams *TP)
{
- HashList *Arr = (HashList*) CTX;
+ HashList *Arr = (HashList*) CTX(CTX_STRBUFARR);
void *pV;
int val;
@@ -2119,7 +2300,7 @@ void tmplput_ContextStringArray(StrBuf *Target, WCTemplputParams *TP)
}
int ConditionalContextStrinArray(StrBuf *Target, WCTemplputParams *TP)
{
- HashList *Arr = (HashList*) CTX;
+ HashList *Arr = (HashList*) CTX(CTX_STRBUFARR);
void *pV;
int val;
const char *CompareToken;
@@ -2161,12 +2342,14 @@ void tmpl_do_boxed(StrBuf *Target, WCTemplputParams *TP)
}
}
/* else TODO error? logging? */
- memcpy (&SubTP, TP, sizeof(WCTemplputParams));
- SubTP.Context = Headline;
- SubTP.Filter.ContextType = CTX_STRBUF;
- DoTemplate(HKEY("beginbox"), Target, &SubTP);
+
+ StackContext (TP, &SubTP, Headline, CTX_STRBUF, 0, NULL);
+ {
+ DoTemplate(HKEY("box_begin"), Target, &SubTP);
+ }
+ UnStackContext(&SubTP);
DoTemplate(TKEY(0), Target, TP);
- DoTemplate(HKEY("endbox"), Target, TP);
+ DoTemplate(HKEY("box_end"), Target, TP);
FreeStrBuf(&Headline);
}
@@ -2187,7 +2370,6 @@ int preeval_do_tabbed(WCTemplateToken *Token)
long len;
int i, nTabs;
-
memset(&TPP, 0, sizeof(WCTemplputParams));
TP = &TPP;
TP->Tokens = Token;
@@ -2250,7 +2432,6 @@ void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP)
WCTemplputParams SubTP;
memset(&TS, 0, sizeof(tab_struct));
- memcpy (&SubTP, &TP, sizeof(WCTemplputParams));
nTabs = ntabs = TP->Tokens->nParameters / 2;
TabNames = (StrBuf **) malloc(ntabs * sizeof(StrBuf*));
@@ -2277,33 +2458,37 @@ void tmpl_do_tabbed(StrBuf *Target, WCTemplputParams *TP)
nTabs --;
}
}
- memcpy (&SubTP, TP, sizeof(WCTemplputParams));
- SubTP.Filter.ControlContextType = CTX_TAB;
- SubTP.ControlContext = &TS;
+ StackContext (TP, &SubTP, &TS, CTX_TAB, 0, NULL);
+ {
+//// TODO jetzt memcpy (&SubTP, TP, sizeof(WCTemplputParams));
+// SubTP.Filter.ControlContextType = ;
- StrTabbedDialog(Target, nTabs, TabNames);
- for (i = 0; i < ntabs; i++) {
- memset(&TS, 0, sizeof(tab_struct));
- TS.CurrentTab = i;
- TS.TabTitle = TabNames[i];
- StrBeginTab(Target, i, nTabs, TabNames);
- DoTemplate(TKEY(i * 2 + 1), Target, &SubTP);
- StrEndTab(Target, i, nTabs);
+ StrTabbedDialog(Target, nTabs, TabNames);
+ for (i = 0; i < ntabs; i++) {
+ memset(&TS, 0, sizeof(tab_struct));
+ TS.CurrentTab = i;
+ TS.TabTitle = TabNames[i];
+ StrBeginTab(Target, i, nTabs, TabNames);
+ DoTemplate(TKEY(i * 2 + 1), Target, &SubTP);
+ StrEndTab(Target, i, nTabs);
+ }
+ for (i = 0; i < ntabs; i++)
+ FreeStrBuf(&TabNames[i]);
+ free(TabNames);
}
- for (i = 0; i < ntabs; i++)
- FreeStrBuf(&TabNames[i]);
+ UnStackContext(&SubTP);
}
void tmplput_TAB_N(StrBuf *Target, WCTemplputParams *TP)
{
- tab_struct *Ctx = CCTX;
+ tab_struct *Ctx = CTX(CTX_TAB);
StrBufAppendPrintf(Target, "%d", Ctx->CurrentTab);
}
void tmplput_TAB_TITLE(StrBuf *Target, WCTemplputParams *TP)
{
- tab_struct *Ctx = CCTX;
+ tab_struct *Ctx = CTX(CTX_TAB);
StrBufAppendTemplate(Target, TP, Ctx->TabTitle, 0);
}
@@ -2317,7 +2502,7 @@ void RegisterSortFunc(const char *name, long len,
CompareFunc Forward,
CompareFunc Reverse,
CompareFunc GroupChange,
- long ContextType)
+ CtxType ContextType)
{
SortStruct *NewSort;
@@ -2344,7 +2529,6 @@ CompareFunc RetrieveSort(WCTemplputParams *TP,
const char *OtherPrefix, long OtherPrefixLen,
const char *Default, long ldefault, long DefaultDirection)
{
- int isdefault = 0;
const StrBuf *BSort = NULL;
SortStruct *SortBy;
void *vSortBy;
@@ -2378,7 +2562,6 @@ CompareFunc RetrieveSort(WCTemplputParams *TP,
if (!GetHash(SortHash, SKEY(BSort), &vSortBy) ||
(vSortBy == NULL)) {
- isdefault = 1;
if (!GetHash(SortHash, Default, ldefault, &vSortBy) ||
(vSortBy == NULL)) {
LogTemplateError(
@@ -2433,9 +2616,9 @@ enum {
};
ConstStr SortIcons[] = {
- {HKEY("static/sort_none.gif")},
- {HKEY("static/up_pointer.gif")},
- {HKEY("static/down_pointer.gif")},
+ {HKEY("static/webcit_icons/sort_none.gif")},
+ {HKEY("static/webcit_icons/up_pointer.gif")},
+ {HKEY("static/webcit_icons/down_pointer.gif")},
};
ConstStr SortNextOrder[] = {
@@ -2592,7 +2775,7 @@ void tmplput_SORT_ORDER(StrBuf *Target, WCTemplputParams *TP)
void tmplput_long_vector(StrBuf *Target, WCTemplputParams *TP)
{
- long *LongVector = (long*) CTX;
+ long *LongVector = (long*) CTX(CTX_LONGVECTOR);
if ((TP->Tokens->Params[0]->Type == TYPE_LONG) &&
(TP->Tokens->Params[0]->lvalue <= LongVector[0]))
@@ -2635,7 +2818,7 @@ void dbg_print_longvector(long *LongVector)
int ConditionalLongVector(StrBuf *Target, WCTemplputParams *TP)
{
- long *LongVector = (long*) CTX;
+ long *LongVector = (long*) CTX(CTX_LONGVECTOR);
if ((TP->Tokens->Params[2]->Type == TYPE_LONG) &&
(TP->Tokens->Params[2]->lvalue <= LongVector[0])&&
@@ -2675,6 +2858,9 @@ void
InitModule_SUBST
(void)
{
+ RegisterCTX(CTX_TAB);
+ RegisterCTX(CTX_ITERATE);
+
memset(&NoCtx, 0, sizeof(WCTemplputParams));
RegisterNamespace("--", 0, 2, tmplput_Comment, NULL, CTX_NONE);
RegisterNamespace("SORT:ICON", 1, 2, tmplput_SORT_ICON, NULL, CTX_NONE);
@@ -2685,8 +2871,8 @@ InitModule_SUBST
RegisterNamespace("ITERATE", 2, 100, tmpl_iterate_subtmpl, preeval_iterate, CTX_NONE);
RegisterNamespace("DOBOXED", 1, 2, tmpl_do_boxed, NULL, CTX_NONE);
RegisterNamespace("DOTABBED", 2, 100, tmpl_do_tabbed, preeval_do_tabbed, CTX_NONE);
- RegisterControlNS(HKEY("TAB:N"), 0, 0, tmplput_TAB_N, CTX_TAB);
- RegisterControlNS(HKEY("TAB:SUBJECT"), 0, 1, tmplput_TAB_TITLE, CTX_TAB);
+ RegisterNamespace("TAB:N", 0, 0, tmplput_TAB_N, NULL, CTX_TAB);
+ RegisterNamespace("TAB:SUBJECT", 0, 1, tmplput_TAB_TITLE, NULL, CTX_TAB);
RegisterNamespace("LONGVECTOR", 1, 1, tmplput_long_vector, NULL, CTX_LONGVECTOR);
@@ -2697,19 +2883,19 @@ InitModule_SUBST
RegisterConditional(HKEY("COND:LONGVECTOR"), 4, ConditionalLongVector, CTX_LONGVECTOR);
- RegisterControlConditional(HKEY("COND:ITERATE:ISGROUPCHANGE"), 2,
- conditional_ITERATE_ISGROUPCHANGE,
- CTX_ITERATE);
- RegisterControlConditional(HKEY("COND:ITERATE:LASTN"), 2,
- conditional_ITERATE_LASTN,
- CTX_ITERATE);
- RegisterControlConditional(HKEY("COND:ITERATE:FIRSTN"), 2,
- conditional_ITERATE_FIRSTN,
- CTX_ITERATE);
+ RegisterConditional(HKEY("COND:ITERATE:ISGROUPCHANGE"), 2,
+ conditional_ITERATE_ISGROUPCHANGE,
+ CTX_ITERATE);
+ RegisterConditional(HKEY("COND:ITERATE:LASTN"), 2,
+ conditional_ITERATE_LASTN,
+ CTX_ITERATE);
+ RegisterConditional(HKEY("COND:ITERATE:FIRSTN"), 2,
+ conditional_ITERATE_FIRSTN,
+ CTX_ITERATE);
- RegisterControlNS(HKEY("ITERATE:ODDEVEN"), 0, 0, tmplput_ITERATE_ODDEVEN, CTX_ITERATE);
- RegisterControlNS(HKEY("ITERATE:KEY"), 0, 0, tmplput_ITERATE_KEY, CTX_ITERATE);
- RegisterControlNS(HKEY("ITERATE:N"), 0, 0, tmplput_ITERATE_LASTN, CTX_ITERATE);
+ RegisterNamespace("ITERATE:ODDEVEN", 0, 0, tmplput_ITERATE_ODDEVEN, NULL, CTX_ITERATE);
+ RegisterNamespace("ITERATE:KEY", 0, 0, tmplput_ITERATE_KEY, NULL, CTX_ITERATE);
+ RegisterNamespace("ITERATE:N", 0, 0, tmplput_ITERATE_LASTN, NULL, CTX_ITERATE);
RegisterNamespace("CURRENTFILE", 0, 1, tmplput_CURRENT_FILE, NULL, CTX_NONE);
RegisterNamespace("DEF:STR", 1, 1, tmplput_DefStr, NULL, CTX_NONE);
RegisterNamespace("DEF:VAL", 1, 1, tmplput_DefVal, NULL, CTX_NONE);
@@ -2731,6 +2917,13 @@ ServerStartModule_SUBST
Conditionals = NewHash(1, NULL);
SortHash = NewHash(1, NULL);
Defines = NewHash(1, NULL);
+ CtxList = NewHash(1, NULL);
+
+ PutContextType(HKEY("CTX_NONE"), 0);
+
+ RegisterCTX(CTX_STRBUF);
+ RegisterCTX(CTX_STRBUFARR);
+ RegisterCTX(CTX_LONGVECTOR);
}
void
@@ -2752,6 +2945,7 @@ ServerShutdownModule_SUBST
DeleteHash(&Conditionals);
DeleteHash(&SortHash);
DeleteHash(&Defines);
+ DeleteHash(&CtxList);
}