Fixed bugs related to last three commits

[citadel.git] / webcit / openid.c

diff --git a/webcit/openid.c b/webcit/openid.c
index b489a55c484af1ba6124e4aefb31bb6e7b244e68..ff358e347f7e2c3dc0c7609efbb00cb23b530513 100644 (file)
--- a/webcit/openid.c
+++ b/webcit/openid.c
@@ -1,6 +1,3 @@
-/*
- * $Id$
- */
 
 #include "webcit.h"
 #include "webserver.h"
@@ -16,10 +13,9 @@ void display_openids(void)
 
        output_headers(1, 1, 1, 0, 0, 0);
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">");
-
-       svput("BOXTITLE", WCS_STRING, _("Manage Account/OpenID Associations"));
-       do_template("beginboxx", NULL);
+       do_template("beginbox_1", NULL);
+       StrBufAppendBufPlain(WCC->WBuf, _("Manage Account/OpenID Associations"), -1, 0);
+       do_template("beginbox_2", NULL);
 
        if (WCC->serv_info->serv_supports_openid) {
 
@@ -56,7 +52,6 @@ void display_openids(void)
        }
 
        do_template("endbox", NULL);
-       wc_printf("</div>");
        wDumpContent(2);
 }
 
@@ -68,26 +63,25 @@ void openid_attach(void) {
        char buf[4096];
 
        if (havebstr("attach_button")) {
-               wcsession *WCC = WC;
 
-               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",
-                        bstr("openid_url"),
-                        (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host),
-                        (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host)
+                       "OIDS %s|%s/finalize_openid_login|%s",
+                       bstr("openid_url"),
+                       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 {
-                       lprintf(CTDL_DEBUG, "OpenID attach failed: %s\n", &buf[4]);
+                       syslog(LOG_DEBUG, "OpenID attach failed: %s\n", &buf[4]);
                }
        }