* Finally tracked down the WC->vars heap corruption issue (for real this

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index c0f23ae309b2425bb751f122bd2b104574964e5a..50e42586d968b18f488814460138b05bc42cd99e 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -49,15 +49,16 @@ void display_login(char *mesg)
        output_headers(3);
 
        if (mesg != NULL) if (strlen(mesg) > 0) {
-               stresc(buf, mesg, 0);
+               stresc(buf, mesg, 0, 0);
                svprintf("mesg", WCS_STRING, "%s", buf);
        }
 
        svprintf("hello", WCS_SERVCMD, "MESG hello");
+       svprintf("BOXTITLE", WCS_STRING, "%s - powered by Citadel",
+               serv_info.serv_humannode);
 
        do_template("login");
 
-       clear_local_substs();
        wDumpContent(0);        /* No menu here; not logged in yet! */
 }
 
@@ -159,7 +160,6 @@ void do_welcome(void)
         svprintf("STARTPAGE", WCS_STRING, startpage);
 
         do_template("mainframeset");
-        clear_local_substs();
 }
 
 
@@ -189,7 +189,7 @@ void do_logout(void)
 
        if (WC->serv_sock >= 0) {
                if (buf[0] == '1') {
-                       fmout(NULL);
+                       fmout(NULL, "CENTER");
                } else {
                        wprintf("Goodbye\n");
                }
@@ -224,8 +224,8 @@ void validate(void)
 
        strcpy(buf, bstr("user"));
        if (strlen(buf) > 0)
-               if (strlen(bstr("WC->axlevel")) > 0) {
-                       serv_printf("VALI %s|%s", buf, bstr("WC->axlevel"));
+               if (strlen(bstr("axlevel")) > 0) {
+                       serv_printf("VALI %s|%s", buf, bstr("axlevel"));
                        serv_gets(buf);
                        if (buf[0] != '2') {
                                wprintf("<EM>%s</EM><BR>\n", &buf[4]);
@@ -239,6 +239,11 @@ void validate(void)
                wDumpContent(1);
                return;
        }
+
+       wprintf("<CENTER>");
+       do_template("beginbox_nt");
+       wprintf("<CENTER>");
+
        strcpy(user, &buf[4]);
        serv_printf("GREG %s", user);
        serv_gets(cmd);
@@ -272,15 +277,18 @@ void validate(void)
                wprintf("<H1>%s</H1>%s<BR>\n", user, &cmd[4]);
        }
 
-       wprintf("<CENTER><TABLE border><CAPTION>Select access level:");
-       wprintf("</CAPTION><TR>");
+       wprintf("<HR>Select access level for this user:<BR>\n");
        for (a = 0; a <= 6; ++a) {
-               wprintf("<TD><A HREF=\"/validate&user=");
+               wprintf("<A HREF=\"/validate&user=");
                urlescputs(user);
-               wprintf("&WC->axlevel=%d\">%s</A></TD>\n",
+               wprintf("&axlevel=%d\">%s</A>&nbsp;&nbsp;&nbsp;\n",
                        a, axdefs[a]);
        }
-       wprintf("</TR></TABLE><CENTER><BR>\n");
+       wprintf("<BR>\n");
+
+       wprintf("</CENTER>\n");
+       do_template("endbox");
+       wprintf("</CENTER>\n");
        wDumpContent(1);
 }
 
@@ -329,26 +337,29 @@ void display_changepw(void)
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=770000><TR><TD>");
-       wprintf("<FONT SIZE=+1 COLOR=\"FFFFFF\"");
-       wprintf("<B>Change your password</B>\n");
-       wprintf("</FONT></TD></TR></TABLE>\n");
-
-       wprintf("<CENTER>");
+       svprintf("BOXTITLE", WCS_STRING, "Change your password");
+       do_template("beginbox");
+       wprintf("<CENTER><BR>");
        serv_puts("MESG changepw");
        serv_gets(buf);
-       if (buf[0] == '1')
-               fmout(NULL);
+       if (buf[0] == '1') {
+               fmout(NULL, "CENTER");
+       }
 
        wprintf("<FORM ACTION=\"changepw\" METHOD=\"POST\">\n");
-       wprintf("<CENTER><TABLE border><TR><TD>Enter new password:</TD>\n");
+       wprintf("<CENTER>"
+               "<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
+               "BGCOLOR=\"#EEEEEE\">"
+               "<TR><TD>Enter new password:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
        wprintf("<TR><TD>Enter it again to confirm:</TD>\n");
        wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-       wprintf("</TABLE>\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n");
-       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
+       wprintf("</TABLE><BR>\n");
+       wprintf("<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Change\">\n"
+               "&nbsp;"
+               "<INPUT type=\"submit\" NAME=\"action\" VALUE=\"Cancel\">\n");
        wprintf("</CENTER>\n");
+       do_template("endbox");
        wDumpContent(1);
 }
 
@@ -361,20 +372,22 @@ void changepw(void)
        char newpass1[32], newpass2[32];
 
        if (strcmp(bstr("action"), "Change")) {
-               display_error("Cancelled.  Password was not changed.");
+               strcpy(WC->ImportantMessage, 
+                       "Cancelled.  Password was not changed.");
+               display_main_menu();
                return;
        }
        strcpy(newpass1, bstr("newpass1"));
        strcpy(newpass2, bstr("newpass2"));
 
        if (strcasecmp(newpass1, newpass2)) {
-               display_error("They don't match.  Password was not changed.");
+               strcpy(WC->ImportantMessage, 
+                       "They don't match.  Password was not changed.");
+               display_main_menu();
                return;
        }
        serv_printf("SETP %s", newpass1);
        serv_gets(buf);
-       if (buf[0] == '2')
-               display_success(&buf[4]);
-       else
-               display_error(&buf[4]);
+       strcpy(WC->ImportantMessage, &buf[4]);
+       display_main_menu();
 }