From 34e428d99ee3c27cfc36c2e518952d2406ee1c85 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 19 Jul 2012 17:22:00 +0200
Subject: [PATCH] Editing: remember room on hidden input field

when creating / editing calendar entries / vcards / tasks we now remember the room on the hidden field "go" so we're shure to save the message in the room its been intended for.
---
 webcit/event.c      | 5 +++++
 webcit/tasks.c      | 6 ++++++
 webcit/vcard_edit.c | 7 +++++++
 3 files changed, 18 insertions(+)

diff --git a/webcit/event.c b/webcit/event.c
index 5f9d3213d..c3c2ba3d6 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;
@@ -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",
diff --git a/webcit/tasks.c b/webcit/tasks.c
index 79c8ec851..a58edbb7b 100644
--- a/webcit/tasks.c
+++ b/webcit/tasks.c
@@ -176,6 +176,7 @@ int tasks_RenderView_or_Tail(SharedMessageStatus *Stat,
 void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, char *from,
 			int unread, calview *calv)
 {
+	wcsession *WCC = WC;
 	icalcomponent *vtodo;
 	icalproperty *p;
 	struct icaltimetype IcalTime;
@@ -230,6 +231,11 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch
 	wc_printf("<div class=\"boxcontent\">\n");
 	wc_printf("<FORM METHOD=\"POST\" action=\"save_task\">\n");
 	wc_printf("<div style=\"display: none;\">\n	");
+
+	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=\"nonce\" value=\"%d\">\n", WC->nonce);
 	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"msgnum\" VALUE=\"%ld\">\n", msgnum);
 	wc_printf("<INPUT TYPE=\"hidden\" NAME=\"return_to_summary\" VALUE=\"%d\">\n",
diff --git a/webcit/vcard_edit.c b/webcit/vcard_edit.c
index 38b799316..8be73cd87 100644
--- a/webcit/vcard_edit.c
+++ b/webcit/vcard_edit.c
@@ -870,6 +870,7 @@ void do_edit_vcard(long msgnum, char *partnum,
 		   wc_mime_attachment *VCAtt,
 		   const char *return_to, 
 		   const char *force_room) {
+	wcsession *WCC = WC;
 	message_summary *Msg = NULL;
 	wc_mime_attachment *VCMime = NULL;
 	struct vCard *v;
@@ -1050,6 +1051,12 @@ void do_edit_vcard(long msgnum, char *partnum,
 		escputs(force_room);
 		wc_printf("\">\n");
 	}
+	else
+	{
+		wc_printf("<input type=\"hidden\" name=\"go\" value=\"");
+		StrEscAppend(WCC->WBuf, WCC->CurRoom.name, NULL, 0, 0);
+		wc_printf("\">\n");
+	}
 
 	wc_printf("<table class=\"vcard_edit_background\"><tr><td>\n");
 
-- 
2.30.2