* Repaired an OpenID login screen that was damaged during the strbuf conversion

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index d3403858416b76f506e1e71a3af0cb06f5d17df4..008e115e4561911d6c21f6b1f56c73e0c7f36660 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -74,7 +74,7 @@ void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *usernam
 
        if (StrLength(username) > 0) {
                        Buf = NewStrBufPlain(NULL, StrLength(username));
-                       StrEscAppend(Buf, claimed_id, NULL, 0, 0);
+                       StrEscAppend(Buf, username, NULL, 0, 0);
                        svprintf(HKEY("REASON"), WCS_STRING,
                                 _("However, the user name '%s' conflicts with an existing user."), 
                                 ChrPtr(Buf));
@@ -776,21 +776,13 @@ void display_reg(int during_login)
        }
        else {
                StrBuf *ReturnTo;
-               ReturnTo = NewStrBufPlain("display_main_menu?gotofirst=", 256);
-               //StrBufUrlescAppend(ReturnTo, WC->wc_roomname, NULL);
-               StrEscAppend(ReturnTo, WC->wc_roomname, NULL, 0, 0);
-               lprintf(9, "\e[32mwc_roomname: %s\e[0m\n", ChrPtr(WC->wc_roomname));
-               lprintf(9, "\e[31m   ReturnTo: %s\e[0m\n", ChrPtr(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);
-               do_edit_vcard(vcard_msgnum, "1", VCMsg, VCAtt, "display_main_menu", USERCONFIGROOM);
        }
 
-       /*
-               FIXME
-               1. don't we have to free VCMsg and VCAtt ??
-               2. Fix bug 268
-       */
-
+       /* FIXME - don't we have to free VCMsg and VCAtt ?? */
 }