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 4bf5728edf4096e9e92120a99d0dcf738df4826a..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))
 
@@ -56,8 +56,11 @@ enum {
 #define CTX_ICAL 18
 #define CTX_DAVNS 19
 #define CTX_TAB 20
+#define CTX_VCARD 21
+#define CTX_SIEVELIST 22
+#define CTX_SIEVESCRIPT 23
 
-#define CTX_UNKNOWN 21
+#define CTX_UNKNOWN 24
 
 
 /**
@@ -356,35 +359,12 @@ void RegisterSortFunc(const char *name, long len,
                      CompareFunc GroupChange, 
                      long ContextType);
 
-
-
-
 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);
 
 
-
-
-
 int CompareSubstToToken(TemplateParam *ParamToCompare, TemplateParam *ParamToLookup);
 int CompareSubstToStrBuf(StrBuf *Compare, TemplateParam *ParamToLookup);
-
-void SVPut(char *keyname, size_t keylen, int keytype, char *Data);
-#define svput(a, b, c) SVPut(a, sizeof(a) - 1, b, c)
-void SVPutLong(char *keyname, size_t keylen, long Data);
-#define svputlong(a, b) SVPutLong(a, sizeof(a) - 1, b)
-void svprintf(char *keyname, size_t keylen, int keytype, const char *format,...) __attribute__((__format__(__printf__,4,5)));
-void SVPRINTF(char *keyname, int keytype, const char *format,...) __attribute__((__format__(__printf__,3,4)));
-void SVCALLBACK(char *keyname, WCHandlerFunc fcn_ptr);
-void SVCallback(char *keyname, size_t keylen,  WCHandlerFunc fcn_ptr);
-#define svcallback(a, b) SVCallback(a, sizeof(a) - 1, b)
-
-void SVPUTBuf(const char *keyname, int keylen, const StrBuf *Buf, int ref);
-#define SVPutBuf(a, b, c); SVPUTBuf(a, sizeof(a) - 1, b, c)