X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsubst.c;h=6e5ab6fc690248e63532ddf0408ae3c8bfff4cac;hb=715008dfb6283528fcac64dc21b88dcbb237abad;hp=67d5de31437099085f45823104af659310f58ba4;hpb=5332c415ad54cf9d3748b80a0d417dccc093a854;p=citadel.git diff --git a/webcit/subst.c b/webcit/subst.c index 67d5de314..6e5ab6fc6 100644 --- a/webcit/subst.c +++ b/webcit/subst.c @@ -18,8 +18,6 @@ extern char *static_dirs[PATH_MAX]; /* Disk representation */ -HashList *WirelessTemplateCache; -HashList *WirelessLocalTemplateCache; HashList *TemplateCache; HashList *LocalTemplateCache; @@ -73,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); @@ -111,6 +109,10 @@ const char *CtxNames[] = { "Context DavNamespace", "Context TAB", "Context VCARD", + "Context SIEVE List", + "Context SIEVE Script", + "Context MailQ-Item", + "Context MailQ-Recipient", "Context UNKNOWN" }; @@ -159,7 +161,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu } if (TP->Tokens != NULL) { - lprintf(1, "%s [%s] (in '%s' line %ld); %s; [%s]\n", + syslog(1, "%s [%s] (in '%s' line %ld); %s; [%s]\n", Type, Err, ChrPtr(TP->Tokens->FileName), @@ -169,7 +171,7 @@ void LogTemplateError (StrBuf *Target, const char *Type, int ErrorPos, WCTemplpu } else { - lprintf(1, "%s: %s;\n", + syslog(1, "%s: %s;\n", Type, ChrPtr(Error)); } @@ -258,7 +260,7 @@ void LogError (StrBuf *Target, const char *Type, const char *Format, ...) StrBufVAppendPrintf(Error, Format, arg_ptr); va_end(arg_ptr); - lprintf(1, ChrPtr(Error)); + syslog(1, "%s", ChrPtr(Error)); WCC = WC; if (WCC->WFBuf == NULL) WCC->WFBuf = NewStrBuf(); @@ -392,35 +394,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, @@ -619,19 +592,19 @@ 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': @@ -646,6 +619,12 @@ 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); } @@ -767,7 +746,7 @@ int GetNextParameter(StrBuf *Buf, } pche = pch; if (*pch != quote) { - lprintf(1, "Error (in '%s' line %ld); " + syslog(1, "Error (in '%s' line %ld); " "evaluating template param [%s] in Token [%s]\n", ChrPtr(pTmpl->FileName), Tokens->Line, @@ -781,8 +760,10 @@ int GetNextParameter(StrBuf *Buf, else { StrBufPeek(Buf, pch, -1, '\0'); if (LoadTemplates > 1) { - lprintf(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; @@ -811,7 +792,7 @@ int GetNextParameter(StrBuf *Buf, else { Parm->lvalue = 0; /* TODO whUT? - lprintf(1, "Error (in '%s' line %ld); " + syslog(1, "Error (in '%s' line %ld); " "evaluating long template param [%s] in Token [%s]\n", ChrPtr(pTmpl->FileName), Tokens->Line, @@ -1005,7 +986,7 @@ WCTemplateToken *NewTemplateSubstitute(StrBuf *Buf, &NewToken->Params[NewToken->nParameters - 1])) { NewToken->HaveParameters = 1; - if (NewToken->nParameters > MAXPARAM) { + if (NewToken->nParameters >= MAXPARAM) { LogTemplateError( NULL, "Parseerror", ERR_NAME, &TP, "only [%d] Params allowed in Tokens", @@ -1039,6 +1020,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; @@ -1197,27 +1197,72 @@ 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) { - lprintf(1, "ERROR: could not open template '%s' - %s\n", + syslog(1, "ERROR: could not open template '%s' - %s\n", ChrPtr(NewTemplate->FileName), strerror(errno)); return NULL; } if (fstat(fd, &statbuf) == -1) { - lprintf(1, "ERROR: could not stat template '%s' - %s\n", + syslog(1, "ERROR: could not stat template '%s' - %s\n", ChrPtr(NewTemplate->FileName), strerror(errno)); return NULL; } @@ -1225,9 +1270,8 @@ void *load_template(WCTemplate *NewTemplate) NewTemplate->Data = NewStrBufPlain(NULL, statbuf.st_size + 1); if (StrBufReadBLOB(NewTemplate->Data, &fd, 1, statbuf.st_size, &Err) < 0) { close(fd); - lprintf(1, "ERROR: reading template '%s' - %s
\n", + syslog(1, "ERROR: reading template '%s' - %s
\n", ChrPtr(NewTemplate->FileName), strerror(errno)); - //FreeWCTemplate(NewTemplate);/////tODO return NULL; } close(fd); @@ -1239,11 +1283,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; } } if (pch + 1 > pE) continue; pte = pch; - PutNewToken(NewTemplate, - NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte, Line, NewTemplate)); - pch ++; + pv = NewTemplateSubstitute(NewTemplate->Data, pS, pts, pte, Line, NewTemplate); + if (pv != NULL) { + PutNewToken(NewTemplate, pv); + pch ++; + } } + + SanityCheckTemplate(NULL, NewTemplate); return NewTemplate; } @@ -1288,7 +1346,7 @@ const char* PrintTemplate(void *vSubst) } -int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, const StrBuf *BaseKey) +int LoadTemplateDir(const StrBuf *DirName, HashList *big, const StrBuf *BaseKey) { int Toplevel; StrBuf *FileName; @@ -1301,7 +1359,6 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co int d_type = 0; int d_namelen; int d_without_ext; - int IsMobile; d = (struct dirent *)malloc(offsetof(struct dirent, d_name) + PATH_MAX + 1); if (d == NULL) { @@ -1323,7 +1380,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co (filedir_entry != NULL)) { char *MinorPtr; - char *PStart; + #ifdef _DIRENT_HAVE_D_NAMELEN d_namelen = filedir_entry->d_namelen; d_type = filedir_entry->d_type; @@ -1385,7 +1442,7 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co StrBufAppendBufPlain(SubDirectory, HKEY("/"), 0); StrBufAppendBufPlain(SubDirectory, filedir_entry->d_name, d_namelen, 0); - LoadTemplateDir(SubDirectory, wireless, big, SubKey); + LoadTemplateDir(SubDirectory, big, SubKey); break; case DT_LNK: /* TODO: check whether its a file or a directory */ @@ -1400,12 +1457,6 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co (strcmp(&filedir_entry->d_name[d_without_ext], ".orig") == 0) || (strcmp(&filedir_entry->d_name[d_without_ext], ".swp") == 0)) continue; /* Ignore backup files... */ - /* .m.xxx is for mobile useragents! */ - IsMobile = 0; - if (d_without_ext > 2) - IsMobile = (filedir_entry->d_name[d_without_ext - 1] == 'm') && - (filedir_entry->d_name[d_without_ext - 2] == '.'); - PStart = filedir_entry->d_name; StrBufPrintf(FileName, "%s/%s", ChrPtr(DirName), filedir_entry->d_name); MinorPtr = strchr(filedir_entry->d_name, '.'); if (MinorPtr != NULL) @@ -1419,8 +1470,8 @@ int LoadTemplateDir(const StrBuf *DirName, HashList *wireless, HashList *big, co StrBufAppendBufPlain(Key, filedir_entry->d_name, MinorPtr - filedir_entry->d_name, 0); if (LoadTemplates >= 1) - lprintf(1, "%s %d %s\n", ChrPtr(FileName), IsMobile, ChrPtr(Key)); - prepare_template(FileName, Key, (IsMobile)?wireless:big); + syslog(1, "%s %s\n", ChrPtr(FileName), ChrPtr(Key)); + prepare_template(FileName, Key, big); default: break; } @@ -1439,7 +1490,7 @@ void InitTemplateCache(void) int i; StrBuf *Key; StrBuf *Dir; - HashList *Templates[4]; + HashList *Templates[2]; Dir = NewStrBuf(); Key = NewStrBuf(); @@ -1447,14 +1498,12 @@ void InitTemplateCache(void) /* Primary Template set... */ StrBufPrintf(Dir, "%s/t", static_dirs[0]); LoadTemplateDir(Dir, - WirelessTemplateCache, TemplateCache, Key); /* User local Template set */ StrBufPrintf(Dir, "%s/t", static_dirs[1]); LoadTemplateDir(Dir, - WirelessLocalTemplateCache, LocalTemplateCache, Key); @@ -1462,17 +1511,14 @@ void InitTemplateCache(void) StrBufPrintf(Dir, "%s/dbg", static_dirs[0]); LoadTemplateDir(Dir, - WirelessTemplateCache, TemplateCache, Key); - Templates[0] = WirelessTemplateCache; - Templates[1] = TemplateCache; - Templates[2] = WirelessLocalTemplateCache; - Templates[3] = LocalTemplateCache; + Templates[0] = TemplateCache; + Templates[1] = LocalTemplateCache; if (LoadTemplates == 0) - for (i=0; i < 4; i++) { + for (i=0; i < 2; i++) { const char *Key; long KLen; HashPos *At; @@ -1486,7 +1532,7 @@ void InitTemplateCache(void) &vTemplate) && (vTemplate != NULL)) { - load_template((WCTemplate *)vTemplate); + load_template(NULL, (WCTemplate *)vTemplate); } DeleteHashPos(&At); } @@ -1518,7 +1564,7 @@ int EvaluateToken(StrBuf *Target, int state, WCTemplputParams *TP) void *vVar; /* much output, since pName is not terminated... - lprintf(1,"Doing token: %s\n",Token->pName); + syslog(1,"Doing token: %s\n",Token->pName); */ switch (TP->Tokens->Flags) { @@ -1602,10 +1648,10 @@ const StrBuf *ProcessTemplate(WCTemplate *Tmpl, StrBuf *Target, WCTemplputParams if (LoadTemplates != 0) { if (LoadTemplates > 1) - lprintf(1, "DBG: ----- loading: [%s] ------ \n", + 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", @@ -1686,14 +1732,14 @@ const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCT if (len == 0) { - lprintf (1, "Can't to load a template with empty name!\n"); + syslog(1, "Can't to load a template with empty name!\n"); StrBufAppendPrintf(Target, "
\nCan't to load a template with empty name!\n
"); return NULL; } if (!GetHash(StaticLocal, templatename, len, &vTmpl) && !GetHash(Static, templatename, len, &vTmpl)) { - lprintf (1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename)); + syslog(1, "didn't find Template [%s] %ld %ld\n", templatename, len , (long)strlen(templatename)); StrBufAppendPrintf(Target, "
\ndidn't find Template [%s] %ld %ld\n
", templatename, len, (long)strlen(templatename)); @@ -1989,6 +2035,8 @@ int conditional_ITERATE_LASTN(StrBuf *Target, WCTemplputParams *TP) int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP) { ConditionalStruct *Cond; + int rc = 0; + int res; if ((TP->Tokens->Params[0]->len == 1) && (TP->Tokens->Params[0]->Start[0] == 'X')) @@ -2005,10 +2053,14 @@ int EvaluateConditional(StrBuf *Target, int Neg, int state, WCTemplputParams *TP if (!CheckContext(Target, &Cond->Filter, TP, "Conditional")) { return 0; } - - if (Cond->CondF(Target, TP) == Neg) - return TP->Tokens->Params[1]->lvalue; - return 0; + res = Cond->CondF(Target, TP); + if (res == Neg) + rc = TP->Tokens->Params[1]->lvalue; + if (LoadTemplates > 5) + syslog(1, "<%s> : %d %d==%d\n", + ChrPtr(TP->Tokens->FlatToken), + rc, res, Neg); + return rc; } void RegisterConditional(const char *Name, long len, @@ -2168,9 +2220,9 @@ void tmpl_do_boxed(StrBuf *Target, WCTemplputParams *TP) memcpy (&SubTP, TP, sizeof(WCTemplputParams)); SubTP.Context = Headline; SubTP.Filter.ContextType = CTX_STRBUF; - DoTemplate(HKEY("beginbox"), Target, &SubTP); + DoTemplate(HKEY("box_begin"), Target, &SubTP); DoTemplate(TKEY(0), Target, TP); - DoTemplate(HKEY("endbox"), Target, TP); + DoTemplate(HKEY("box_end"), Target, TP); FreeStrBuf(&Headline); } @@ -2337,7 +2389,7 @@ void RegisterSortFunc(const char *name, long len, NewSort->GroupChange = GroupChange; NewSort->ContextType = ContextType; if (ContextType == CTX_NONE) { - lprintf(1, "sorting requires a context. CTX_NONE won't make it.\n"); + syslog(1, "sorting requires a context. CTX_NONE won't make it.\n"); exit(1); } @@ -2348,7 +2400,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; @@ -2382,7 +2433,6 @@ CompareFunc RetrieveSort(WCTemplputParams *TP, if (!GetHash(SortHash, SKEY(BSort), &vSortBy) || (vSortBy == NULL)) { - isdefault = 1; if (!GetHash(SortHash, Default, ldefault, &vSortBy) || (vSortBy == NULL)) { LogTemplateError( @@ -2437,9 +2487,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[] = { @@ -2633,7 +2683,7 @@ void dbg_print_longvector(long *LongVector) StrBufAppendPrintf(Buf, "%d: %ld]\n", i, LongVector[i]); } - lprintf(1, ChrPtr(Buf)); + syslog(1, "%s", ChrPtr(Buf)); FreeStrBuf(&Buf); } @@ -2727,8 +2777,6 @@ void ServerStartModule_SUBST (void) { - WirelessTemplateCache = NewHash(1, NULL); - WirelessLocalTemplateCache = NewHash(1, NULL); LocalTemplateCache = NewHash(1, NULL); TemplateCache = NewHash(1, NULL); @@ -2750,8 +2798,6 @@ void ServerShutdownModule_SUBST (void) { - DeleteHash(&WirelessTemplateCache); - DeleteHash(&WirelessLocalTemplateCache); DeleteHash(&TemplateCache); DeleteHash(&LocalTemplateCache);