| ");
+ wprintf("- ");
+ if (p != NULL) {
+ escputs((char *)icalproperty_get_comment(p));
+ }
+ wprintf("");
+ wprintf("\n");
+ wprintf("");
wDumpContent(1);
if (created_new_vtodo) {
@@ -598,7 +755,9 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
* \param supplied_vtodo the task to save
* \param msgnum number of the mesage in our db
*/
-void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
+void save_individual_task(icalcomponent *supplied_vtodo, long msgnum, char* from, int unread,
+ struct calview *calv)
+{
char buf[SIZ];
int delete_existing = 0;
icalproperty *prop;
@@ -621,9 +780,9 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
if (icalcomponent_isa(vtodo) == ICAL_VCALENDAR_COMPONENT) {
save_individual_task(
icalcomponent_get_first_component(
- vtodo, ICAL_VTODO_COMPONENT
- ), msgnum
- );
+ vtodo, ICAL_VTODO_COMPONENT),
+ msgnum, from, unread, calv
+ );
return;
}
}
@@ -632,60 +791,89 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
created_new_vtodo = 1;
}
- if (strlen(bstr("save_button")) > 0) {
+ if (havebstr("save_button")) {
/** Replace values in the component with ones from the form */
while (prop = icalcomponent_get_first_property(vtodo,
- ICAL_SUMMARY_PROPERTY), prop != NULL) {
+ ICAL_SUMMARY_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vtodo, prop);
icalproperty_free(prop);
}
- icalcomponent_add_property(vtodo,
- icalproperty_new_summary(bstr("summary")));
-
+ if (havebstr("summary")) {
+
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_summary(bstr("summary")));
+ } else {
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_summary("Untitled Task"));
+ }
+
while (prop = icalcomponent_get_first_property(vtodo,
- ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
+ ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vtodo, prop);
icalproperty_free(prop);
}
- icalcomponent_add_property(vtodo,
- icalproperty_new_description(bstr("description")));
+ if (havebstr("description")) {
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_description(bstr("description")));
+ }
while (prop = icalcomponent_get_first_property(vtodo,
- ICAL_DTSTART_PROPERTY), prop != NULL) {
+ ICAL_DTSTART_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vtodo, prop);
icalproperty_free(prop);
}
- icaltime_from_webform(&t, "dtstart");
- icalcomponent_add_property(vtodo,
- icalproperty_new_dtstart(t)
- );
-
+ if (IsEmptyStr(bstr("nodtstart"))) {
+ icaltime_from_webform(&t, "dtstart");
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_dtstart(t)
+ );
+ }
+ while(prop = icalcomponent_get_first_property(vtodo,
+ ICAL_STATUS_PROPERTY), prop != NULL) {
+ icalcomponent_remove_property(vtodo,prop);
+ icalproperty_free(prop);
+ }
+ if (havebstr("status")) {
+ icalproperty_status taskStatus = icalproperty_string_to_status(
+ bstr("status"));
+ icalcomponent_set_status(vtodo, taskStatus);
+ }
while (prop = icalcomponent_get_first_property(vtodo,
- ICAL_DUE_PROPERTY), prop != NULL) {
+ ICAL_CATEGORIES_PROPERTY), prop != NULL) {
+ icalcomponent_remove_property(vtodo,prop);
+ icalproperty_free(prop);
+ }
+ if (!IsEmptyStr(bstr("category"))) {
+ prop = icalproperty_new_categories(bstr("category"));
+ icalcomponent_add_property(vtodo,prop);
+ }
+ while (prop = icalcomponent_get_first_property(vtodo,
+ ICAL_DUE_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vtodo, prop);
icalproperty_free(prop);
}
- icaltime_from_webform(&t, "due");
- icalcomponent_add_property(vtodo,
- icalproperty_new_due(t)
- );
-
+ if (IsEmptyStr(bstr("nodue"))) {
+ icaltime_from_webform(&t, "due");
+ icalcomponent_add_property(vtodo,
+ icalproperty_new_due(t)
+ );
+ }
/** Give this task a UID if it doesn't have one. */
lprintf(9, "Give this task a UID if it doesn't have one.\n");
if (icalcomponent_get_first_property(vtodo,
- ICAL_UID_PROPERTY) == NULL) {
+ ICAL_UID_PROPERTY) == NULL) {
generate_uuid(buf);
icalcomponent_add_property(vtodo,
- icalproperty_new_uid(buf)
- );
+ icalproperty_new_uid(buf)
+ );
}
/** Increment the sequence ID */
lprintf(9, "Increment the sequence ID\n");
while (prop = icalcomponent_get_first_property(vtodo,
- ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
+ ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
i = icalproperty_get_sequence(prop);
lprintf(9, "Sequence was %d\n", i);
if (i > sequence) sequence = i;
@@ -695,8 +883,8 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
++sequence;
lprintf(9, "New sequence is %d. Adding...\n", sequence);
icalcomponent_add_property(vtodo,
- icalproperty_new_sequence(sequence)
- );
+ icalproperty_new_sequence(sequence)
+ );
/**
* Encapsulate event into full VCALENDAR component. Clone it first,
@@ -730,12 +918,12 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
/**
* If the user clicked 'Delete' then explicitly delete the message.
*/
- if (strlen(bstr("delete_button")) > 0) {
+ if (havebstr("delete_button")) {
delete_existing = 1;
}
if ( (delete_existing) && (msgnum > 0L) ) {
- serv_printf("DELE %ld", atol(bstr("msgnum")));
+ serv_printf("DELE %ld", lbstr("msgnum"));
serv_getln(buf, sizeof buf);
}
@@ -744,29 +932,25 @@ void save_individual_task(icalcomponent *supplied_vtodo, long msgnum) {
}
/** Go back to the task list */
- readloop("readfwd");
+ readloop(readfwd);
}
-/**
- * \brief generic item handler
- * Code common to all display handlers. Given a message number and a MIME
+/*
+ * Code common to all icalendar display handlers. Given a message number and a MIME
* type, we load the message and hunt for that MIME type. If found, we load
* the relevant part, deserialize it into a libical component, filter it for
* the requested object type, and feed it to the specified handler.
- * \param mimetype mimetyp of our object
- * \param which_kind sort of ical type
- * \param msgnum number of the mesage in our db
- * \param callback a funcion \todo
- *
*/
-void display_using_handler(long msgnum,
- char *mimetype,
- icalcomponent_kind which_kind,
- void (*callback)(icalcomponent *, long)
- ) {
+void load_ical_object(long msgnum, int unread,
+ icalcomponent_kind which_kind,
+ void (*callback)(icalcomponent *, long, char*, int, struct calview *),
+ struct calview *calv
+ )
+{
char buf[1024];
+ char from[128] = "";
char mime_partnum[256];
char mime_filename[256];
char mime_content_type[256];
@@ -776,7 +960,8 @@ void display_using_handler(long msgnum,
char *relevant_source = NULL;
icalcomponent *cal, *c;
- sprintf(buf, "MSG0 %ld|0", msgnum); /* unfortunately we need the mime headers */
+ relevant_partnum[0] = '\0';
+ sprintf(buf, "MSG4 %ld", msgnum); /* we need the mime headers */
serv_puts(buf);
serv_getln(buf, sizeof buf);
if (buf[0] != '1') return;
@@ -789,138 +974,141 @@ void display_using_handler(long msgnum,
extract_token(mime_content_type, &buf[5], 4, '|', sizeof mime_content_type);
mime_length = extract_int(&buf[5], 5);
- if (!strcasecmp(mime_content_type, "text/calendar")) {
+ if ( (!strcasecmp(mime_content_type, "text/calendar"))
+ || (!strcasecmp(mime_content_type, "application/ics"))
+ || (!strcasecmp(mime_content_type, "text/vtodo"))
+ ) {
strcpy(relevant_partnum, mime_partnum);
}
-
+ }
+ else if (!strncasecmp(buf, "from=", 4)) {
+ extract_token(from, buf, 1, '=', sizeof(from));
}
}
- if (strlen(relevant_partnum) > 0) {
+ if (!IsEmptyStr(relevant_partnum)) {
relevant_source = load_mimepart(msgnum, relevant_partnum);
if (relevant_source != NULL) {
cal = icalcomponent_new_from_string(relevant_source);
if (cal != NULL) {
- ical_dezonify(cal);
-
- /** Simple components of desired type */
- if (icalcomponent_isa(cal) == which_kind) {
- callback(cal, msgnum);
+ /* A which_kind of (-1) means just load the whole thing */
+ if (which_kind == (-1)) {
+ callback(cal, msgnum, from, unread, calv);
}
- /** Subcomponents of desired type */
- for (c = icalcomponent_get_first_component(cal,
- which_kind);
- (c != 0);
- c = icalcomponent_get_next_component(cal,
- which_kind)) {
- callback(c, msgnum);
+ /* Otherwise recurse and hunt */
+ else {
+
+ /* Simple components of desired type */
+ if (icalcomponent_isa(cal) == which_kind) {
+ callback(cal, msgnum, from, unread, calv);
+ }
+
+ /* Subcomponents of desired type */
+ for (c = icalcomponent_get_first_component(cal, which_kind);
+ (c != 0);
+ c = icalcomponent_get_next_component(cal, which_kind)) {
+ callback(c, msgnum, from, unread, calv);
+ }
+
}
+
icalcomponent_free(cal);
}
free(relevant_source);
}
}
-
+ icalmemory_free_ring();
}
-/**
- * \brief display whole calendar
- * \param msgnum number of the mesage in our db
+/*
+ * Display a calendar item
*/
-void display_calendar(long msgnum) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VEVENT_COMPONENT,
- display_individual_cal);
+void load_calendar_item(message_summary *Msg, int unread, struct calview *c) {
+ /*load_ical_object(Msg->msgnum, unread, ICAL_VEVENT_COMPONENT, display_individual_cal, c);*/
+ load_ical_object(Msg->msgnum, unread, (-1), display_individual_cal, c);
}
-/**
- * \brief display whole taksview
- * \param msgnum number of the mesage in our db
+/*
+ * Display task view
*/
-void display_task(long msgnum) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VTODO_COMPONENT,
- display_individual_cal);
+void display_task(message_summary *Msg, int unread) {
+ load_ical_object(Msg->msgnum, unread, ICAL_VTODO_COMPONENT, display_individual_cal, NULL);
}
-/**
- * \brief display the editor component for a task
+/*
+ * Display the editor component for a task
*/
void display_edit_task(void) {
long msgnum = 0L;
-
- /** Force change the room if we have to */
- if (strlen(bstr("taskrm")) > 0) {
- gotoroom(bstr("taskrm"));
+
+ /* Force change the room if we have to */
+ if (havebstr("taskrm")) {
+ gotoroom((char *)bstr("taskrm"));
}
- msgnum = atol(bstr("msgnum"));
+ msgnum = lbstr("msgnum");
if (msgnum > 0L) {
- /** existing task */
- display_using_handler(msgnum, "text/calendar",
- ICAL_VTODO_COMPONENT,
- display_edit_individual_task);
+ /* existing task */
+ load_ical_object(msgnum, 0,
+ ICAL_VTODO_COMPONENT,
+ display_edit_individual_task,
+ NULL
+ );
}
else {
- /** new task */
- display_edit_individual_task(NULL, 0L);
+ /* new task */
+ display_edit_individual_task(NULL, 0L, "", 0, NULL);
}
}
-/**
- *\brief save an edited task
+/*
+ * save an edited task
*/
void save_task(void) {
long msgnum = 0L;
-
- msgnum = atol(bstr("msgnum"));
+ msgnum = lbstr("msgnum");
if (msgnum > 0L) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VTODO_COMPONENT,
- save_individual_task);
+ load_ical_object(msgnum, 0, ICAL_VTODO_COMPONENT, save_individual_task, NULL);
}
else {
- save_individual_task(NULL, 0L);
+ save_individual_task(NULL, 0L, "", 0, NULL);
}
}
-/**
- * \brief display the editor component for an event
+/*
+ * display the editor component for an event
*/
void display_edit_event(void) {
long msgnum = 0L;
- msgnum = atol(bstr("msgnum"));
+ msgnum = lbstr("msgnum");
if (msgnum > 0L) {
/* existing event */
- display_using_handler(msgnum, "text/calendar",
- ICAL_VEVENT_COMPONENT,
- display_edit_individual_event);
+ load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, display_edit_individual_event, NULL);
}
else {
/* new event */
- display_edit_individual_event(NULL, 0L);
+ display_edit_individual_event(NULL, 0L, "", 0, NULL);
}
}
-/**
- * \brief save an edited event
+/*
+ * save an edited event
*/
void save_event(void) {
long msgnum = 0L;
- msgnum = atol(bstr("msgnum"));
+ msgnum = lbstr("msgnum");
if (msgnum > 0L) {
- display_using_handler(msgnum, "text/calendar",
- ICAL_VEVENT_COMPONENT,
- save_individual_event);
+ /* load_ical_object(msgnum, 0, ICAL_VEVENT_COMPONENT, save_individual_event, NULL); */
+ load_ical_object(msgnum, 0, (-1), save_individual_event, NULL);
}
else {
- save_individual_event(NULL, 0L);
+ save_individual_event(NULL, 0L, "", 0, NULL);
}
}
@@ -928,14 +1116,14 @@ void save_event(void) {
-/**
- * \brief freebusy display (for client software)
- * \param req dunno. ?????
+/*
+ * Anonymous request of freebusy data for a user
*/
-void do_freebusy(char *req) {
+void do_freebusy(const char *req) {
char who[SIZ];
char buf[SIZ];
- char *fb;
+ int len;
+ long lines;
extract_token(who, req, 1, ' ', sizeof who);
if (!strncasecmp(who, "/freebusy/", 10)) {
@@ -943,10 +1131,11 @@ void do_freebusy(char *req) {
}
unescape_input(who);
- if ( (!strcasecmp(&who[strlen(who)-4], ".vcf"))
- || (!strcasecmp(&who[strlen(who)-4], ".ifb"))
- || (!strcasecmp(&who[strlen(who)-4], ".vfb")) ) {
- who[strlen(who)-4] = 0;
+ len = strlen(who);
+ if ( (!strcasecmp(&who[len-4], ".vcf"))
+ || (!strcasecmp(&who[len-4], ".ifb"))
+ || (!strcasecmp(&who[len-4], ".vfb")) ) {
+ who[len-4] = 0;
}
lprintf(9, "freebusy requested for <%s>\n", who);
@@ -954,22 +1143,30 @@ void do_freebusy(char *req) {
serv_getln(buf, sizeof buf);
if (buf[0] != '1') {
- wprintf("HTTP/1.1 404 %s\n", &buf[4]);
+ hprintf("HTTP/1.1 404 %s\n", &buf[4]);
output_headers(0, 0, 0, 0, 0, 0);
- wprintf("Content-Type: text/plain\r\n");
- wprintf("\r\n");
+ hprintf("Content-Type: text/plain\r\n");
wprintf("%s\n", &buf[4]);
+ end_burst();
return;
}
- fb = read_server_text();
- http_transmit_thing(fb, strlen(fb), "text/calendar", 0);
- free(fb);
+ read_server_text(WC->WBuf, &lines);
+ http_transmit_thing("text/calendar", 0);
}
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-/*@}*/
+void
+InitModule_CALENDAR
+(void)
+{
+ WebcitAddUrlHandler(HKEY("display_edit_task"), display_edit_task, 0);
+ WebcitAddUrlHandler(HKEY("save_task"), save_task, 0);
+ WebcitAddUrlHandler(HKEY("display_edit_event"), display_edit_event, 0);
+ WebcitAddUrlHandler(HKEY("save_event"), save_event, 0);
+ WebcitAddUrlHandler(HKEY("respond_to_request"), respond_to_request, 0);
+ WebcitAddUrlHandler(HKEY("handle_rsvp"), handle_rsvp, 0);
+}
|
![](\"static/calarea_48x.gif\")
");
+ StrBufAppendPrintf(Target, "![](\"static/error.gif\")
");
+ wprintf("![](\"static/taskmanag_48x.gif\")