X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fical_subst.c;h=adb923882994665fdf53883134a02ebc672ccf77;hb=HEAD;hp=ffacf41f471a3016e5dd818b45d14cdbd24614c0;hpb=97bdaff4147703998a868ed6d19232c4342acca4;p=citadel.git

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index ffacf41f4..adb923882 100644
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -21,64 +21,7 @@ CtxType CTX_ICALPROPERTY = CTX_NONE;
 CtxType CTX_ICALMETHOD = CTX_NONE;
 CtxType CTX_ICALTIME = CTX_NONE;
 CtxType CTX_ICALATTENDEE = CTX_NONE;
-#if 0
-void SortPregetMatter(HashList *Cals)
-{
-	disp_cal *Cal;
-	void *vCal;
-	const char *Key;
-        long KLen;
-	IcalEnumMap *SortMap[10];
-	IcalEnumMap *Map;
-	void *vSort;
-	const char *Next = NULL;
-	const StrBuf *SortVector;
-	StrBuf *SortBy;
-	int i = 0;
-	HashPos *It;
-
-	SortVector = SBSTR("ICALSortVec");
-	if (SortVector == NULL)
-		return;
-
-	for (i = 0; i < 10; i++) SortMap[i] = NULL;
-	SortBy = NewStrBuf();
-	while (StrBufExtract_NextToken(SortBy, SortVector, &Next, ':') > 0) {
-		GetHash(IcalComponentMap, SKEY(SortBy), &vSort);
-		Map = (IcalEnumMap*) vSort;
-		SortMap[i] = Map;
-		i++;
-		if (i > 9)
-			break;
-	}
-
-	if (i == 0)
-		return;
-
-	switch (SortMap[i - 1]->map) {
-		/*	case */
-
-	default:
-		break;
-	}
-
-	It = GetNewHashPos(Cals, 0);
-	while (GetNextHashPos(Cals, It, &KLen, &Key, &vCal)) {
-		i = 0;
-		Cal = (disp_cal*) vCal;
-		Cal->Status = icalcomponent_get_status(Cal->cal);
-		Cal->SortBy = Cal->cal;
-		
-
-		while ((SortMap[i] != NULL) && 
-		       (Cal->SortBy != NULL)) 
-		{
-			/****Cal->SortBy = icalcomponent_get_first_property(Cal->SortBy, SortMap[i++]->map); */
-		}
-	}
-}
-#endif
-
+CtxType CTX_ICALCONFLICT = CTX_NONE;
 
 void tmplput_ICalItem(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -271,8 +214,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar
 	wc_mime_attachment *Mime = CTX(CTX_MIME_ATACH);
 	icalproperty_method the_method = ICAL_METHOD_NONE;
 	icalproperty *method = NULL;
-	icalcomponent *cal;
-	icalcomponent *c;
+	icalcomponent *cal = NULL;
+	icalcomponent *c = NULL;
         WCTemplputParams SubTP;
         WCTemplputParams SuperTP;
 
@@ -324,7 +267,8 @@ void render_MIME_ICS_TPL(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundChar
 		      0,
 		      SuperTP.Tokens);
 	FlushStrBuf(Mime->Data);
-	DoTemplate(HKEY("ical_attachment_display"), Mime->Data, &SubTP);
+///	DoTemplate(HKEY("ical_attachment_display"), Mime->Data, &SubTP);
+	DoTemplate(HKEY("ical_edit"), Mime->Data, &SubTP);
 
 	/*/ cal_process_object(Mime->Data, cal, 0, Mime->msgnum, ChrPtr(Mime->PartNum)); */
 
@@ -377,10 +321,105 @@ int cond_ICalIsMethod(StrBuf *Target, WCTemplputParams *TP)
 }
 
 
+typedef struct CalendarConflict
+{
+	long is_update;
+	long existing_msgnum;
+	StrBuf *conflict_event_uid;
+	StrBuf *conflict_event_summary;
+}CalendarConflict;
+void DeleteConflict(void *vConflict)
+{
+	CalendarConflict *c = (CalendarConflict *) vConflict;
+
+	FreeStrBuf(&c->conflict_event_uid);
+	FreeStrBuf(&c->conflict_event_summary);
+	free(c);
+}
+HashList *iterate_FindConflict(StrBuf *Target, WCTemplputParams *TP)
+{
+	StrBuf *Line;
+	HashList *Conflicts = NULL;
+	CalendarConflict *Conflict;
+	wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
+
+	serv_printf("ICAL conflicts|%ld|%s|", Mime->msgnum, ChrPtr(Mime->PartNum));
+
+	Line = NewStrBuf();
+	StrBuf_ServGetln(Line);
+	if (GetServerStatus(Line, NULL) == 1)
+	{
+		const char *Pos = NULL;
+		int Done = 0;
+		int n = 0;
+		Conflicts = NewHash(1, Flathash);
+		while(!Done && (StrBuf_ServGetln(Line) >= 0) )
+			if ( (StrLength(Line)==3) && 
+			     !strcmp(ChrPtr(Line), "000")) 
+			{
+				Done = 1;
+			}
+			else {
+				Conflict = (CalendarConflict *) malloc(sizeof(CalendarConflict));
+				Conflict->conflict_event_uid = NewStrBufPlain(NULL, StrLength(Line));
+				Conflict->conflict_event_summary = NewStrBufPlain(NULL, StrLength(Line));
+
+				Conflict->existing_msgnum = StrBufExtractNext_long(Line, &Pos, '|');
+				StrBufSkip_NTokenS(Line, &Pos, '|', 1);
+				StrBufExtract_NextToken(Conflict->conflict_event_uid, Line, &Pos, '|');
+				StrBufExtract_NextToken(Conflict->conflict_event_summary, Line, &Pos, '|');
+				Conflict->is_update = StrBufExtractNext_long(Line, &Pos, '|');
+
+				Put(Conflicts, IKEY(n), Conflict, DeleteConflict);
+				n++;
+				Pos = NULL;
+			}
+	}
+	FreeStrBuf(&Line);
+	syslog(LOG_DEBUG, "...done.\n");
+	return Conflicts;
+}
+
+
 
