X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fopenid.c;h=ca71d6793c51ab72ebae517599022a92d599e618;hb=fb6f6fa4ec4e3277e30d84326d48e6850822d318;hp=58c3503ab46049cc8f4aee249dfeb82fbade4c2a;hpb=76f23da782e9e80dad0a8ae1336230da5a6fa124;p=citadel.git diff --git a/webcit/openid.c b/webcit/openid.c index 58c3503ab..ca71d6793 100644 --- a/webcit/openid.c +++ b/webcit/openid.c @@ -1,5 +1,13 @@ /* - * $Id$ + * Copyright (c) 1996-2012 by the citadel.org team + * + * This program is open source software. You can redistribute it and/or + * modify it under the terms of the GNU General Public License, version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ #include "webcit.h" @@ -10,52 +18,51 @@ */ void display_openids(void) { + wcsession *WCC = WC; char buf[1024]; int bg = 0; output_headers(1, 1, 1, 0, 0, 0); - wprintf("
"); + do_template("box_end"); wDumpContent(2); } @@ -67,22 +74,26 @@ void openid_attach(void) { char buf[4096]; if (havebstr("attach_button")) { - lprintf(CTDL_DEBUG, "Attempting to attach %s\n", bstr("openid_url")); + + syslog(LOG_DEBUG, "Attempting to attach %s\n", bstr("openid_url")); snprintf(buf, sizeof buf, - "OIDS %s|%s://%s/finalize_openid_login|%s://%s", + "OIDS %s|%s/finalize_openid_login?attach_existing=1|%s", bstr("openid_url"), - (is_https ? "https" : "http"), WC->http_host, - (is_https ? "https" : "http"), WC->http_host + ChrPtr(site_prefix), + ChrPtr(site_prefix) ); serv_puts(buf); serv_getln(buf, sizeof buf); if (buf[0] == '2') { - lprintf(CTDL_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]); + syslog(LOG_DEBUG, "OpenID server contacted; redirecting to %s\n", &buf[4]); http_redirect(&buf[4]); return; } + else { + syslog(LOG_DEBUG, "OpenID attach failed: %s\n", &buf[4]); + } } /* If we get to this point then something failed. */ @@ -94,14 +105,14 @@ void openid_attach(void) { * Detach an OpenID from the currently logged-in account */ void openid_detach(void) { - char buf[1024]; + StrBuf *Line; if (havebstr("id_to_detach")) { serv_printf("OIDD %s", bstr("id_to_detach")); - serv_getln(buf, sizeof buf); - if (buf[0] != '2') { - strcpy(WC->ImportantMessage, &buf[4]); - } + Line = NewStrBuf(); + StrBuf_ServGetln(Line); + GetServerStatusMsg(Line, NULL, 1, 2); + FreeStrBuf(&Line); } display_openids(); @@ -111,7 +122,7 @@ void InitModule_OPENID (void) { - WebcitAddUrlHandler(HKEY("display_openids"), display_openids, 0); - WebcitAddUrlHandler(HKEY("openid_attach"), openid_attach, 0); - WebcitAddUrlHandler(HKEY("openid_detach"), openid_detach, 0); + WebcitAddUrlHandler(HKEY("display_openids"), "", 0, display_openids, 0); + WebcitAddUrlHandler(HKEY("openid_attach"), "", 0, openid_attach, 0); + WebcitAddUrlHandler(HKEY("openid_detach"), "", 0, openid_detach, 0); }