* Properly handle VEVENT saves (fixed nasty loopy loopy bug)

* After saving a VEVENT, return to the correct calendar view and date

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 46475614ebb99e6c7358d4a1d7338fc80a1d669d..f8e7439aea92349f2d3622f8a2a70a13ff65f567 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 400.28  2002/09/27 18:31:33  ajc
+* Properly handle VEVENT saves (fixed nasty loopy loopy bug)
+* After saving a VEVENT, return to the correct calendar view and date
+
 Revision 400.27  2002/09/27 17:15:44  ajc
 * Removed the gzip compression stuff due to bugs in Internet Explorer.
 
@@ -1033,4 +1037,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/calendar.c b/webcit/calendar.c
index 70368254a6b436672df8ac2301b18516cfdcd144..fd677b722bdec6a86a3b889bc5d230c0e2de717f 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -573,9 +573,10 @@ void save_event(void) {
        long msgnum = 0L;
 
        msgnum = atol(bstr("msgnum"));
+
        if (msgnum > 0L) {
                display_using_handler(msgnum, "text/calendar",
-                               ICAL_VTODO_COMPONENT,
+                               ICAL_VEVENT_COMPONENT,
                                save_individual_event);
        }
        else {

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index 72147225426ea7bfcd2ed3f81f41c7bd607bfb1b..8c6936bff2deee8702a36b0bf1c77cfee478321d 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -67,8 +67,12 @@ void calendar_month_view_display_events(time_t thetime) {
                                                        ICAL_SUMMARY_PROPERTY);
                                if (p != NULL) {
                                        wprintf("<FONT SIZE=-1>"
-                                               "<A HREF=\"/display_edit_event?msgnum=%ld\">",
-                                               WC->cal_msgnum[i]
+                                               "<A HREF=\"/display_edit_event?msgnum=%ld&calview=%s&year=%s&month=%s&day=%s\">",
+                                               WC->cal_msgnum[i],
+                                               bstr("calview"),
+                                               bstr("year"),
+                                               bstr("month"),
+                                               bstr("day")
                                        );
                                        escputs((char *)
                                                icalproperty_get_comment(p));

diff --git a/webcit/event.c b/webcit/event.c
index f79fff3af857001f15aeb535ed497e9285c64c02..70d9a64030fda3055d5d9fd9cd6d5946c5b23aa0 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -61,6 +61,14 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        wprintf("<FORM METHOD=\"POST\" ACTION=\"/save_event\">\n");
        wprintf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n",
                msgnum);
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"calview\" VALUE=\"%s\">\n",
+               bstr("calview"));
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"year\" VALUE=\"%s\">\n",
+               bstr("year"));
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"month\" VALUE=\"%s\">\n",
+               bstr("month"));
+       wprintf("<INPUT TYPE=\"hidden\" NAME=\"day\" VALUE=\"%s\">\n",
+               bstr("day"));
 
        wprintf("Summary: "
                "<INPUT TYPE=\"text\" NAME=\"summary\" "