// If the caller did not supply a user, write to the currently selected room
if (!u) {
- struct CitContext *CCC = CC;
StrBuf *MsgBody;
msg = malloc(sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 4;
- CM_SetField(msg, eAuthor, CCC->user.fullname);
- CM_SetField(msg, eOriginalRoom, CCC->room.QRname);
+ CM_SetField(msg, eAuthor, CC->user.fullname);
+ CM_SetField(msg, eOriginalRoom, CC->room.QRname);
MsgBody = NewStrBufPlain(NULL, serlen + 100);
StrBufAppendBufPlain(MsgBody, HKEY("Content-type: text/calendar\r\n\r\n"), 0);
if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
safestrncpy(attendee_string, ch + 7, sizeof (attendee_string));
string_trim(attendee_string);
- recp = validate_recipients(attendee_string, NULL, 0);
+ recp = validate_recipients(attendee_string, 0);
if (recp != NULL) {
if (!strcasecmp(recp->recp_local, CC->user.fullname)) {
if (me_attend) icalproperty_free(me_attend);
);
if (msg != NULL) {
- valid = validate_recipients(organizer_string, NULL, 0);
+ valid = validate_recipients(organizer_string, 0);
CtdlSubmitMsg(msg, valid, "");
CM_Free(msg);
free_recipients(valid);
}
-// Check to see if two events overlap. Returns nonzero if they do.
-// (This function is used in both Citadel and WebCit. If you change it in
-// one place, change it in the other. Better yet, put it in a library.)
-int ical_ctdl_is_overlap(
- struct icaltimetype t1start,
- struct icaltimetype t1end,
- struct icaltimetype t2start,
- struct icaltimetype t2end
-) {
- if (icaltime_is_null_time(t1start)) return(0);
- if (icaltime_is_null_time(t2start)) return(0);
-
- // if either event lacks end time, assume end = start
- if (icaltime_is_null_time(t1end)) {
- memcpy(&t1end, &t1start, sizeof(struct icaltimetype));
- }
- else {
- if (t1end.is_date && icaltime_compare(t1start, t1end)) {
-
- // the end date is non-inclusive so adjust it by one
- // day because our test is inclusive, note that a day is
- // not too much because we are talking about all day
- // events
- // if start = end we assume that nevertheless the whole
- // day is meant
-
- icaltime_adjust(&t1end, -1, 0, 0, 0);
- }
- }
-
- if (icaltime_is_null_time(t2end))
- memcpy(&t2end, &t2start, sizeof(struct icaltimetype));
- else {
- if (t2end.is_date && icaltime_compare(t2start, t2end)) {
- icaltime_adjust(&t2end, -1, 0, 0, 0);
- }
- }
-
- // First, check for all-day events
- if (t1start.is_date || t2start.is_date) {
- // If event 1 ends before event 2 starts, we're in the clear.
- if (icaltime_compare_date_only(t1end, t2start) < 0) return(0);
-
- // If event 2 ends before event 1 starts, we're also ok.
- if (icaltime_compare_date_only(t2end, t1start) < 0) return(0);
-
- return(1);
- }
-
- // syslog(LOG_DEBUG, "Comparing t1start %d:%d t1end %d:%d t2start %d:%d t2end %d:%d",
- // t1start.hour, t1start.minute, t1end.hour, t1end.minute,
- // t2start.hour, t2start.minute, t2end.hour, t2end.minute);
-
- // Now check for overlaps using date *and* time.
-
- // If event 1 ends before event 2 starts, we're in the clear.
- if (icaltime_compare(t1end, t2start) <= 0) return(0);
- // syslog(LOG_DEBUG, "calendar: first passed");
-
- // If event 2 ends before event 1 starts, we're also ok.
- if (icaltime_compare(t2end, t1start) <= 0) return(0);
- // syslog(LOG_DEBUG, "calendar: second passed");
-
- // Otherwise, they overlap.
- return(1);
-}
-
-
// Phase 6 of "hunt for conflicts"
// called by ical_conflicts_phase5()
//
// If not found, try it as an unqualified email address.
if (found_user != 0) {
strcpy(buf, who);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
if (recp != NULL) {
if (recp->num_local == 1) {
if (found_user != 0) {
snprintf(buf, sizeof buf, "%s@%s", who, CtdlGetConfigStr("c_fqdn"));
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
if (recp != NULL) {
if (recp->num_local == 1) {
found_user = CtdlGetUser(&usbuf, recp->recp_local);
) {
snprintf(buf, sizeof buf, "%s@%s", who, host);
syslog(LOG_DEBUG, "calendar: trying <%s>", buf);
- recp = validate_recipients(buf, NULL, 0);
+ recp = validate_recipients(buf, 0);
if (recp != NULL) {
if (recp->num_local == 1) {
found_user = CtdlGetUser(&usbuf, recp->recp_local);
);
if (msg != NULL) {
- valid = validate_recipients(attendees_string, NULL, 0);
+ valid = validate_recipients(attendees_string, 0);
CtdlSubmitMsg(msg, valid, "");
CM_Free(msg);
free_recipients(valid);
char partnum[256];
char action[256];
char who[256];
+ char coll[1024];
extract_token(subcmd, argbuf, 0, '|', sizeof subcmd);
// All other commands require a user to be logged in.
if (CtdlAccessCheck(ac_logged_in)) return;
- if (!strcasecmp(subcmd, "report")) {
- calendar_report();
- return;
- }
-
if (!strcasecmp(subcmd, "respond")) {
msgnum = extract_long(argbuf, 1);
extract_token(partnum, argbuf, 2, '|', sizeof partnum);