/*
* $Id$
- */
-/**
- * \defgroup EditCal Editing calendar events.
*
+ * Editing calendar events.
*/
-/*@{*/
+
#include "webcit.h"
#include "webserver.h"
-#ifdef WEBCIT_WITH_CALENDAR_SERVICE
-
-/**
+/*
* \brief Display an event by itself (for editing)
* \param supplied_vevent the event to edit
* \param msgnum reference on the citserver
*/
-void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
icalcomponent *vevent;
icalproperty *p;
icalvalue *v;
int i;
int sequence = 0;
+ lprintf(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
+ msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
+ );
+
now = time(NULL);
strcpy(organizer_string, "");
strcpy(attendee_string, "");
if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
display_edit_individual_event(
icalcomponent_get_first_component(
- vevent, ICAL_VEVENT_COMPONENT
- ), msgnum
+ vevent, ICAL_VEVENT_COMPONENT),
+ msgnum, from, unread
);
return;
}
/** Begin output */
output_headers(1, 1, 2, 0, 0, 0);
- wprintf("<div id=\"banner\">\n"
- "<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#444455\"><TR><TD>"
- "<SPAN CLASS=\"titlebar\">");
+ wprintf("<div id=\"banner\">\n");
+ wprintf("<h1>");
wprintf(_("Add or edit an event"));
- wprintf("</SPAN>"
- "</TD></TR></TABLE>\n"
- "</div>\n<div id=\"content\">\n"
- );
-
- wprintf("<script type=\"text/javascript\">"
- "function grey_all_day() { "
- "if (document.EventForm.alldayevent.checked) {"
- "document.EventForm.dtstart_hour.value='0';"
- "document.EventForm.dtstart_hour.disabled = true;"
- "document.EventForm.dtstart_minute.value='0';"
- "document.EventForm.dtstart_minute.disabled = true;"
- "document.EventForm.dtend_hour.value='0';"
- "document.EventForm.dtend_hour.disabled = true;"
- "document.EventForm.dtend_minute.value='0';"
- "document.EventForm.dtend_minute.disabled = true;"
- "document.EventForm.dtend_month.disabled = true;"
- "document.EventForm.dtend_day.disabled = true;"
- "document.EventForm.dtend_year.disabled = true;"
- "}"
- "else {"
- "document.EventForm.dtstart_hour.disabled = false;"
- "document.EventForm.dtstart_minute.disabled = false;"
- "document.EventForm.dtend_hour.disabled = false;"
- "document.EventForm.dtend_minute.disabled = false;"
- "document.EventForm.dtend_month.disabled = false;"
- "document.EventForm.dtend_day.disabled = false;"
- "document.EventForm.dtend_year.disabled = false;"
- "}"
- "}"
- "</script>\n"
- );
+ wprintf("</h1>");
+ wprintf("</div>\n");
+ wprintf("<div id=\"content\" class=\"service\">\n");
wprintf("<div class=\"fix_scrollbar_bug\">"
- "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+ "<table class=\"event_background\"><tr><td>\n");
/************************************************************
* Uncomment this to see the UID in calendar events for debugging
*************************************************************/
wprintf("<FORM NAME=\"EventForm\" METHOD=\"POST\" action=\"save_event\">\n");
+ wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
msgnum);
}
else {
localtime_r(&now, &tm_now);
- if (strlen(bstr("year")) > 0) {
- tm_now.tm_year = atoi(bstr("year")) - 1900;
- tm_now.tm_mon = atoi(bstr("month")) - 1;
- tm_now.tm_mday = atoi(bstr("day"));
+ if (havebstr("year")) {
+ tm_now.tm_year = ibstr("year") - 1900;
+ tm_now.tm_mon = ibstr("month") - 1;
+ tm_now.tm_mday = ibstr("day");
}
- if (strlen(bstr("hour")) > 0) {
- tm_now.tm_hour = atoi(bstr("hour"));
- tm_now.tm_min = atoi(bstr("minute"));
+ if (havebstr("hour")) {
+ tm_now.tm_hour = ibstr("hour");
+ tm_now.tm_min = ibstr("minute");
tm_now.tm_sec = 0;
}
else {
- tm_now.tm_hour = 9;
+ tm_now.tm_hour = 0;
tm_now.tm_min = 0;
tm_now.tm_sec = 0;
}
t_start = icaltime_from_timet_with_zone(
mktime(&tm_now),
- ((!strcasecmp(bstr("alldayevent"), "yes")) ? 1 : 0),
+ ((yesbstr("alldayevent")) ? 1 : 0),
icaltimezone_get_utc_timezone()
);
t_start.is_utc = 1;
}
display_icaltimetype_as_webform(&t_start, "dtstart");
- wprintf("<INPUT TYPE=\"checkbox\" NAME=\"alldayevent\" "
- "VALUE=\"yes\" onClick=\"grey_all_day();\""
+ wprintf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
+ "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
" %s >%s",
- (t_start.is_date ? "CHECKED" : "" ),
+ (t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
_("All day event")
);
*/
wprintf("<TR><TD><B>");
wprintf(_("End"));
- wprintf("</B></TD><TD>\n");
+ wprintf("</B></TD><TD id=\"dtendcell\">\n");
if (t_start.is_date) {
t_end = t_start;
}
* Determine who is the organizer of this event.
* We need to determine "me" or "not me."
*/
- organizer = icalcomponent_get_first_property(vevent,
- ICAL_ORGANIZER_PROPERTY);
+ organizer = icalcomponent_get_first_property(vevent, ICAL_ORGANIZER_PROPERTY);
if (organizer != NULL) {
strcpy(organizer_string, icalproperty_get_organizer(organizer));
if (!strncasecmp(organizer_string, "MAILTO:", 7)) {
strcpy(organizer_string, &organizer_string[7]);
striplt(organizer_string);
- lprintf(9, "ISME %s\n", organizer_string);
serv_printf("ISME %s", organizer_string);
serv_getln(buf, sizeof buf);
- lprintf(9, "%s\n", buf);
if (buf[0] == '2') {
organizer_is_me = 1;
}
wprintf("<TR><TD><B>");
wprintf(_("Attendees"));
wprintf("</B><br />"
- "<FONT SIZE=-2>");
+ "<font size=-2>");
wprintf(_("(One per line)"));
- wprintf("</FONT></TD><TD>"
- "<TEXTAREA %s NAME=\"attendees\" wrap=soft "
+ wprintf("</font>\n");
+
+ /** Pop open an address book -- begin **/
+ wprintf(
+ " <a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
+ "title=\"%s\">"
+ "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+ "</a>",
+ _("Attendees"),
+ _("Contacts")
+ );
+ /** Pop open an address book -- end **/
+
+ wprintf("</TD><TD>"
+ "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
"ROWS=3 COLS=80 WIDTH=80>\n",
(organizer_is_me ? "" : "DISABLED ")
);
wprintf("</td></tr></table></div>\n");
wprintf("<script type=\"text/javascript\">"
- "grey_all_day();"
+ "eventEditAllDay();"
"</script>\n"
);
+
+ address_book_popup();
wDumpContent(1);
if (created_new_vevent) {
* \param supplied_vevent the event to save
* \param msgnum the index on the citserver
*/
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
struct icaltimetype event_start, t;
icalproperty *attendee = NULL;
char attendee_string[SIZ];
- int i;
+ int i, j;
int foundit;
char form_attendees[SIZ];
char organizer_string[SIZ];
if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
save_individual_event(
icalcomponent_get_first_component(
- vevent, ICAL_VEVENT_COMPONENT
- ), msgnum
+ vevent, ICAL_VEVENT_COMPONENT),
+ msgnum, from, unread
);
return;
}
created_new_vevent = 1;
}
- if ( (strlen(bstr("save_button")) > 0)
- || (strlen(bstr("check_button")) > 0) ) {
+ if ( (havebstr("save_button"))
+ || (havebstr("check_button")) ) {
/** Replace values in the component with ones from the form */
icalcomponent_remove_property(vevent, prop);
icalproperty_free(prop);
}
- icalcomponent_add_property(vevent,
- icalproperty_new_summary(bstr("summary")));
- while (prop = icalcomponent_get_first_property(vevent,
- ICAL_LOCATION_PROPERTY), prop != NULL) {
- icalcomponent_remove_property(vevent, prop);
- icalproperty_free(prop);
- }
- icalcomponent_add_property(vevent,
- icalproperty_new_location(bstr("location")));
-
- while (prop = icalcomponent_get_first_property(vevent,
- ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
- icalcomponent_remove_property(vevent, prop);
- icalproperty_free(prop);
- }
- icalcomponent_add_property(vevent,
- icalproperty_new_description(bstr("description")));
+ if (havebstr("summary")) {
+
+ icalcomponent_add_property(vevent,
+ icalproperty_new_summary(bstr("summary")));
+ } else {
+ icalcomponent_add_property(vevent,
+ icalproperty_new_summary("Untitled Event"));
+ }
+ while (prop = icalcomponent_get_first_property(vevent,
+ ICAL_LOCATION_PROPERTY), prop != NULL) {
+ icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
+ }
+ if (havebstr("location")) {
+ icalcomponent_add_property(vevent,
+ icalproperty_new_location(bstr("location")));
+ }
+ while (prop = icalcomponent_get_first_property(vevent,
+ ICAL_DESCRIPTION_PROPERTY), prop != NULL) {
+ icalcomponent_remove_property(vevent, prop);
+ icalproperty_free(prop);
+ }
+ if (havebstr("description")) {
+ icalcomponent_add_property(vevent,
+ icalproperty_new_description(bstr("description")));
+ }
+
while (prop = icalcomponent_get_first_property(vevent,
ICAL_DTSTART_PROPERTY), prop != NULL) {
icalcomponent_remove_property(vevent, prop);
icalproperty_free(prop);
}
- if (!strcmp(bstr("alldayevent"), "yes")) {
+ if (yesbstr("alldayevent")) {
all_day_event = 1;
}
else {
*/
prop = icalproperty_new_dtstart(event_start);
if (all_day_event) {
- icalproperty_set_value(prop,
- icalvalue_new_date(event_start)
- );
+ icalproperty_set_value(prop, icalvalue_new_date(event_start));
}
if (prop) icalcomponent_add_property(vevent, prop);
}
/** See if transparency is indicated */
- if (strlen(bstr("transp")) > 0) {
+ if (havebstr("transp")) {
if (!strcasecmp(bstr("transp"), "opaque")) {
formtransp = ICAL_TRANSP_OPAQUE;
}
icalproperty_free(prop);
}
- lprintf(9, "adding new property...\n");
icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
- lprintf(9, "...added it.\n");
}
/** Give this event a UID if it doesn't have one. */
- lprintf(9, "Give this event a UID if it doesn't have one.\n");
if (icalcomponent_get_first_property(vevent,
ICAL_UID_PROPERTY) == NULL) {
generate_uuid(buf);
- icalcomponent_add_property(vevent,
- icalproperty_new_uid(buf)
- );
+ icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
}
/** Increment the sequence ID */
- lprintf(9, "Increment the sequence ID\n");
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
i = icalproperty_get_sequence(prop);
- lprintf(9, "Sequence was %d\n", i);
if (i > sequence) sequence = i;
icalcomponent_remove_property(vevent, prop);
icalproperty_free(prop);
}
++sequence;
- lprintf(9, "New sequence is %d. Adding...\n", sequence);
icalcomponent_add_property(vevent,
icalproperty_new_sequence(sequence)
);
* Set the organizer, only if one does not already exist *and*
* the form is supplying one
*/
- lprintf(9, "Setting the organizer...\n");
strcpy(buf, bstr("organizer"));
if ( (icalcomponent_get_first_property(vevent,
ICAL_ORGANIZER_PROPERTY) == NULL)
- && (strlen(buf) > 0) ) {
+ && (!IsEmptyStr(buf)) ) {
/** set new organizer */
sprintf(organizer_string, "MAILTO:%s", buf);
icalcomponent_add_property(vevent,
- icalproperty_new_organizer(organizer_string)
+ icalproperty_new_organizer(organizer_string)
);
}
/**
* Add any new attendees listed in the web form
*/
- lprintf(9, "Add any new attendees\n");
/* First, strip out the parenthesized partstats. */
strcpy(form_attendees, bstr("attendees"));
stripout(form_attendees, '(', ')');
+ /* Next, change any commas to newlines, because we want newline-separated attendees. */
+ j = strlen(form_attendees);
+ for (i=0; i<j; ++i) {
+ if (form_attendees[i] == ',') {
+ form_attendees[i] = '\n';
+ while (isspace(form_attendees[i+1])) {
+ strcpy(&form_attendees[i+1], &form_attendees[i+2]);
+ }
+ }
+ }
+
/** Now iterate! */
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
striplt(buf);
- if (strlen(buf) > 0) {
- lprintf(9, "Attendee: <%s>\n", buf);
+ if (!IsEmptyStr(buf)) {
sprintf(attendee_string, "MAILTO:%s", buf);
foundit = 0;
/**
* Remove any attendees *not* listed in the web form
*/
-STARTOVER: lprintf(9, "Remove unlisted attendees\n");
- for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
+STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
strcpy(attendee_string, icalproperty_get_attendee(attendee));
if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
strcpy(attendee_string, &attendee_string[7]);
* can't encapsulate something that may already be encapsulated
* somewhere else.
*/
- lprintf(9, "Encapsulating into full VCALENDAR component\n");
encaps = ical_encapsulate_subcomponent(icalcomponent_new_clone(vevent));
+ /* Set the method to PUBLISH */
+ icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
+
/** If the user clicked 'Save' then save it to the server. */
- lprintf(9, "Serializing it for saving\n");
- if ( (encaps != NULL) && (strlen(bstr("save_button")) > 0) ) {
+ if ( (encaps != NULL) && (havebstr("save_button")) ) {
serv_puts("ENT0 1|||4|||1|");
serv_getln(buf, sizeof buf);
if (buf[0] == '8') {
serv_puts(icalcomponent_as_ical_string(encaps));
serv_puts("000");
}
- while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
- lprintf(9, "ENT0 REPLY: %s\n", buf);
+ if ( (buf[0] == '8') || (buf[0] == '4') ) {
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
+ }
}
+ if (buf[0] == '2') {
+ strcpy(WC->ImportantMessage, &buf[4]);
+ }
+ icalmemory_free_ring ();
icalcomponent_free(encaps);
}
/** Or, check attendee availability if the user asked for that. */
- if ( (encaps != NULL) && (strlen(bstr("check_button")) > 0) ) {
+ if ( (encaps != NULL) && (havebstr("check_button")) ) {
/** Call this function, which does the real work */
check_attendee_availability(encaps);
/** This displays the form again, with our annotations */
- display_edit_individual_event(encaps, msgnum);
+ display_edit_individual_event(encaps, msgnum, from, unread);
icalcomponent_free(encaps);
}
/**
* If the user clicked 'Delete' then delete it.
*/
- lprintf(9, "Checking to see if we have to delete an old event\n");
- if ( (strlen(bstr("delete_button")) > 0) && (msgnum > 0L) ) {
- serv_printf("DELE %ld", atol(bstr("msgnum")));
+ if ( (havebstr("delete_button")) && (msgnum > 0L) ) {
+ serv_printf("DELE %ld", lbstr("msgnum"));
serv_getln(buf, sizeof buf);
}
icalcomponent_free(vevent);
}
- /** If this was a save or deelete, go back to the calendar view. */
- if (strlen(bstr("check_button")) == 0) {
+ /** If this was a save or delete, go back to the calendar view. */
+ if (!havebstr("check_button")) {
readloop("readfwd");
}
}
-#endif /* WEBCIT_WITH_CALENDAR_SERVICE */
-
-/*@}*/
projects / citadel.git / blobdiff