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

diff --git a/webcit/event.c b/webcit/event.c
index 5f9d3213d..6f989a237 100644
--- a/webcit/event.c
+++ b/webcit/event.c
@@ -24,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;
@@ -63,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];
 
@@ -92,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")
 	);
 
@@ -184,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",
@@ -774,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) {
@@ -790,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;
@@ -1156,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':