Revert "Removed the "fix_scrollbarbug" div and all references to it."

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 2dcfaf3bb8c64a1ca1d2a90e06a309a64baa2012..cb2917b673572a0e4aa45b532cbb4328608a0b0f 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * WebcitAuth; Handles authentication of users to a Citadel server.
  *
  * Copyright (c) 1996-2010 by the citadel.org team
@@ -35,13 +33,27 @@ void display_reg(int during_login);
 char *axdefs[7]; 
 
 void initialize_axdefs(void) {
-       axdefs[0] = _("Deleted");       /* an erased user */
-       axdefs[1] = _("New User");      /* a new user */
-       axdefs[2] = _("Problem User");  /* a trouble maker */
-       axdefs[3] = _("Local User");    /* user with normal privileges */
-       axdefs[4] = _("Network User");  /* a user that may access network resources */
-       axdefs[5] = _("Preferred User");/* a moderator */
-       axdefs[6] = _("Aide");          /* chief */
+
+       /* an erased user */
+       axdefs[0] = _("Deleted");       
+
+       /* a new user */
+       axdefs[1] = _("New User");      
+
+       /* a trouble maker */
+       axdefs[2] = _("Problem User");  
+
+       /* user with normal privileges */
+       axdefs[3] = _("Local User");    
+
+       /* a user that may access network resources */
+       axdefs[4] = _("Network User");  
+
+       /* a moderator */
+       axdefs[5] = _("Preferred User");
+
+       /* chief */
+       axdefs[6] = _("Aide");          
 }
 
 
@@ -74,45 +86,6 @@ void display_openid_login(char *mesg)
 }
 
 
-void display_openid_name_request(const StrBuf *claimed_id, const StrBuf *username) 
-{
-       StrBuf *Buf = NULL;
-
-       output_headers(1, 1, 2, 0, 0, 0);
-       wc_printf("<div id=\"login_screen\">\n");
-
-       Buf = NewStrBufPlain(NULL, StrLength(claimed_id));
-       StrEscAppend(Buf, claimed_id, NULL, 0, 0);
-       svprintf(HKEY("VERIFIED"), WCS_STRING, _("Your OpenID <tt>%s</tt> was successfully verified."),
-                ChrPtr(Buf));
-       SVPutBuf("CLAIMED_ID", Buf, 0);
-
-
-       if (StrLength(username) > 0) {
-                       Buf = NewStrBufPlain(NULL, StrLength(username));
-                       StrEscAppend(Buf, username, NULL, 0, 0);
-                       svprintf(HKEY("REASON"), WCS_STRING,
-                                _("However, the user name '%s' conflicts with an existing user."), 
-                                ChrPtr(Buf));
-                       FreeStrBuf(&Buf);
-       }
-       else {
-               svput("REASON", WCS_STRING, "");
-       }
-
-       svput("ACTION_REQUESTED", WCS_STRING, _("Please specify the user name you would like to use."));
-
-       svput("USERNAME_BOX", WCS_STRING, _("User name:"));
-       svput("NEWUSER_BUTTON", WCS_STRING, _("New User"));
-       svput("EXIT_BUTTON", WCS_STRING, _("Exit"));
-
-       svprintf(HKEY("BOXTITLE"), WCS_STRING, _("%s - powered by <a href=\"http://www.citadel.org\">Citadel</a>"),
-                ChrPtr(WC->serv_info->serv_humannode));
-
-       do_template("openid_manual_create", NULL);
-       wDumpContent(2);
-}
-
 
 
 /* Initialize the session
@@ -307,7 +280,15 @@ void openid_manual_create(void)
                        do_welcome();
                }
        } else {
-               display_openid_name_request(sbstr("openid_url"), sbstr("name"));
+               const StrBuf *Buf;
+
+               putbstr("__claimed_id", NewStrBufDup(sbstr("openid_url")));
+               Buf = sbstr("name");
+               if (StrLength(Buf) > 0)
+                       putbstr("__username", NewStrBufDup(Buf));
+               begin_burst();
+               do_template("openid_manual_create", NULL);
+               end_burst();
        }
 
 }
@@ -319,7 +300,6 @@ void openid_manual_create(void)
  */
 void do_openid_login(void)
 {
-       wcsession *WCC = WC;
        char buf[4096];
 
        if (havebstr("language")) {
@@ -333,10 +313,10 @@ void do_openid_login(void)
        }
        if (havebstr("login_action")) {
                snprintf(buf, sizeof buf,
-                       "OIDS %s|%s://%s/finalize_openid_login|%s://%s",
+                       "OIDS %s|%s/finalize_openid_login|%s",
                        bstr("openid_url"),
-                        (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host),
-                        (is_https ? "https" : "http"), ChrPtr(WCC->Hdr->HR.http_host)
+                       ChrPtr(site_prefix),
+                       ChrPtr(site_prefix)
                );
 
                serv_puts(buf);
@@ -447,11 +427,19 @@ void finalize_openid_login(void)
         */
 
        else if (!strcasecmp(ChrPtr(result), "verify_only")) {
-               display_openid_name_request(claimed_id, username);
+               putbstr("__claimed_id", claimed_id);
+               claimed_id = NULL;
+               if (StrLength(username) > 0) {
+                       putbstr("__username", username);
+                       username = NULL;
+               }
+               begin_burst();
+               do_template("openid_manual_create", NULL);
+               end_burst();
        }
 
        /* Did we manage to log in?  If so, continue with the normal flow... */
-       if (WC->logged_in) {
+       else if (WC->logged_in) {
                if (WC->need_regi) {
                        display_reg(1);
                } else {