X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fevent.c;h=6f989a2379089f1dbacbc46a059794e96d6fddab;hb=92a9cfc8847833d9c20925adccdd200e0c2495f8;hp=f5f1fecd0ebbee6a2194499c209007dbfb7a1da7;hpb=23f67881c0c0de5092ea849c5469b8601ce31ee4;p=citadel.git

diff --git a/webcit/event.c b/webcit/event.c
index f5f1fecd0..6f989a237 100644
--- 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"
@@ -30,6 +24,7 @@
 void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
 	int unread, calview *calv)
 {
+	wcsession *WCC = WC;
 	icalcomponent *vevent;
 	icalproperty *p;
 	icalvalue *v;
@@ -69,7 +64,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	int which_rryeartype_is_preselected;
 
 	const char *ch;
-	char *tabnames[3];
+	const char *tabnames[3];
 	const char *frequency_units[8];
 	const char *ordinals[6];
 
@@ -98,7 +93,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	get_pref_long("weekstart", &weekstart, 17);
 	if (weekstart > 6) weekstart = 0;
 
-	syslog(9, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
+	syslog(LOG_DEBUG, "display_edit_individual_event(%ld) calview=%s year=%s month=%s day=%s\n",
 		msgnum, bstr("calview"), bstr("year"), bstr("month"), bstr("day")
 	);
 
@@ -167,8 +162,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	}
 	*/
 	/* 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>");
@@ -190,6 +185,10 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 	wc_printf("<form name=\"EventForm\" method=\"POST\" action=\"save_event\">\n");
 	wc_printf("<input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
 
+	wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+	StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+	wc_printf("\">\n");
+
 	wc_printf("<input type=\"hidden\" name=\"msgnum\" value=\"%ld\">\n",
 		msgnum);
 	wc_printf("<input type=\"hidden\" name=\"calview\" value=\"%s\">\n",
@@ -780,7 +779,8 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
 		"RecurrenceShowHide();		\n"
 		"EnableOrDisableCheckButton();	\n"
 	);
-	address_book_popup();
+	do_template("addressbook_popup");
+
 	wDumpContent(1);
 
 	if (created_new_vevent) {
@@ -796,6 +796,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum,
  */
 void save_individual_event(icalcomponent *supplied_vevent, long msgnum, char *from,
 			int unread, calview *calv) {
+	StrBuf *Buf;
 	char buf[SIZ];
 	icalproperty *prop;
 	icalcomponent *vevent, *encaps;
@@ -1162,7 +1163,9 @@ STARTOVER:	for (attendee = icalcomponent_get_first_property(vevent, ICAL_ATTENDE
 				serv_puts("Content-type: text/calendar");
 				serv_puts("Content-Transfer-Encoding: quoted-printable");
 				serv_puts("");
-				text_to_server_qp(icalcomponent_as_ical_string(encaps));
+				Buf = NewStrBufPlain(icalcomponent_as_ical_string(encaps), -1);
+				text_to_server_qp(Buf);
+				FreeStrBuf(&Buf);
 //				serv_puts(icalcomponent_as_ical_string(encaps));
 				serv_puts("000");
 			case '4':
@@ -1213,7 +1216,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")) {
-			do_template("summary_page");
+			display_summary_page();
 		}
 		else {
 			readloop(readfwd, eUseDefault);