X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fevent.c;h=d786998ab8ef818c0d5bebf7e15b291c1b04b7e1;hb=HEAD;hp=56cee1e077f80ddbbce69da8821537e9f0d3e82c;hpb=85b8087bf603edb5320f0bc9da18ed2294204ca2;p=citadel.git diff --git a/webcit/event.c b/webcit/event.c index 56cee1e07..ffe0688ab 100644 --- a/webcit/event.c +++ b/webcit/event.c @@ -1,25 +1,19 @@ /* * Editing calendar events. * - * Copyright (c) 1996-2010 by the citadel.org team + * Copyright (c) 2002-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "webcit.h" -#include "webserver.h" + #include "calendar.h" /* @@ -30,6 +24,7 @@ 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; @@ -44,7 +39,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, 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; @@ -65,8 +63,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, 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]; @@ -95,7 +93,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, 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") ); @@ -157,13 +155,15 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, /* 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("
\n"); + output_headers(1, 1, 1, 0, 0, 0); + wc_printf("
\n"); wc_printf("

"); wc_printf(_("Add or edit an event")); wc_printf("

"); @@ -178,13 +178,17 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, if (p != NULL) { escputs((char *)icalproperty_get_comment(p)); } - wc_printf("
\n"); - wc_printf("SEQUENCE == %d
\n", sequence); + wc_printf("
\n"); + wc_printf("SEQUENCE == %d
\n", sequence); *************************************************************/ wc_printf("
\n"); wc_printf("\n", WC->nonce); + wc_printf("WBuf, WCC->CurRoom.name, NULL, 0, 0); + wc_printf("\">\n"); + wc_printf("\n", msgnum); wc_printf("\n", @@ -260,8 +264,6 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, ((yesbstr("alldayevent")) ? 1 : 0), icaltimezone_get_utc_timezone() ); - t_start.is_utc = 1; - } display_icaltimetype_as_webform(&t_start, "dtstart", 0); @@ -357,7 +359,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, 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') { @@ -436,7 +438,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, wc_printf("\n"); /* same table style as the event tab */ wc_printf("\n"); @@ -775,7 +777,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, "RecurrenceShowHide(); \n" "EnableOrDisableCheckButton(); \n" ); - address_book_popup(); + do_template("addressbook_popup"); + wDumpContent(1); if (created_new_vevent) { @@ -791,6 +794,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, */ 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; @@ -805,6 +809,7 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr char organizer_string[SIZ]; int sequence = 0; enum icalproperty_transp formtransp = ICAL_TRANSP_NONE; + const char *ch; if (supplied_vevent != NULL) { vevent = supplied_vevent; @@ -847,8 +852,8 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr /* 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, @@ -1093,21 +1098,21 @@ void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *fr /* Now iterate! */ for (i=0; iImportantMessage, &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); @@ -1203,7 +1214,7 @@ STARTOVER: for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE /* 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);
"); wc_printf(_("Attendees")); - wc_printf("
" + wc_printf("
" ""); wc_printf(_("(One per line)")); wc_printf("\n"); @@ -445,7 +447,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, wc_printf( " " - "" + "" "", _("Attendees"), _("Contacts") @@ -463,12 +465,12 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, 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(" "); @@ -592,7 +594,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, } wc_printf(_("on day %s%d%s of the month"), "", rrmday, ""); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf(""); - wc_printf(" %s
\n", _("of the month")); + wc_printf(" %s
\n", _("of the month")); wc_printf("\n"); /* end 'monthday_selector' div */ @@ -654,7 +656,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, ((which_rryeartype_is_preselected == 0) ? "checked='checked'" : "") ); wc_printf(_("every ")); - wc_printf("%s
", _("year on this date")); + wc_printf("%s
", _("year on this date")); wc_printf(""); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); /* end 'yearday_selector' div */ @@ -718,7 +720,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, "%s onChange=\"RecurrenceShowHide();\">", ((which_rrend_is_preselected == 0) ? "checked='checked'" : "") ); - wc_printf("%s
\n", _("No ending date")); + wc_printf("%s
\n", _("No ending date")); wc_printf(" ", recur.count); wc_printf(_("times")); - wc_printf("
\n"); + wc_printf("
\n"); wc_printf("\n"); + wc_printf("
\n"); wc_printf("