Rework templating context access so contexts can be accessed through several layers

[citadel.git] / webcit / notes.c

diff --git a/webcit/notes.c b/webcit/notes.c
index eb358369d27e53aaefb86c6412f81e4e0e47493d..11412484097d26ed352d45092b4d8ead3cfde49b 100644 (file)
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -1,6 +1,6 @@
 
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 #include "webserver.h"
 
 int pastel_palette[9][3] = {
@@ -351,61 +351,61 @@ void add_new_note(void) {
 
 void tmpl_vcard_put_posleft(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", v->pos_left);
 }
 
 void tmpl_vcard_put_postop(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", v->pos_top);
 }
 
 void tmpl_vcard_put_poswidth(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", v->pos_width);
 }
 
 void tmpl_vcard_put_posheight(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", v->pos_height);
 }
 
 void tmpl_vcard_put_posheight2(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", (v->pos_height / 16) - 5);
 }
 
 void tmpl_vcard_put_width2(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%d", (v->pos_width / 9) - 1);
 }
 
 void tmpl_vcard_put_color(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%02X%02X%02X", v->color_red, v->color_green, v->color_blue);
 }
 
 void tmpl_vcard_put_bgcolor(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendPrintf(Target, "%02X%02X%02X", v->color_red/2, v->color_green/2, v->color_blue/2);
 }
 
 void tmpl_vcard_put_message(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrEscAppend(Target, NULL, v->body, 0, 0); /*TODO?*/
 }
 
 void tmpl_vcard_put_uid(StrBuf *Target, WCTemplputParams *TP)
 {
-       struct vnote *v = (struct vnote *) CTX;
+       struct vnote *v = (struct vnote *) CTX(CTX_VNOTE);
        StrBufAppendBufPlain(Target, v->uid, -1, 0);
 }
 
@@ -416,7 +416,9 @@ int notes_GetParamsGetServerCall(SharedMessageStatus *Stat,
                                 void **ViewSpecific, 
                                 long oper, 
                                 char *cmd, 
-                                long len)
+                                long len,
+                                char *filter,
+                                long flen)
 {
        strcpy(cmd, "MSGS ALL");
        Stat->maxmsgs = 32767;
@@ -441,6 +443,7 @@ InitModule_NOTES
                notes_GetParamsGetServerCall,
                NULL,
                NULL,
+               NULL,
                notes_LoadMsgFromServer,
                NULL,
                notes_Cleanup);