X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fauth.c;h=505d8ccb852fe6faf17e8850e959ee5c6e9b85ff;hb=8c7819e29bd976ec4882075f12480c12dc3691bd;hp=0a64641a24114e4cbb1fc9064776bb6de0b9b9da;hpb=0f72e15a12dcc90e3dbfc01ff35c0e910a8d419e;p=citadel.git

diff --git a/webcit/auth.c b/webcit/auth.c
index 0a64641a2..505d8ccb8 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -44,8 +44,8 @@ void display_login(char *mesg)
 	wprintf("<div id=\"login_screen\">\n");
 
 	if (mesg != NULL) if (!IsEmptyStr(mesg)) {
-		stresc(buf, mesg, 0, 0);
-		svprintf("mesg", WCS_STRING, "%s", buf);
+			stresc(buf, SIZ,  mesg, 0, 0);
+			svprintf("mesg", WCS_STRING, "%s", buf);
 	}
 
 	svprintf("LOGIN_INSTRUCTIONS", WCS_STRING,
@@ -463,27 +463,17 @@ void display_changepw(void)
 {
 	char buf[SIZ];
 
-	output_headers(1, 1, 2, 0, 0, 0);
-	wprintf("<div id=\"banner\">\n");
-	wprintf("<h1>");
-	wprintf(_("Change your password"));
-	wprintf("</h1>");
-	wprintf("</div>");
+	output_headers(1, 1, 1, 0, 0, 0);
 
-	wprintf("<div id=\"content\" class=\"service\">\n");
+	svprintf("BOXTITLE", WCS_STRING, _("Change your password"));
+	do_template("beginbox");
 
 	if (!IsEmptyStr(WC->ImportantMessage)) {
-		do_template("beginbox_nt");
-		wprintf("<SPAN CLASS=\"errormsg\">"
-			"%s</SPAN><br />\n", WC->ImportantMessage);
-		do_template("endbox");
+		wprintf("<span class=\"errormsg\">"
+			"%s</span><br />\n", WC->ImportantMessage);
 		safestrncpy(WC->ImportantMessage, "", sizeof WC->ImportantMessage);
 	}
 
-	wprintf("<div class=\"fix_scrollbar_bug\">"
-		"<table class=\"auth_validate\"><tr><td>\n");
-
-	wprintf("<CENTER><br />");
 	serv_puts("MESG changepw");
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '1') {
@@ -492,24 +482,25 @@ void display_changepw(void)
 
 	wprintf("<form name=\"changepwform\" action=\"changepw\" method=\"post\">\n");
 	wprintf("<input type=\"hidden\" name=\"nonce\" value=\"%ld\">\n", WC->nonce);
-	wprintf("<CENTER>"
-		"<table border=\"0\" cellspacing=\"5\" cellpadding=\"5\" "
-		"BGCOLOR=\"#EEEEEE\">"
-		"<TR><TD>");
+	wprintf("<table class=\"altern\" ");
+	wprintf("<tr class=\"even\"><td>");
 	wprintf(_("Enter new password:"));
-	wprintf("</TD>\n");
-	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass1\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
-	wprintf("<TR><TD>");
+	wprintf("</td><td>");
+	wprintf("<input type=\"password\" name=\"newpass1\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wprintf("<tr class=\"odd\"><td>");
 	wprintf(_("Enter it again to confirm:"));
-	wprintf("</TD>\n");
-	wprintf("<TD><INPUT TYPE=\"password\" NAME=\"newpass2\" VALUE=\"\" MAXLENGTH=\"20\"></TD></TR>\n");
+	wprintf("</td><td>");
+	wprintf("<input type=\"password\" name=\"newpass2\" value=\"\" maxlength=\"20\"></td></tr>\n");
+	wprintf("</table>\n");
 
-	wprintf("</TABLE><br />\n");
-	wprintf("<INPUT type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
+	wprintf("<div class=\"buttons\">\n");
+	wprintf("<input type=\"submit\" name=\"change_action\" value=\"%s\">", _("Change password"));
 	wprintf("&nbsp;");
-	wprintf("<INPUT type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
-	wprintf("</form></center>\n");
-	wprintf("</td></tr></table></div>\n");
+	wprintf("<input type=\"submit\" name=\"cancel_action\" value=\"%s\">\n", _("Cancel"));
+	wprintf("</div>\n");
+	wprintf("</form>\n");
+
+	do_template("endbox");
 	wDumpContent(1);
 }