Reverts commit c6aec42f213ec284e34648f3d69bcf927dccddb1 because putting the opening...

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 6cde0748ed3a6fbb389cc57a3297a863fac985c5..1b6e8681ebe2f9f3f2deeeb3ef7b5cf666f403c7 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -1,21 +1,15 @@
 /*
  * Handles the HTML display of calendar items.
  *
- * 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"
@@ -23,8 +17,8 @@
 #include "calendar.h"
 
 /* These define how high the hour rows are in the day view */
-#define TIMELINE       30
-#define EXTRATIMELINE  (TIMELINE / 2)
+#define TIMELINE       22
+#define EXTRATIMELINE  22
 
 void embeddable_mini_calendar(int year, int month)
 {
@@ -143,7 +137,7 @@ void embeddable_mini_calendar(int year, int month)
        StrBufAppendPrintf(WC->trailing_javascript,
                "       function minical_change_month(year, month) {                                    \n"
                "               p = 'year=' + year + '&month=' + month                                  \n"
-               "                       + '&r=' + CtdlRandomString();                                   \n"
+               "                       + '&r=' + ctdlRandomString();                                   \n"
                "               new Ajax.Updater('%s', 'mini_calendar',                                 \n"
                "                       { method: 'get', parameters: p, evalScripts: true } );          \n"
                "       }                                                                               \n"
@@ -204,7 +198,6 @@ void calendar_month_view_display_events(int year, int month, int day)
        starting_tm.tm_hour = 0;
        starting_tm.tm_min = 0;
        today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
-       today_start_t.is_utc = 1;
 
        memset(&ending_tm, 0, sizeof(struct tm));
        ending_tm.tm_year = year - 1900;
@@ -213,7 +206,6 @@ void calendar_month_view_display_events(int year, int month, int day)
        ending_tm.tm_hour = 23;
        ending_tm.tm_min = 59;
        today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
-       today_end_t.is_utc = 1;
 
        /*
         * Create another one without caring about the timezone for all day events.
@@ -860,7 +852,6 @@ void calendar_day_view_display_events(time_t thetime,
        starting_tm.tm_hour = 0;
        starting_tm.tm_min = 0;
        today_start_t = icaltime_from_timet_with_zone(mktime(&starting_tm), 0, icaltimezone_get_utc_timezone());
-       today_start_t.is_utc = 1;
 
        memset(&ending_tm, 0, sizeof(struct tm));
        ending_tm.tm_year = year - 1900;
@@ -869,7 +860,6 @@ void calendar_day_view_display_events(time_t thetime,
        ending_tm.tm_hour = 23;
        ending_tm.tm_min = 59;
        today_end_t = icaltime_from_timet_with_zone(mktime(&ending_tm), 0, icaltimezone_get_utc_timezone());
-       today_end_t.is_utc = 1;
 
        /*
         * Create another one without caring about the timezone for all day events.
@@ -1429,7 +1419,9 @@ int calendar_GetParamsGetServerCall(SharedMessageStatus *Stat,
                                    void **ViewSpecific,
                                    long oper,
                                    char *cmd,
-                                   long len)
+                                   long len,
+                                   char *filter,
+                                   long flen)
 {
        wcsession *WCC = WC;
        calview *c;