-void tmplput_Conflict(StrBuf *Target, WCTemplputParams *TP)
-{}
+void tmplput_ConflictEventMsgID(StrBuf *Target, WCTemplputParams *TP)
+{
+	CalendarConflict *C = (CalendarConflict *) CTX(CTX_ICALCONFLICT);
+	char buf[sizeof(long) * 16];
 
+	snprintf(buf, sizeof(buf), "%ld", C->existing_msgnum);
+	StrBufAppendTemplateStr(Target, TP, buf, 0);
+}
+void tmplput_ConflictEUID(StrBuf *Target, WCTemplputParams *TP)
+{
+	CalendarConflict *C = (CalendarConflict *) CTX(CTX_ICALCONFLICT);
+	
+	StrBufAppendTemplate(Target, TP, C->conflict_event_uid, 0);
+}
+void tmplput_ConflictSummary(StrBuf *Target, WCTemplputParams *TP)
+{
+	CalendarConflict *C = (CalendarConflict *) CTX(CTX_ICALCONFLICT);
+
+	StrBufAppendTemplate(Target, TP, C->conflict_event_summary, 0);
+}
+int cond_ConflictIsUpdate(StrBuf *Target, WCTemplputParams *TP)
+{
+	CalendarConflict *C = (CalendarConflict *) CTX(CTX_ICALCONFLICT);
+	return C->is_update;
+}
+
+typedef struct CalAttendee
+{
+	StrBuf *AttendeeStr;
+	icalparameter_partstat partstat;
+} CalAttendee;
+
+void DeleteAtt(void *vAtt)
+{
+	CalAttendee *att = (CalAttendee*) vAtt;
+	FreeStrBuf(&att->AttendeeStr);
+	free(vAtt);
+}
 
 HashList *iterate_get_ical_attendees(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -441,7 +480,7 @@ int cond_ICalAttendeeState(StrBuf *Target, WCTemplputParams *TP)
 	for (c = icalcomponent_get_first_component(cal, ICAL_ANY_COMPONENT);
 	     (c != 0);
 	     c = icalcomponent_get_next_component(cal, ICAL_ANY_COMPONENT)) {
-		/* Recursively process subcomponent * /
+		// Recursively process subcomponent
 		cal_process_object(Target, c, recursion_level+1, msgnum, cal_partnum);
 	}
 	*/
@@ -452,20 +491,27 @@ InitModule_ICAL_SUBST
 (void)
 {
 	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);
 
-	RegisterNamespace("ICAL:SERV:CHECK:CONFLICT", 0, 0, tmplput_Conflict, NULL, CTX_ICAL);
+
+        RegisterIterator("ICAL:CONFLICT", 0, NULL, iterate_FindConflict, 
+                         NULL, DeleteHash, CTX_MIME_ATACH, CTX_ICALCONFLICT, IT_NOFLAG);
+	RegisterNamespace("ICAL:CONFLICT:MSGID", 0, 1, tmplput_ConflictEventMsgID, NULL, CTX_ICALCONFLICT);
+	RegisterNamespace("ICAL:CONFLICT:EUID", 0, 1, tmplput_ConflictEUID, NULL, CTX_ICALCONFLICT);
+	RegisterNamespace("ICAL:CONFLICT:SUMMARY", 0, 1, tmplput_ConflictSummary, NULL, CTX_ICALCONFLICT);
+	RegisterConditional("ICAL:CONFLICT:IS:UPDATE", 0, cond_ConflictIsUpdate, CTX_ICALCONFLICT);
+
 
 	RegisterCTX(CTX_ICALATTENDEE);
         RegisterIterator("ICAL:ATTENDEES", 0, NULL, iterate_get_ical_attendees, 
-                         NULL, NULL, CTX_ICALATTENDEE, CTX_ICAL, IT_NOFLAG);
+                         NULL, DeleteHash, CTX_ICALATTENDEE, CTX_ICAL, IT_NOFLAG);
 	RegisterNamespace("ICAL:ATTENDEE", 1, 2, tmplput_ICalAttendee, NULL, CTX_ICALATTENDEE);
  	RegisterConditional("COND:ICAL:ATTENDEE", 1, cond_ICalAttendeeState, CTX_ICALATTENDEE);
 
@@ -491,7 +537,3 @@ ServerShutdownModule_ICAL
 {
 	DeleteHash(&IcalComponentMap);
 }
-
-
-
-