Remove comment about site configurable setting in a place where we already made it...

[citadel.git] / webcit / calendar.c

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 1a6f7fa9b8a039bd6914bff131344b402650607a..abb731a537a2f1b7a16219570b37f141ea19ce6c 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -1,21 +1,15 @@
 /*
  * Functions which handle calendar objects and their processing/display.
  *
- * Copyright (c) 1996-2011 by the citadel.org team
+ * Copyright (c) 1996-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 as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * 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"
@@ -184,7 +178,7 @@ void cal_process_object(StrBuf *Target,
                StrBufAppendPrintf(Target, _("Attendee:"));
                StrBufAppendPrintf(Target, "</dt><dd>");
                ch = icalproperty_get_attendee(p);
-               if ((ch != NULL) && !strncasecmp(buf, "MAILTO:", 7)) {
+               if ((ch != NULL) && !strncasecmp(ch, "MAILTO:", 7)) {
 
                        /** screen name or email address */
                        safestrncpy(buf, ch + 7, sizeof(buf));
@@ -211,7 +205,7 @@ void cal_process_object(StrBuf *Target,
        if (the_method == ICAL_METHOD_REQUEST) {
 
                /* Check for conflicts */
-               syslog(9, "Checking server calendar for conflicts...\n");
+               syslog(LOG_DEBUG, "Checking server calendar for conflicts...\n");
                serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
                serv_getln(buf, sizeof buf);
                if (buf[0] == '1') {
@@ -239,7 +233,7 @@ void cal_process_object(StrBuf *Target,
                                StrBufAppendPrintf(Target, "</dd>\n");
                        }
                }
-               syslog(9, "...done.\n");
+               syslog(LOG_DEBUG, "...done.\n");
 
                StrBufAppendPrintf(Target, "</dl>");
 
@@ -376,9 +370,9 @@ void handle_rsvp(void)
        if (buf[0] == '2') {
                wc_printf("<img src=\"static/webcit_icons/calendar.png\"><span>");
                if (!strcasecmp(bstr("sc"), "update")) {
-                       /* Translators: RSVP aka Répondez s'il-vous-plaît Is the term 
-                          that the recipient of an ical-invitation should please 
-                          answer this request. */                                        
+                       /// Translators: RSVP aka Répondez s'il-vous-plaît Is the term 
+                       /// that the recipient of an ical-invitation should please 
+                       /// answer this request.
                        wc_printf(_("Your calendar has been updated to reflect this RSVP."));
                } else if (!strcasecmp(bstr("sc"), "ignore")) {
                        wc_printf(_("You have chosen to ignore this RSVP. "
@@ -504,6 +498,9 @@ void display_individual_cal(icalcomponent *event, long msgnum, char *from, int u
        if (!icaltime_is_null_time(dtend)) {            /* Need duration for recurrences */
                dur = icaltime_subtract(dtend, dtstart);
        }
+       else {
+               dur = icaltime_subtract(dtstart, dtstart);
+       }
 
        /*
         * Just let libical iterate the recurrence, and keep looping back to the top of this function,
@@ -604,7 +601,7 @@ void display_individual_cal(icalcomponent *event, long msgnum, char *from, int u
                }
        }
        icalrecur_iterator_free(ritr);
-       /* syslog(9, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); */
+       /* syslog(LOG_DEBUG, "Performed %d recurrences; final one is %s", num_recur, ctime(&final_recurrence)); */
 }
 
 
@@ -673,7 +670,6 @@ void load_ical_object(long msgnum, int unread,
        char mime_filename[256];
        char mime_content_type[256];
        char mime_disposition[256];
-       int mime_length;
        char relevant_partnum[256];
        char *relevant_source = NULL;
        int phase = 0;                          /* 0 = citadel headers, 1 = mime headers, 2 = body */
@@ -703,7 +699,7 @@ void load_ical_object(long msgnum, int unread,
                                extract_token(mime_partnum, &bptr[5], 2, '|', sizeof mime_partnum);
                                extract_token(mime_disposition, &bptr[5], 3, '|', sizeof mime_disposition);
                                extract_token(mime_content_type, &bptr[5], 4, '|', sizeof mime_content_type);
-                               mime_length = extract_int(&bptr[5], 5);
+                               /* do we care? mime_length = */extract_int(&bptr[5], 5);
 
                                if (  (!strcasecmp(mime_content_type, "text/calendar"))
                                      || (!strcasecmp(mime_content_type, "application/ics"))
@@ -862,7 +858,7 @@ void do_freebusy(void)
                who[len-4] = 0;
        }
 
-       syslog(9, "freebusy requested for <%s>\n", who);
+       syslog(LOG_INFO, "freebusy requested for <%s>\n", who);
        serv_printf("ICAL freebusy|%s", who);
        serv_getln(buf, sizeof buf);
 
@@ -916,18 +912,22 @@ InitModule_CALENDAR
                calendar_GetParamsGetServerCall,
                NULL,
                NULL,
+               NULL,
                calendar_LoadMsgFromServer,
                calendar_RenderView_or_Tail,
-               calendar_Cleanup);
+               calendar_Cleanup,
+               NULL);
 
        RegisterReadLoopHandlerset(
                VIEW_CALBRIEF,
                calendar_GetParamsGetServerCall,
                NULL,
                NULL,
+               NULL,
                calendar_LoadMsgFromServer,
                calendar_RenderView_or_Tail,
-               calendar_Cleanup);
+               calendar_Cleanup,
+               NULL);