Templatize sieve rules editor; return success/fail state of serverwrite

[citadel.git] / webcit / subst.h

diff --git a/webcit/subst.h b/webcit/subst.h
index 906768316401a624f9ea6c257eaa9e2e1e5275ce..644b55950ad2a815d29abedd5af43b241b9ee4c4 100644 (file)
--- a/webcit/subst.h
+++ b/webcit/subst.h
@@ -16,7 +16,7 @@ extern HashList *LocalTemplateCache;
 #define TYPE_BSTR 6
 #define TYPE_SUBTEMPLATE 7
 #define TYPE_INTDEFINE 8
-#define MAXPARAM  20
+#define MAXPARAM  25
 
 #define IS_NUMBER(a) ((a == TYPE_LONG) || (a == TYPE_PREFINT) || (a == TYPE_INTDEFINE))
 
@@ -57,8 +57,10 @@ enum {
 #define CTX_DAVNS 19
 #define CTX_TAB 20
 #define CTX_VCARD 21
+#define CTX_SIEVELIST 22
+#define CTX_SIEVESCRIPT 23
 
-#define CTX_UNKNOWN 22
+#define CTX_UNKNOWN 24
 
 
 /**
@@ -359,7 +361,7 @@ void RegisterSortFunc(const char *name, long len,
 
 void dbg_print_longvector(long *LongVector);
 
-#define do_template(a, b) DoTemplate(a, sizeof(a) -1, NULL, &NoCtx)
+#define do_template(a) DoTemplate(a, sizeof(a) -1, NULL, &NoCtx)
 const StrBuf *DoTemplate(const char *templatename, long len, StrBuf *Target, WCTemplputParams *TP);
 void url_do_template(void);