Revert "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 f6348dd48e482514c4034f9fa594d117e8b1de6f..80f7ddbb0a8e63d3920d8e1b72625e79804d15ad 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");          
 }
 
 
@@ -288,7 +300,6 @@ void openid_manual_create(void)
  */
 void do_openid_login(void)
 {
-       wcsession *WCC = WC;
        char buf[4096];
 
        if (havebstr("language")) {
@@ -302,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);
@@ -634,8 +645,7 @@ void validate(void)
                return;
        }
 
-       wc_printf("<div class=\"fix_scrollbar_bug\">"
-               "<table class=\"auth_validate\"><tr><td>\n");
+       wc_printf("<table class=\"auth_validate\"><tr><td>\n");
        wc_printf("<div id=\"validate\">");
 
        safestrncpy(user, &buf[4], sizeof user);
@@ -718,7 +728,7 @@ void validate(void)
        wc_printf("<br />\n");
 
        wc_printf("</div>\n");
-       wc_printf("</td></tr></table></div>\n");
+       wc_printf("</td></tr></table>\n");
        wDumpContent(1);
 }