From: Art Cancro Date: Mon, 24 Jan 2011 21:02:39 +0000 (-0500) Subject: authpopup now returns the parent to the pushed_destination X-Git-Tag: v8.11~891 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=4e6b6446b456a8e8c4e478f5398b68cc13157c3d authpopup now returns the parent to the pushed_destination --- diff --git a/webcit/auth.c b/webcit/auth.c index ff9bd7b97..2d2e90be2 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -328,7 +328,12 @@ void do_openid_login(void) return; } - convenience_page("770000", _("Error"), &buf[4]); + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + escputs(&buf[4]); + wc_printf(""); + end_burst(); } @@ -442,7 +447,6 @@ void finalize_openid_login(void) /* Did we manage to log in? If so, continue with the normal flow... */ if (WC->logged_in) { - begin_burst(); output_headers(1, 0, 0, 0, 1, 0); do_template("authpopup_finished", NULL); @@ -457,8 +461,13 @@ void finalize_openid_login(void) */ } else { - /* maybe do something prettier here? */ - convenience_page("770000", _("Error"), _("Error") ); + /* FIXME do something prettier here? */ + begin_burst(); + output_headers(1, 0, 0, 0, 1, 0); + wc_printf(""); + wc_printf("error"); + wc_printf(""); + end_burst(); } FreeStrBuf(&result); diff --git a/webcit/static/t/authpopup_finished.html b/webcit/static/t/authpopup_finished.html index ad9db1eff..1e55fd9f5 100644 --- a/webcit/static/t/authpopup_finished.html +++ b/webcit/static/t/authpopup_finished.html @@ -1,6 +1,6 @@