* return_to logic in do_edit_vcard() and submit_vcard() is now working peoperly....

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index a4837d9311bc00777a55548d97e65524b968dcda..2c5c1d04a155e4ef61a26539847827670fc1d762 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -741,8 +741,8 @@ void validate(void)
 void display_reg(int during_login)
 {
        StrBuf *Buf;
-       message_summary *VCMsg;
-       wc_mime_attachment *VCAtt;
+       message_summary *VCMsg = NULL;
+       wc_mime_attachment *VCAtt = NULL;
        long vcard_msgnum;
 
        Buf = NewStrBuf();
@@ -775,8 +775,14 @@ void display_reg(int during_login)
                do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "do_welcome", USERCONFIGROOM);
        }
        else {
-               do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
+               StrBuf *ReturnTo;
+               ReturnTo = NewStrBufPlain(HKEY("display_main_menu?gotofirst="));
+               StrBufAppendBuf(ReturnTo, WC->wc_roomname, 0);
+               do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, ChrPtr(ReturnTo), USERCONFIGROOM);
+               FreeStrBuf(&ReturnTo);
        }
+
+       /* FIXME - don't we have to free VCMsg and VCAtt ?? */
 }