* Better alignment of system messages

[citadel.git] / webcit / auth.c

diff --git a/webcit/auth.c b/webcit/auth.c
index fb763e68a2b2821d75e66a5a9988f10d7e7ae34b..5f44773948daf0d5df5d4e6b1c52fb9e3c1cb890 100644 (file)
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -54,6 +54,8 @@ void display_login(char *mesg)
        }
 
        svprintf("hello", WCS_SERVCMD, "MESG hello");
+       svprintf("BOXTITLE", WCS_STRING, "%s - powered by Citadel",
+               serv_info.serv_humannode);
 
        do_template("login");
 
@@ -189,7 +191,7 @@ void do_logout(void)
 
        if (WC->serv_sock >= 0) {
                if (buf[0] == '1') {
-                       fmout(NULL);
+                       fmout(NULL, "CENTER");
                } else {
                        wprintf("Goodbye\n");
                }
@@ -329,25 +331,29 @@ void display_changepw(void)
 
        output_headers(3);
 
-       wprintf("<TABLE WIDTH=100%% BORDER=0 BGCOLOR=\"#770000\"><TR><TD>");
-       wprintf("<SPAN CLASS=\"titlebar\">Change your password</SPAN>\n");
-       wprintf("</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);
 }
 
@@ -360,20 +366,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();
 }