/*
* Editing calendar events.
*
- * Copyright (c) 1996-2012 by the citadel.org team
+ * 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;
int which_rryeartype_is_preselected;
const char *ch;
- char *tabnames[3];
+ const char *tabnames[3];
const char *frequency_units[8];
const char *ordinals[6];
get_pref_long("weekstart", &weekstart, 17);
if (weekstart > 6) weekstart = 0;
- syslog(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")
);
}
*/
/* 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("<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=\"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",
((yesbstr("alldayevent")) ? 1 : 0),
icaltimezone_get_utc_timezone()
);
- t_start.is_utc = 1;
-
}
display_icaltimetype_as_webform(&t_start, "dtstart", 0);
strcpy(organizer_string, icalproperty_get_organizer(organizer));
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') {
/* screen name or email address */
safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
- striplt(attendee_string);
+ string_trim(attendee_string);
if (i++) wc_printf("\n");
escputs(attendee_string);
wc_printf(" ");
"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;
/* Add NOW() to the calendar object... */
icalcomponent_set_dtstamp(vevent,
- icaltime_from_timet(
- time(NULL), 0));
+ icaltime_from_timet_with_zone(
+ time(NULL), 0, icaltimezone_get_utc_timezone()));
if (havebstr("summary")) {
icalcomponent_add_property(vevent,
/* 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;
ch = icalproperty_get_attendee(attendee);
if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
safestrncpy(attendee_string, ch + 7, sizeof(attendee_string));
- striplt(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) {
serv_puts("Content-type: text/calendar");
serv_puts("Content-Transfer-Encoding: quoted-printable");
serv_puts("");
- text_to_server_qp(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");
case '4':
/* If this was a save or delete, go back to the calendar or summary view. */
if (!havebstr("check_button")) {
if (!strcasecmp(bstr("calview"), "summary")) {
- do_template("summary_page");
+ display_summary_page();
}
else {
readloop(readfwd, eUseDefault);