Removed the 'room=' parameter from the wiki view. This functionality is provided...

[citadel.git] / webcit / event.c

diff --git a/webcit/event.c b/webcit/event.c
index a7107bde7b072e78817da8009c1a3adc5897502a..5f9d3213ddb0b8714ae11190fb20eba5a0c367c0 100644 (file)
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -1,21 +1,15 @@
 /*
  * Editing calendar events.
  *
- * Copyright (c) 1996-2010 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"
@@ -44,7 +38,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;
@@ -157,13 +154,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("<div id=\"banner\">\n");
+       output_headers(1, 1, 1, 0, 0, 0);
+       wc_printf("<div id=\"room_banner_override\">\n");
        wc_printf("<h1>");
        wc_printf(_("Add or edit an event"));
        wc_printf("</h1>");
@@ -445,7 +444,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
        wc_printf(
                "&nbsp;<a href=\"javascript:PopOpenAddressBook('attendees_box|%s');\" "
                "title=\"%s\">"
-               "<img alt='' align='middle' border='0' width='24' height='24' src=\"static/viewcontacts_24x.gif\">"
+               "<img alt='' align='middle' border='0' width='16' height='16' src=\"static/webcit_icons/essen/16x16/contact.png\">"
                "</a>",
                _("Attendees"),
                _("Contacts")
@@ -1152,20 +1151,22 @@ STARTOVER:      for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
                if ( (encaps != NULL) && (havebstr("save_button")) ) {
                        serv_puts("ENT0 1|||4|||1|");
                        serv_getln(buf, sizeof buf);
-                       if (buf[0] == '8') {
+                       switch (buf[0]) {
+                       case '8':
                                serv_puts("Content-type: text/calendar");
                                serv_puts("Content-Transfer-Encoding: quoted-printable");
                                serv_puts("");
                                text_to_server_qp(icalcomponent_as_ical_string(encaps));
 //                             serv_puts(icalcomponent_as_ical_string(encaps));
                                serv_puts("000");
-                       }
-                       if ( (buf[0] == '8') || (buf[0] == '4') ) {
-                               while (serv_getln(buf, sizeof buf), strcmp(buf, "000")) {
-                               }
-                       }
-                       if (buf[0] == '2') {
-                               strcpy(WC->ImportantMessage, &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);
@@ -1206,7 +1207,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);