* Ditched the frames mode completely. It wasn't working properly in,

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index 2301c38d84d2d5ae2f2cd6b4e681182491f27f4a..738de528d28b942569c516c82290677d81331986 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -36,7 +36,7 @@ void display_login(char *mesg)
        char buf[256];
 
        printf("HTTP/1.0 200 OK\n");
-       output_headers(1);
+       output_headers(3);
 
        /* Da banner */
        wprintf("<CENTER><TABLE border=0 width=100%><TR><TD>\n");
@@ -68,15 +68,6 @@ void display_login(char *mesg)
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"New User\">\n");
        wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Exit\">\n");
 
-       /* Only offer the "check to disable frames" selection if frames haven't
-        * already been disabled by the browser braindamage check.
-        */
-       if (noframes == 0) {
-               wprintf("<BR><INPUT TYPE=\"checkbox\" NAME=\"noframes\">");
-               wprintf("<FONT SIZE=-1>&nbsp;Check here to disable frames</FONT>\n");
-               wprintf("</FORM></CENTER>\n");
-       }
-
        /* Da instructions */
        wprintf("<LI><EM>If you already have an account on %s,",
                serv_info.serv_humannode);
@@ -115,12 +106,6 @@ void do_login(void)
        int need_regi = 0;
 
 
-       /* Note that the initial value of noframes is set by the browser braindamage
-        * check, so don't add an "else" clause here.
-        */
-       if (!strcasecmp(bstr("noframes"), "on"))
-               noframes = 1;
-
        if (!strcasecmp(bstr("action"), "Exit")) {
                do_logout();
        }
@@ -175,12 +160,7 @@ void do_login(void)
 
 void do_welcome(void)
 {
-
-       if (noframes) {
-               smart_goto("_BASEROOM_");
-       } else {
-               output_static("frameset.html");
-       }
+       smart_goto("_BASEROOM_");
 }