From 2439b9cc9db4404cc04400ef337a9b37c7aae581 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 18 Oct 2012 20:10:25 +0200 Subject: [PATCH] ICAL Templating: work on porting the display of events in the mail view. --- webcit/ical_subst.c | 229 +++++++++++++++++-- webcit/static/t/ical/attachment/display.html | 139 +++++++++++ 2 files changed, 353 insertions(+), 15 deletions(-) diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c index a0b2f895f..1690b4b26 100644 --- a/webcit/ical_subst.c +++ b/webcit/ical_subst.c @@ -12,10 +12,14 @@ #include "webcit.h" -extern IcalEnumMap icalproperty_kind_map[]; +extern IcalKindEnumMap icalproperty_kind_map[]; +extern IcalMethodEnumMap icalproperty_method_map[]; HashList *IcalComponentMap = NULL; CtxType CTX_ICAL = CTX_NONE; +CtxType CTX_ICALPROPERTY = CTX_NONE; +CtxType CTX_ICALMETHOD = CTX_NONE; +CtxType CTX_ICALTIME = CTX_NONE; #if 0 void SortPregetMatter(HashList *Cals) { @@ -51,7 +55,7 @@ void SortPregetMatter(HashList *Cals) return; switch (SortMap[i - 1]->map) { - /// case + /* case */ default: break; @@ -90,6 +94,144 @@ void tmplput_ICalItem(StrBuf *Target, WCTemplputParams *TP) } } +void tmplput_CtxICalProperty(StrBuf *Target, WCTemplputParams *TP) +{ + icalproperty *p = (icalproperty *) CTX(CTX_ICALPROPERTY); + const char *str; + + str = icalproperty_get_comment (p); + StrBufAppendTemplateStr(Target, TP, str, 0); +} + +int ReleaseIcalSubCtx(StrBuf *Target, WCTemplputParams *TP) +{ + WCTemplputParams *TPP = TP; + UnStackContext(TP); + free(TPP); + return 0; +} +int cond_ICalIsA(StrBuf *Target, WCTemplputParams *TP) +{ + icalcomponent *cal = (icalcomponent *) CTX(CTX_ICAL); + icalcomponent_kind c = GetTemplateTokenNumber(Target, TP, 2, ICAL_NO_COMPONENT); + return icalcomponent_isa(cal) == c; +} + +int cond_ICalHaveItem(StrBuf *Target, WCTemplputParams *TP) +{ + icalcomponent *cal = (icalcomponent *) CTX(CTX_ICAL); + icalproperty *p; + icalproperty_kind Kind; + + Kind = (icalproperty_kind) GetTemplateTokenNumber(Target, TP, 2, ICAL_ANY_PROPERTY); + p = icalcomponent_get_first_property(cal, Kind); + if (p != NULL) { + WCTemplputParams *DynamicTP; + + DynamicTP = (WCTemplputParams*) malloc(sizeof(WCTemplputParams)); + StackDynamicContext (TP, + DynamicTP, + p, + CTX_ICALPROPERTY, + 0, + TP->Tokens, + ReleaseIcalSubCtx, + TP->Tokens->Params[1]->lvalue); + + return 1; + } + return 0; +} + +int ReleaseIcalTimeCtx(StrBuf *Target, WCTemplputParams *TP) +{ + WCTemplputParams *TPP = TP; + + UnStackContext(TP); + free(TPP); + return 0; +} + +int cond_ICalHaveTimeItem(StrBuf *Target, WCTemplputParams *TP) +{ + icalcomponent *cal = (icalcomponent *) CTX(CTX_ICAL); + icalproperty *p; + icalproperty_kind Kind; + struct icaltimetype tt; + + Kind = (icalproperty_kind) GetTemplateTokenNumber(Target, TP, 2, ICAL_ANY_PROPERTY); + + + p = icalcomponent_get_first_property(cal, Kind); + if (p != NULL) { + struct icaltimetype *t; + time_t ttt; + WCTemplputParams *DynamicTP; + + DynamicTP = (WCTemplputParams*) malloc(sizeof(WCTemplputParams) + + sizeof(struct icaltimetype)); + t = (struct icaltimetype *) ((char*)DynamicTP) + sizeof(WCTemplputParams); + switch (Kind) + { + case ICAL_DTSTART_PROPERTY: + *t = icalproperty_get_dtstart(p); + break; + case ICAL_DTEND_PROPERTY: + tt = icalproperty_get_dtend(p); + ttt = icaltime_as_timet(tt); + break; + default: + memset(t, 0, sizeof(struct icaltimetype)); + break; + } + + StackDynamicContext (TP, + DynamicTP, + t, + CTX_ICALTIME, + 0, + TP->Tokens, + ReleaseIcalTimeCtx, + TP->Tokens->Params[1]->lvalue); + + return 1; + } + return 0; +} + + +int cond_ICalTimeIsDate(StrBuf *Target, WCTemplputParams *TP) +{ + struct icaltimetype *t = (struct icaltimetype *) CTX(CTX_ICALTIME); + return t->is_date; +} + +void tmplput_ICalTime_Date(StrBuf *Target, WCTemplputParams *TP) +{ + struct tm d_tm; + long len; + char buf[256]; + struct icaltimetype *t = (struct icaltimetype *) CTX(CTX_ICALTIME); + + memset(&d_tm, 0, sizeof d_tm); + d_tm.tm_year = t->year - 1900; + d_tm.tm_mon = t->month - 1; + d_tm.tm_mday = t->day; + len = wc_strftime(buf, sizeof(buf), "%x", &d_tm); + StrBufAppendBufPlain(Target, buf, len, 0); +} +void tmplput_ICalTime_Time(StrBuf *Target, WCTemplputParams *TP) +{ + long len; + char buf[256]; + struct icaltimetype *t = (struct icaltimetype *) CTX(CTX_ICALTIME); + time_t tt; + + tt = icaltime_as_timet(*t); + len = webcit_fmt_date(buf, sizeof(buf), tt, DATEFMT_FULL); + StrBufAppendBufPlain(Target, buf, len, 0); +} + void tmplput_ICalDate(StrBuf *Target, WCTemplputParams *TP) { icalcomponent *cal = (icalcomponent *) CTX(CTX_ICAL); @@ -110,14 +252,30 @@ void tmplput_ICalDate(StrBuf *Target, WCTemplputParams *TP) } } +void tmplput_CtxICalPropertyDate(StrBuf *Target, WCTemplputParams *TP) +{ + icalproperty *p = (icalproperty *) CTX(CTX_ICALPROPERTY); + struct icaltimetype t; + time_t tt; + char buf[256]; + + long len; + t = icalproperty_get_dtend(p); + tt = icaltime_as_timet(t); + len = webcit_fmt_date(buf, sizeof(buf), tt, DATEFMT_FULL); + StrBufAppendBufPlain(Target, buf, len, 0); +} + void render_MIME_ICS_TPL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset) { + icalproperty_method the_method = ICAL_METHOD_NONE; + icalproperty *method = NULL; icalcomponent *cal; icalcomponent *c; WCTemplputParams SubTP; - + WCTemplputParams SubSubTP; if (StrLength(Mime->Data) == 0) { MimeLoadData(Mime); @@ -132,21 +290,42 @@ void render_MIME_ICS_TPL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *Foun } memset(&SubTP, 0, sizeof(WCTemplputParams)); + memset(&SubSubTP, 0, sizeof(WCTemplputParams)); SubTP.Filter.ContextType = CTX_ICAL; - ///ical_dezonify(cal); + /*//ical_dezonify(cal); */ /* If the component has subcomponents, recurse through them. */ c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); - SubTP.Context = (c != NULL) ? c : cal; + c = (c != NULL) ? c : cal; + SubTP.Context = c; + + method = icalcomponent_get_first_property(c, ICAL_METHOD_PROPERTY); + if (method != NULL) { + the_method = icalproperty_get_method(method); + } + StackContext (&SubTP, + &SubSubTP, + &the_method, + CTX_ICALMETHOD, + 0, + SubTP.Tokens); FlushStrBuf(Mime->Data); DoTemplate(HKEY("ical_attachment_display"), Mime->Data, &SubTP); - // cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum)); + /*/ cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum)); */ /* Free the memory we obtained from libical's constructor */ + StrBufPlain(Mime->ContentType, HKEY("text/html")); + StrBufAppendPrintf(WC->trailing_javascript, + "eventEditAllDay(); \n" + "RecurrenceShowHide(); \n" + "EnableOrDisableCheckButton(); \n" + ); + + UnStackContext(&SubSubTP); icalcomponent_free(cal); } void CreateIcalComponendKindLookup(void) @@ -176,7 +355,14 @@ void CreateIcalComponendKindLookup(void) +int cond_ICalIsMethod(StrBuf *Target, WCTemplputParams *TP) +{ + icalproperty_method *the_method = (icalproperty_method *) CTX(CTX_ICALMETHOD); + icalproperty_method which_method; + which_method = GetTemplateTokenNumber(Target, TP, 3, ICAL_METHOD_X); + return *the_method == which_method; +} @@ -192,21 +378,30 @@ void InitModule_ICAL_SUBST (void) { - int i; - for (i=0; icalproperty_kind_map[i].NameLen > 0; i++) - RegisterTokenParamDefine ( - icalproperty_kind_map[i].Name, - icalproperty_kind_map[i].NameLen, - icalproperty_kind_map[i].map); - - RegisterCTX(CTX_ICAL); +//* RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS_TPL, 1, 501); RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS_TPL, 1, 500); +//*/ + CreateIcalComponendKindLookup (); + RegisterConditional("COND:ICAL:PROPERTY", 1, cond_ICalHaveItem, CTX_ICAL); + RegisterConditional("COND:ICAL:IS:A", 1, cond_ICalIsA, CTX_ICAL); + + RegisterCTX(CTX_ICALPROPERTY); RegisterNamespace("ICAL:ITEM", 1, 2, tmplput_ICalItem, NULL, CTX_ICAL); + RegisterNamespace("ICAL:PROPERTY:STR", 0, 1, tmplput_CtxICalProperty, NULL, CTX_ICALPROPERTY); + RegisterNamespace("ICAL:PROPERTY:DATE", 0, 1, tmplput_CtxICalPropertyDate, NULL, CTX_ICALPROPERTY); - + RegisterCTX(CTX_ICALMETHOD); + RegisterConditional("COND:ICAL:METHOD", 1, cond_ICalIsMethod, CTX_ICALMETHOD); + + + RegisterCTX(CTX_ICALTIME); + RegisterConditional("COND:ICAL:DT:PROPERTY", 1, cond_ICalHaveTimeItem, CTX_ICAL); + RegisterConditional("COND:ICAL:DT:ISDATE", 0, cond_ICalTimeIsDate, CTX_ICALTIME); + RegisterNamespace("ICAL:DT:DATE", 0, 1, tmplput_ICalTime_Date, NULL, CTX_ICALTIME); + RegisterNamespace("ICAL:DT:DATETIME", 0, 1, tmplput_ICalTime_Time, NULL, CTX_ICALTIME); } void @@ -215,3 +410,7 @@ ServerShutdownModule_ICAL { DeleteHash(&IcalComponentMap); } + + + + diff --git a/webcit/static/t/ical/attachment/display.html b/webcit/static/t/ical/attachment/display.html index f5a3c5125..13dbc9c00 100644 --- a/webcit/static/t/ical/attachment/display.html +++ b/webcit/static/t/ical/attachment/display.html @@ -1,5 +1,19 @@ +aaa + abc + +blarg + +blub + + +datum: + + + +xxxx + cde @@ -12,3 +26,128 @@ efg hij + + + +
+ +
_title"> + + +   +
+ + + + + + + + + + + +
+
+ +
+ + +
+ + + + + + + + +
+ + +
+ + + + +
+ + + + + + +
+ + + + +
.
+ + + /* If the component has attendees, iterate through them. */ + for (p = icalcomponent_get_first_property(cal, ICAL_ATTENDEE_PROPERTY); + (p != NULL); + p = icalcomponent_get_next_property(cal, ICAL_ATTENDEE_PROPERTY)) { + StrBufAppendPrintf(Target, "
"); + StrBufAppendPrintf(Target, _("Attendee:")); + StrBufAppendPrintf(Target, "
"); + ch = icalproperty_get_attendee(p); + if ((ch != NULL) && !strncasecmp(buf, "MAILTO:", 7)) { + + /** screen name or email address */ + safestrncpy(buf, ch + 7, sizeof(buf)); + striplt(buf); + StrEscAppend(Target, NULL, buf, 0, 0); + StrBufAppendPrintf(Target, " "); + + /** participant status */ + partstat_as_string(buf, p); + StrEscAppend(Target, NULL, buf, 0, 0); + } + StrBufAppendPrintf(Target, "
\n"); + } + + /* If the component has subcomponents, recurse through them. */ + for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT); + (c != 0); + c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) { + /* Recursively process subcomponent */ + cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum); + } + + + + + + +
+ + +

_question"> + +    +_question','_title','','','Accept');"> +    +_question','_title','','','Tentative');"> +    +_question','_title','','','Decline');"> +

+ + + + + +

_question" > +Update to accept this reply and update your calendar.")> +    +_question','_title','','','Update');"> +    +_question','_title','','','Ignore');"> +

+ + + + if (recursion_level == 0) { +

 

+ } -- 2.30.2