/*
- * $Id$
- *
* Editing calendar events.
+ *
+ * Copyright (c) 2002-2012 by the citadel.org team
+ *
+ * This program is open source software. You can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "webcit.h"
-#include "webserver.h"
+
#include "calendar.h"
/*
void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
int unread, calview *calv)
{
+ wcsession *WCC = WC;
icalcomponent *vevent;
icalproperty *p;
icalvalue *v;
char buf[SIZ];
int organizer_is_me = 0;
int i, j = 0;
+ /************************************************************
+ * Uncomment this to see the UID in calendar events for debugging
int sequence = 0;
+ */
char weekday_labels[7][32];
char month_labels[12][32];
long weekstart = 0;
int which_rrend_is_preselected;
int which_rryeartype_is_preselected;
-
- char *tabnames[3];
+ const char *ch;
+ const char *tabnames[3];
const char *frequency_units[8];
const char *ordinals[6];
ordinals[4] = _("fourth");
ordinals[5] = _("fifth");
-
+
tabnames[0] = _("Event");
tabnames[1] = _("Attendees");
tabnames[2] = _("Recurrence");
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",
+ syslog(LOG_DEBUG, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
);
/* Learn the sequence */
p = icalcomponent_get_first_property(vevent, ICAL_SEQUENCE_PROPERTY);
+ /************************************************************
+ * Uncomment this to see the UID in calendar events for debugging
if (p != NULL) {
sequence = icalproperty_get_sequence(p);
}
-
+ */
/* Begin output */
- output_headers(1, 1, 2, 0, 0, 0);
- wc_printf("<div id=\"banner\">\n");
+ output_headers(1, 1, 1, 0, 0, 0);
+ wc_printf("<div id=\"room_banner_override\">\n");
wc_printf("<h1>");
wc_printf(_("Add or edit an event"));
wc_printf("</h1>");
wc_printf("<div id=\"content\" class=\"service\">\n");
- wc_printf("<div class=\"fix_scrollbar_bug\">");
-
/************************************************************
* Uncomment this to see the UID in calendar events for debugging
wc_printf("UID == ");
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wc_printf("<br />\n");
- wc_printf("SEQUENCE == %d<br />\n", sequence);
+ wc_printf("<br>\n");
+ wc_printf("SEQUENCE == %d<br>\n", sequence);
*************************************************************/
wc_printf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
+ wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+ StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+ wc_printf("\">\n");
+
+ wc_printf("<input type=\"hidden\" name=\"msgnum\" value=\"%ld\">\n",
msgnum);
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"calview\" value=\"%s\">\n",
bstr("calview"));
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"year\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"year\" value=\"%s\">\n",
bstr("year"));
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"month\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"month\" value=\"%s\">\n",
bstr("month"));
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
+ wc_printf("<input type=\"hidden\" name=\"day\" value=\"%s\">\n",
bstr("day"));
begin_tab(0, 3);
/* Put it in a borderless table so it lines up nicely */
- wc_printf("<TABLE border=0 width=100%%>\n");
+ wc_printf("<table border='0' width='100%%'>\n");
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Summary"));
- wc_printf("</B></TD><TD>\n"
- "<INPUT TYPE=\"text\" NAME=\"summary\" "
- "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
+ wc_printf("</b></td><td>\n"
+ "<input type=\"text\" name=\"summary\" "
+ "maxlength=\"64\" size=\"64\" value=\"");
p = icalcomponent_get_first_property(vevent, ICAL_SUMMARY_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wc_printf("\"></TD></TR>\n");
+ wc_printf("\"></td></tr>\n");
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Location"));
- wc_printf("</B></TD><TD>\n"
- "<INPUT TYPE=\"text\" NAME=\"location\" "
- "MAXLENGTH=\"64\" SIZE=\"64\" VALUE=\"");
+ wc_printf("</b></td><td>\n"
+ "<input type=\"text\" name=\"location\" "
+ "maxlength=\"64\" size=\"64\" value=\"");
p = icalcomponent_get_first_property(vevent, ICAL_LOCATION_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wc_printf("\"></TD></TR>\n");
+ wc_printf("\"></td></tr>\n");
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Start"));
- wc_printf("</B></TD><TD>\n");
+ wc_printf("</b></td><td>\n");
p = icalcomponent_get_first_property(vevent, ICAL_DTSTART_PROPERTY);
if (p != NULL) {
t_start = icalproperty_get_dtstart(p);
((yesbstr("alldayevent")) ? 1 : 0),
icaltimezone_get_utc_timezone()
);
- t_start.is_utc = 1;
-
}
display_icaltimetype_as_webform(&t_start, "dtstart", 0);
- wc_printf("<INPUT TYPE=\"checkbox\" id=\"alldayevent\" NAME=\"alldayevent\" "
- "VALUE=\"yes\" onclick=\"eventEditAllDay();\""
+ wc_printf("<input type=\"checkbox\" id=\"alldayevent\" name=\"alldayevent\" "
+ "value=\"yes\" onclick=\"eventEditAllDay();\""
" %s >%s",
- (t_start.is_date ? "CHECKED=\"CHECKED\"" : "" ),
+ (t_start.is_date ? "checked=\"checked\"" : "" ),
_("All day event")
);
- wc_printf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("End"));
- wc_printf("</B></TD><TD id=\"dtendcell\">\n");
+ wc_printf("</b></td><td id=\"dtendcell\">\n");
p = icalcomponent_get_first_property(vevent,
ICAL_DTEND_PROPERTY);
if (p != NULL) {
t_end = icalproperty_get_dtend(p);
-
+
/*
* If this is an all-day-event, the end time is set to real end
- * day + 1, so we have to adjust accordingly.
+ * day + 1, so we have to adjust accordingly.
*/
if (t_start.is_date) {
icaltime_adjust(&t_end, -1, 0, 0, 0);
}
}
display_icaltimetype_as_webform(&t_end, "dtend", 0);
- wc_printf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Notes"));
- wc_printf("</B></TD><TD>\n"
- "<TEXTAREA NAME=\"description\" wrap=soft "
- "ROWS=5 COLS=72 WIDTH=72>\n"
+ wc_printf("</b></td><td>\n"
+ "<textarea name=\"description\" "
+ "rows='5' cols='72' style='width:72'>\n"
);
p = icalcomponent_get_first_property(vevent, ICAL_DESCRIPTION_PROPERTY);
if (p != NULL) {
escputs((char *)icalproperty_get_comment(p));
}
- wc_printf("</TEXTAREA></TD></TR>");
+ wc_printf("</textarea></td></tr>");
/*
* For a new event, the user creating the event should be the
*/
if (icalcomponent_get_first_property(vevent, ICAL_ORGANIZER_PROPERTY)
== NULL) {
- sprintf(organizer_string, "MAILTO:%s", ChrPtr(WC->cs_inet_email));
+ sprintf(organizer_string, "mailto:%s", ChrPtr(WC->cs_inet_email));
icalcomponent_add_property(vevent,
icalproperty_new_organizer(organizer_string)
);
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)) {
+ if (!strncasecmp(organizer_string, "mailto:", 7)) {
strcpy(organizer_string, &organizer_string[7]);
- striplt(organizer_string);
+ string_trim(organizer_string);
serv_printf("ISME %s", organizer_string);
serv_getln(buf, sizeof buf);
if (buf[0] == '2') {
}
}
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Organizer"));
- wc_printf("</B></TD><TD>");
+ wc_printf("</b></td><td>");
escputs(organizer_string);
if (organizer_is_me) {
- wc_printf(" <FONT SIZE=-1><I>");
+ wc_printf(" <font size='-1'><i>");
wc_printf(_("(you are the organizer)"));
- wc_printf("</I></FONT>\n");
+ wc_printf("</i></font>\n");
}
/*
* especially if this is a new event and there is no organizer already
* in the calendar object.
*/
- wc_printf("<INPUT TYPE=\"hidden\" NAME=\"organizer\" VALUE=\"");
+ wc_printf("<input type=\"hidden\" name=\"organizer\" value=\"");
escputs(organizer_string);
wc_printf("\">");
- wc_printf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
/* Transparency */
- wc_printf("<TR><TD><B>");
+ wc_printf("<tr><td><b>");
wc_printf(_("Show time as:"));
- wc_printf("</B></TD><TD>");
+ wc_printf("</b></td><td>");
p = icalcomponent_get_first_property(vevent, ICAL_TRANSP_PROPERTY);
if (p == NULL) {
v = NULL;
}
- wc_printf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"transparent\"");
+ wc_printf("<input type=\"radio\" name=\"transp\" value=\"transparent\"");
if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_TRANSPARENT)) {
wc_printf(" CHECKED");
}
wc_printf(_("Free"));
wc_printf(" ");
- wc_printf("<INPUT TYPE=\"radio\" NAME=\"transp\" VALUE=\"opaque\"");
+ wc_printf("<input type=\"radio\" name=\"transp\" value=\"opaque\"");
if ((v != NULL) && (icalvalue_get_transp(v) == ICAL_TRANSP_OPAQUE)) {
wc_printf(" CHECKED");
}
wc_printf(">");
wc_printf(_("Busy"));
- wc_printf("</TD></TR>\n");
+ wc_printf("</td></tr>\n");
/* Done with properties. */
/* Attendees tab (need to move things here) */
begin_tab(1, 3);
- wc_printf("<TABLE border=0 width=100%%>\n"); /* same table style as the event tab */
- wc_printf("<TR><TD><B>");
+ wc_printf("<table border='0' width='100%%'>\n"); /* same table style as the event tab */
+ wc_printf("<tr><td><b>");
wc_printf(_("Attendees"));
- wc_printf("</B><br />"
- "<font size=-2>");
+ wc_printf("</b><br>"
+ "<font size='-2'>");
wc_printf(_("(One per line)"));
wc_printf("</font>\n");
wc_printf(
" <a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
"title=\"%s\">"
- "<img align=middle border=0 width=24 height=24 src=\"static/viewcontacts_24x.gif\">"
+ "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/webcit_icons/essen/16x16/contact.png\">"
"</a>",
_("Attendees"),
_("Contacts")
);
/* Pop open an address book -- end */
- wc_printf("</TD><TD>"
- "<TEXTAREA %s NAME=\"attendees\" id=\"attendees_box\" wrap=soft "
+ wc_printf("</td><td>"
+ "<textarea %s name=\"attendees\" id=\"attendees_box\" "
"onchange=\"EnableOrDisableCheckButton();\" "
"onKeyPress=\"EnableOrDisableCheckButton();\" "
- "ROWS=10 COLS=72 WIDTH=72>\n",
- (organizer_is_me ? "" : "DISABLED ")
+ "rows='10' cols='72' style='width:72'>\n",
+ (organizer_is_me ? "" : "disabled='disabled' ")
);
i = 0;
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)) {
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strncasecmp(ch, "mailto:", 7)) {
/* screen name or email address */
- strcpy(attendee_string, &attendee_string[7]);
- striplt(attendee_string);
+ safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
+ string_trim(attendee_string);
if (i++) wc_printf("\n");
escputs(attendee_string);
wc_printf(" ");
escputs(buf);
}
}
- wc_printf("</TEXTAREA></TD></TR>\n");
- wc_printf("</TABLE>\n");
+ wc_printf("</textarea></td></tr>\n");
+ wc_printf("</table>\n");
end_tab(1, 3);
/* Recurrence tab */
recur.freq = ICAL_WEEKLY_RECURRENCE;
}
- wc_printf("<INPUT TYPE=\"checkbox\" id=\"is_recur\" NAME=\"is_recur\" "
- "VALUE=\"yes\" "
+ wc_printf("<input type=\"checkbox\" id=\"is_recur\" name=\"is_recur\" "
+ "value=\"yes\" "
"onclick=\"RecurrenceShowHide();\""
" %s >%s",
- (rrule ? "CHECKED=\"CHECKED\"" : "" ),
+ (rrule ? "checked=\"checked\"" : "" ),
_("This is a recurring event")
);
wc_printf("<div id=\"rrule_div\">\n"); /* begin 'rrule_div' div */
- wc_printf("<table border=0 cellspacing=\"10\" width=100%%>\n");
+ wc_printf("<table border='0' cellspacing='10' width='100%%'>\n");
wc_printf("<tr><td><b>");
wc_printf(_("Recurrence rule"));
"onChange=\"RecurrenceShowHide();\">\n");
for (i=0; i<(sizeof frequency_units / sizeof(char *)); ++i) {
wc_printf("<option %s%svalue=\"%d\">%s</option>\n",
- ((i == recur.freq) ? "selected " : ""),
- (((i == recur.freq) || ((i>=3)&&(i<=6))) ? "" : "disabled "),
+ ((i == recur.freq) ? "selected='selected' " : ""),
+ (((i == recur.freq) || ((i>=3)&&(i<=6))) ? "" : "disabled='disabled' "),
i,
frequency_units[i]
);
for (j=0; j<7; ++j) {
i = ((j + (int)weekstart) % 7);
wc_printf("<input type=\"checkbox\" name=\"weekday%d\" value=\"yes\"", i);
- if (weekday_is_selected[i]) wc_printf(" checked");
+ if (weekday_is_selected[i]) wc_printf(" checked='checked'");
wc_printf(">%s\n", weekday_labels[i]);
}
wc_printf("</div>\n"); /* end 'weekday_selector' div */
wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_mday\" "
"value=\"rrmonthtype_mday\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rrmonthtype_is_preselected == 0) ? "checked" : "")
+ ((which_rrmonthtype_is_preselected == 0) ? "checked='checked'" : "")
);
rrmday = t_start.day;
}
wc_printf(_("on day %s%d%s of the month"), "<span id=\"rrmday\">", rrmday, "</span>");
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("<input type=\"radio\" name=\"rrmonthtype\" id=\"rrmonthtype_wday\" "
"value=\"rrmonthtype_wday\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rrmonthtype_is_preselected == 1) ? "checked" : "")
+ ((which_rrmonthtype_is_preselected == 1) ? "checked='checked'" : "")
);
wc_printf(_("on the "));
"onChange=\"RecurrenceShowHide();\">\n");
for (i=1; i<=5; ++i) {
wc_printf("<option %svalue=\"%d\">%s</option>\n",
- ((i==rrmweek) ? "selected " : ""),
+ ((i==rrmweek) ? "selected='selected' " : ""),
i,
ordinals[i]
);
for (j=0; j<7; ++j) {
i = ((j + (int)weekstart) % 7);
wc_printf("<option %svalue=\"%d\">%s</option>\n",
- ((i==rrmweekday) ? "selected " : ""),
+ ((i==rrmweekday) ? "selected='selected' " : ""),
i,
weekday_labels[i]
);
}
wc_printf("</select>");
- wc_printf(" %s<br />\n", _("of the month"));
+ wc_printf(" %s<br>\n", _("of the month"));
wc_printf("</div>\n"); /* end 'monthday_selector' div */
which_rryeartype_is_preselected = 0;
if (
- (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX)
- && (recur.by_day[0] != 0)
+ (recur.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX)
+ && (recur.by_day[0] != 0)
&& (recur.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX)
&& (recur.by_month[0] != 0)
) {
wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ymday\" "
"value=\"rryeartype_ymday\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rryeartype_is_preselected == 0) ? "checked" : "")
+ ((which_rryeartype_is_preselected == 0) ? "checked='checked'" : "")
);
wc_printf(_("every "));
- wc_printf("<span id=\"ymday\">%s</span><br />", _("year on this date"));
+ wc_printf("<span id=\"ymday\">%s</span><br>", _("year on this date"));
wc_printf("<input type=\"radio\" name=\"rryeartype\" id=\"rryeartype_ywday\" "
"value=\"rryeartype_ywday\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rryeartype_is_preselected == 1) ? "checked" : "")
+ ((which_rryeartype_is_preselected == 1) ? "checked='checked'" : "")
);
wc_printf(_("on the "));
"onChange=\"RecurrenceShowHide();\">\n");
for (i=1; i<=5; ++i) {
wc_printf("<option %svalue=\"%d\">%s</option>\n",
- ((i==rrymweek) ? "selected " : ""),
+ ((i==rrymweek) ? "selected='selected' " : ""),
i,
ordinals[i]
);
for (j=0; j<7; ++j) {
i = ((j + (int)weekstart) % 7);
wc_printf("<option %svalue=\"%d\">%s</option>\n",
- ((i==rrymweekday) ? "selected " : ""),
+ ((i==rrymweekday) ? "selected='selected' " : ""),
i,
weekday_labels[i]
);
"onChange=\"RecurrenceShowHide();\">\n");
for (i=1; i<=12; ++i) {
wc_printf("<option %svalue=\"%d\">%s</option>\n",
- ((i==rrymonth) ? "selected " : ""),
+ ((i==rrymonth) ? "selected='selected' " : ""),
i,
month_labels[i-1]
);
}
wc_printf("</select>");
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("</div>\n"); /* end 'yearday_selector' div */
wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_none\" "
"value=\"rrend_none\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rrend_is_preselected == 0) ? "checked" : "")
+ ((which_rrend_is_preselected == 0) ? "checked='checked'" : "")
);
- wc_printf("%s<br />\n", _("No ending date"));
+ wc_printf("%s<br>\n", _("No ending date"));
wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_count\" "
"value=\"rrend_count\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rrend_is_preselected == 1) ? "checked" : "")
+ ((which_rrend_is_preselected == 1) ? "checked='checked'" : "")
);
wc_printf(_("Repeat this event"));
wc_printf(" <input type=\"text\" name=\"rrcount\" id=\"rrcount\" maxlength=\"3\" size=\"3\" ");
wc_printf("value=\"%d\"> ", recur.count);
wc_printf(_("times"));
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("<input type=\"radio\" name=\"rrend\" id=\"rrend_until\" "
"value=\"rrend_until\" "
"%s onChange=\"RecurrenceShowHide();\">",
- ((which_rrend_is_preselected == 2) ? "checked" : "")
+ ((which_rrend_is_preselected == 2) ? "checked='checked'" : "")
);
wc_printf(_("Repeat this event until "));
recur.until = icaltime_add(t_start, icaldurationtype_from_int(604800));
}
display_icaltimetype_as_webform(&recur.until, "rruntil", 1);
- wc_printf("<br />\n");
+ wc_printf("<br>\n");
wc_printf("</td></tr>\n");
/* submit buttons (common area beneath the tabs) */
begin_tab(3, 3);
- wc_printf("<CENTER>"
- "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
+ wc_printf("<center>"
+ "<input type=\"submit\" name=\"save_button\" value=\"%s\">"
" "
- "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
+ "<input type=\"submit\" name=\"delete_button\" value=\"%s\">\n"
" "
- "<INPUT TYPE=\"submit\" id=\"check_button\" NAME=\"check_button\" VALUE=\"%s\">\n"
+ "<input type=\"submit\" id=\"check_button\" name=\"check_button\" value=\"%s\">\n"
" "
- "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
- "</CENTER>\n",
+ "<input type=\"submit\" name=\"cancel_button\" value=\"%s\">\n"
+ "</center>\n",
_("Save"),
_("Delete"),
_("Check attendee availability"),
_("Cancel")
);
- wc_printf("</FORM>\n");
end_tab(3, 3);
-
- wc_printf("</div>\n"); /* end 'fix_scrollbar_bug' div */
+ wc_printf("</form>\n");
StrBufAppendPrintf(WC->trailing_javascript,
"eventEditAllDay(); \n"
"RecurrenceShowHide(); \n"
"EnableOrDisableCheckButton(); \n"
);
- address_book_popup();
+ do_template("addressbook_popup");
+
wDumpContent(1);
if (created_new_vevent) {
*/
void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
int unread, calview *calv) {
+ StrBuf *Buf;
char buf[SIZ];
icalproperty *prop;
icalcomponent *vevent, *encaps;
char organizer_string[SIZ];
int sequence = 0;
enum icalproperty_transp formtransp = ICAL_TRANSP_NONE;
+ const char *ch;
if (supplied_vevent != NULL) {
vevent = supplied_vevent;
if (icalcomponent_isa(vevent) == ICAL_VCALENDAR_COMPONENT) {
save_individual_event(
icalcomponent_get_first_component(
- vevent, ICAL_VEVENT_COMPONENT),
+ vevent, ICAL_VEVENT_COMPONENT),
msgnum, from, unread, NULL
);
return;
}
/* Add NOW() to the calendar object... */
- icalcomponent_set_dtstamp(vevent,
- icaltime_from_timet(
- time(NULL), 0));
+ icalcomponent_set_dtstamp(vevent,
+ icaltime_from_timet_with_zone(
+ time(NULL), 0, icaltimezone_get_utc_timezone()));
if (havebstr("summary")) {
icalcomponent_add_property(vevent,
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);
}
if (all_day_event) {
- icaltime_from_webform_dateonly(&t, "dtend");
+ icaltime_from_webform_dateonly(&t, "dtend");
/* with this field supposed to be non-inclusive we have to add one day */
icaltime_adjust(&t, 1, 0, 0, 0);
}
else {
- icaltime_from_webform(&t, "dtend");
+ icaltime_from_webform(&t, "dtend");
}
icalcomponent_add_property(vevent,
icalcomponent_add_property(vevent,
icalproperty_new_sequence(sequence)
);
-
+
/*
* Set the organizer, only if one does not already exist *and*
* the form is supplying one
*/
strcpy(buf, bstr("organizer"));
if ( (icalcomponent_get_first_property(vevent,
- ICAL_ORGANIZER_PROPERTY) == NULL)
+ ICAL_ORGANIZER_PROPERTY) == NULL)
&& (!IsEmptyStr(buf)) ) {
/* set new organizer */
/* Now iterate! */
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
- striplt(buf);
+ string_trim(buf);
if (!IsEmptyStr(buf)) {
sprintf(attendee_string, "MAILTO:%s", buf);
foundit = 0;
for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDEE_PROPERTY); attendee != NULL; attendee = icalcomponent_get_next_property(vevent, ICAL_ATTENDEE_PROPERTY)) {
- if (!strcasecmp(attendee_string,
- icalproperty_get_attendee(attendee)))
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strcasecmp(attendee_string, ch))
++foundit;
}
if (foundit == 0) {
icalcomponent_add_property(vevent,
- icalproperty_new_attendee(attendee_string)
+ icalproperty_new_attendee(attendee_string)
);
}
}
* 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)) {
- strcpy(attendee_string, icalproperty_get_attendee(attendee));
- if (!strncasecmp(attendee_string, "MAILTO:", 7)) {
- strcpy(attendee_string, &attendee_string[7]);
- striplt(attendee_string);
+ ch = icalproperty_get_attendee(attendee);
+ if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
+ safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
+ string_trim(attendee_string);
foundit = 0;
for (i=0; i<num_tokens(form_attendees, '\n'); ++i) {
extract_token(buf, form_attendees, i, '\n', sizeof buf);
- striplt(buf);
+ string_trim(buf);
if (!strcasecmp(buf, attendee_string)) ++foundit;
}
if (foundit == 0) {
if ( (encaps != NULL) && (havebstr("save_button")) ) {
serv_puts("ENT0 1|||4|||1|");
serv_getln(buf, sizeof buf);
- if (buf[0] == '8') {
+ switch (buf[0]) {
+ case '8':
serv_puts("Content-type: text/calendar");
+ serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
- serv_puts(icalcomponent_as_ical_string(encaps));
+ Buf = NewStrBufPlain(icalcomponent_as_ical_string(encaps), -1);
+ text_to_server_qp(Buf);
+ FreeStrBuf(&Buf);
+// serv_puts(icalcomponent_as_ical_string(encaps));
serv_puts("000");
- }
- 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]);
+ case '4':
+ while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {}
+ break;
+ case '2':
+ AppendImportantMessage(buf + 4, - 1);
+ break;
+ default:
+ break;
}
icalmemory_free_ring ();
icalcomponent_free(encaps);
/* If this was a save or delete, go back to the calendar or summary view. */
if (!havebstr("check_button")) {
if (!strcasecmp(bstr("calview"), "summary")) {
- summary();
+ display_summary_page();
}
else {
readloop(readfwd, eUseDefault);
projects / citadel.git / blobdiff