* supplied_vevent the event to edit
* msgnum reference on the citserver
*/
-void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
+void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+ int unread, struct calview *calv)
+{
icalcomponent *vevent;
icalproperty *p;
icalvalue *v;
int i, j = 0;
int sequence = 0;
char weekday_labels[7][32];
+ long weekstart = 0;
+
+ get_pref_long("weekstart", &weekstart, 17);
+ if (weekstart > 6) weekstart = 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")
display_edit_individual_event(
icalcomponent_get_first_component(
vevent, ICAL_VEVENT_COMPONENT),
- msgnum, from, unread
+ msgnum, from, unread, NULL
);
return;
}
}
wprintf("</TEXTAREA></TD></TR>");
- /**
+ /*
* For a new event, the user creating the event should be the
* organizer. Set this field accordingly.
*/
);
}
- /**
+ /*
* Determine who is the organizer of this event.
* We need to determine "me" or "not me."
*/
wprintf("</I></FONT>\n");
}
- /**
+ /*
* Transmit the organizer as a hidden field. We don't want the user
* to be able to change it, but we do want it fed back to the server,
* especially if this is a new event and there is no organizer already
wprintf("</TD></TR>\n");
- /** Transparency */
+ /* Transparency */
wprintf("<TR><TD><B>");
wprintf(_("Show time as:"));
wprintf("</B></TD><TD>");
p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
if (p == NULL) {
- /** No transparency found. Default to opaque (busy). */
+ /* No transparency found. Default to opaque (busy). */
p = icalproperty_new_transp(ICAL_TRANSP_OPAQUE);
if (p != NULL) {
icalcomponent_add_property(vevent, p);
wprintf("</TD></TR>\n");
- /** Done with properties. */
+ /* Done with properties. */
wprintf("</TABLE>\n");
end_tab(0, 3);
wprintf(_("(One per line)"));
wprintf("</font>\n");
- /** Pop open an address book -- begin **/
+ /* Pop open an address book -- begin */
wprintf(
" <a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
"title=\"%s\">"
_("Attendees"),
_("Contacts")
);
- /* Pop open an address book -- end **/
+ /* Pop open an address book -- end */
wprintf("</TD><TD>"
"<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
strcpy(attendee_string, icalproperty_get_attendee(attendee));
if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
- /** screen name or email address */
+ /* screen name or email address */
strcpy(attendee_string, &attendee_string[7]);
striplt(attendee_string);
if (i++) wprintf("\n");
escputs(attendee_string);
wprintf(" ");
- /** participant status */
+ /* participant status */
partstat_as_string(buf, attendee);
escputs(buf);
}
/* blank recurrence with some sensible defaults */
memset(&recur, 0, sizeof(struct icalrecurrencetype));
recur.count = 3;
+ recur.until = icaltime_null_time();
recur.interval = 1;
recur.freq = ICAL_WEEKLY_RECURRENCE;
}
"onclick=\"RecurrenceShowHide();\""
" %s >%s",
(rrule ? "CHECKED=\"CHECKED\"" : "" ),
- _("This is a repeating event")
+ _("This is a recurring event")
);
- wprintf("<div id=\"rrule\">\n"); /* begin 'rrule' div */
+ wprintf("<div id=\"rrule_div\">\n"); /* begin 'rrule_div' div */
- wprintf("<table border=0 width=100%%>\n"); /* same table style as the event tab */
+ wprintf("<table border=0 cellspacing=\"10\" width=100%%>\n");
/* Table row displaying raw RRULE data, FIXME remove when finished */
if (rrule) {
_("never")
};
-
-
+ char *ordinals[] = {
+ "0",
+ _("first"),
+ _("second"),
+ _("third"),
+ _("fourth"),
+ _("fifth")
+ };
wprintf("<tr><td><b>");
wprintf(_("Recurrence rule"));
wprintf("</b></td><td>");
+
if ((recur.freq < 0) || (recur.freq > 6)) recur.freq = 4;
wprintf("%s ", _("Repeats every"));
wprintf("<input type=\"text\" name=\"interval\" maxlength=\"3\" size=\"3\" ");
- wprintf("value=\"%d\"> ", recur.interval);
+ wprintf("value=\"%d\"> ", recur.interval);
wprintf("<select name=\"freq\" id=\"freq_selector\" size=\"1\" "
"onChange=\"RecurrenceShowHide();\">\n");
}
}
- for (i=0; i<7; ++i) {
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
wprintf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
if (weekday_is_selected[i]) wprintf(" checked");
- wprintf(">%s</input>\n", weekday_labels[i]);
+ wprintf(">%s\n", weekday_labels[i]);
}
wprintf("</div>\n"); /* end 'weekday_selector' div */
- wprintf("</td></tr>\n");
+ int which_rrmonthtype_is_preselected = 0; /* FIXME set default correctly */
+
+ wprintf("<div id=\"monthday_selector\">"); /* begin 'monthday_selector' div */
+
+ wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
+ );
+
+ char mdaybox[128];
+ snprintf(mdaybox, sizeof mdaybox,
+ "<input type=\"text\" name=\"rrmday\" id=\"rrmday\" maxlength=\"2\" size=\"2\" "
+ "value=\"%d\">", 0); /* FIXME set the correct default */
+ wprintf(_("on day %s of the month"), mdaybox);
+ wprintf("<br />\n");
+ wprintf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
+ "%s onChange=\"RecurrenceShowHide();\">",
+ ((which_rrmonthtype_is_preselected == 1) ? "checked" : "")
+ );
- // FIXME preselect the correct radio button
+ wprintf(_("on the "));
+ wprintf("<select name=\"rrmweek\" id=\"rrmweek\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (i=1; i<=5; ++i) {
+ wprintf("<option %svalue=\"%d\">%s</option>\n",
+ ((0) ? "selected " : ""), /* FIXME set correct default */
+ i,
+ ordinals[i]
+ );
+ }
+ wprintf("</select> \n");
+
+ wprintf("<select name=\"rrmweekday\" id=\"rrmweekday\" size=\"1\" "
+ "onChange=\"RecurrenceShowHide();\">\n");
+ for (j=0; j<7; ++j) {
+ i = ((j + (int)weekstart) % 7);
+ wprintf("<option %svalue=\"%d\">%s</option>\n",
+ ((0) ? "selected " : ""), /* FIXME set correct default */
+ i,
+ weekday_labels[i]
+ );
+ }
+ wprintf("</select>");
+
+ wprintf(" %s<br />\n", _("of the month"));
+
+ wprintf("</div>\n"); /* end 'monthday_selector' div */
+
+
+
+ wprintf("</td></tr>\n");
+
+
+ int which_rrend_is_preselected = 0;
+ if (!icaltime_is_null_time(recur.until)) which_rrend_is_preselected = 2;
+ if (recur.count > 0) which_rrend_is_preselected = 1;
wprintf("<tr><td><b>");
wprintf(_("Recurrence range"));
wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (1 ? "checked" : "")
+ ((which_rrend_is_preselected == 0) ? "checked" : "")
);
- wprintf("%s</input><br />\n", _("No ending date"));
+ wprintf("%s<br />\n", _("No ending date"));
wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (0 ? "checked" : "")
+ ((which_rrend_is_preselected == 1) ? "checked" : "")
);
wprintf(_("Repeat this event"));
- wprintf("</input> ");
- wprintf("<input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
+ wprintf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
wprintf("value=\"%d\"> ", recur.count);
wprintf(_("times"));
wprintf("<br />\n");
wprintf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
"%s onChange=\"RecurrenceShowHide();\">",
- (0 ? "checked" : "")
+ ((which_rrend_is_preselected == 2) ? "checked" : "")
);
wprintf(_("Repeat this event until "));
- wprintf("</input>");
+
+ if (icaltime_is_null_time(recur.until)) {
+ recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
+ }
display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
wprintf("<br />\n");
wprintf("</td></tr>\n");
-
-
-
wprintf("</table>\n");
wprintf("</div>\n"); /* end 'rrule' div */
wprintf("</FORM>\n");
end_tab(3, 3);
- wprintf("</div>\n");
+ wprintf("</div>\n"); /* end 'fix_scrollbar_bug' div */
- wprintf("<script type=\"text/javascript\"> \n"
+ StrBufAppendPrintf(WC->trailing_javascript,
"eventEditAllDay(); \n"
"RecurrenceShowHide(); \n"
- "</script> \n"
);
address_book_popup();
wDumpContent(1);
* supplied_vevent: the event to save
* msgnum: the index on the citserver
*/
-void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from, int unread) {
+void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
+ int unread, struct calview *calv) {
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
if (supplied_vevent != NULL) {
vevent = supplied_vevent;
- /**
+ /*
* If we're looking at a fully encapsulated VCALENDAR
* rather than a VEVENT component, attempt to use the first
* relevant VEVENT subcomponent. If there is none, the
save_individual_event(
icalcomponent_get_first_component(
vevent, ICAL_VEVENT_COMPONENT),
- msgnum, from, unread
+ msgnum, from, unread, NULL
);
return;
}
if ( (havebstr("save_button"))
|| (havebstr("check_button")) ) {
- /** Replace values in the component with ones from the form */
+ /* Replace values in the component with ones from the form */
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SUMMARY_PROPERTY), prop != NULL) {
icaltime_from_webform(&event_start, "dtstart");
}
- /**
+ /*
* The following odd-looking snippet of code looks like it
* takes some unnecessary steps. It is done this way because
* libical incorrectly turns an "all day event" into a normal
);
}
- /** See if transparency is indicated */
+ /* See if transparency is indicated */
if (havebstr("transp")) {
if (!strcasecmp(bstr("transp"), "opaque")) {
formtransp = ICAL_TRANSP_OPAQUE;
icalcomponent_add_property(vevent, icalproperty_new_transp(formtransp));
}
- /** Give this event a UID if it doesn't have one. */
+ /* Give this event a UID if it doesn't have one. */
if (icalcomponent_get_first_property(vevent,
ICAL_UID_PROPERTY) == NULL) {
generate_uuid(buf);
icalcomponent_add_property(vevent, icalproperty_new_uid(buf));
}
- /** Increment the sequence ID */
+ /* Increment the sequence ID */
while (prop = icalcomponent_get_first_property(vevent,
ICAL_SEQUENCE_PROPERTY), (prop != NULL) ) {
i = icalproperty_get_sequence(prop);
icalproperty_new_sequence(sequence)
);
- /**
+ /*
* Set the organizer, only if one does not already exist *and*
* the form is supplying one
*/
ICAL_ORGANIZER_PROPERTY) == NULL)
&& (!IsEmptyStr(buf)) ) {
- /** set new organizer */
+ /* set new organizer */
sprintf(organizer_string, "MAILTO:%s", buf);
icalcomponent_add_property(vevent,
icalproperty_new_organizer(organizer_string)
}
- /**
+ /*
* Add any new attendees listed in the web form
*/
}
}
- /** Now iterate! */
+ /* Now iterate! */
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
striplt(buf);
}
}
- /**
+ /*
* Remove any attendees *not* listed in the web form
*/
STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
}
}
- /**
+ /*
* Encapsulate event into full VCALENDAR component. Clone it first,
* for two reasons: one, it's easier to just free the whole thing
* when we're done instead of unbundling, but more importantly, we
/* Set the method to PUBLISH */
icalcomponent_set_method(encaps, ICAL_METHOD_PUBLISH);
- /** If the user clicked 'Save' then save it to the server. */
+ /* If the user clicked 'Save' then save it to the server. */
if ( (encaps != NULL) && (havebstr("save_button")) ) {
serv_puts("ENT0 1|||4|||1|");
serv_getln(buf, sizeof buf);
encaps = NULL;
}
- /** Or, check attendee availability if the user asked for that. */
+ /* Or, check attendee availability if the user asked for that. */
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, from, unread);
+ /* This displays the form again, with our annotations */
+ display_edit_individual_event(encaps, msgnum, from, unread, NULL);
icalcomponent_free(encaps);
encaps = NULL;
projects / citadel.git / blobdiff