From 86627662879ac5f5faea9eec7a0f0a7b9e9e06be Mon Sep 17 00:00:00 2001
From: onefang
Date: Tue, 17 Mar 2020 12:40:31 +1000
Subject: Various white space and language clean ups.

---
 src/sledjchisl/sledjchisl.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index b5ee0f8..28dddfe 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -3966,9 +3966,9 @@ void loginPage(reqData *Rd, char *message)
     HTMLtext(Rd->reply, "text", "name", "name", name, 42, 63, TRUE);
     HTMLtext(Rd->reply, "password", "password", "password", "", 16, 0, TRUE);
     Rd->reply->addstr(Rd->reply, "<p>Warning, the limit on password length is set by your viewer, some can't handle longer than 16 characters.</p>\n");
-    Rd->reply->addstr(Rd->reply, "<p>While viewers will usually remember your name and password for you, you'll need to remember it for this web site to. %nbsp; "
-				 "I highly recommend using a password manager.  KeePass and it's variations is a great password manager.</p>\n");
-    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />");	// Stop Enter key on text fields triggering the first submit button.
+    Rd->reply->addstr(Rd->reply, "<p>While viewers will usually remember your name and password for you, you'll need to remember it for this web site to. &nbsp; "
+				 "I highly recommend using a password manager. &nbsp; KeePass and it's variations is a great password manager.</p>\n");
+    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />\n");	// Stop Enter key on text fields triggering the first submit button.
     HTMLbutton(Rd->reply, "login");
     HTMLbutton(Rd->reply, "create");
   if (0 != Rd->errors->size(Rd->errors))
@@ -3997,14 +3997,14 @@ void accountCreationPage(reqData *Rd, char *message)
   HTMLform(Rd->reply, "", Rd->shs.munchie);
     HTMLhidden(Rd->reply, "name", name);
     HTMLhidden(Rd->reply, "UUID", getStrH(Rd->stuff, "UUID"));
+    HTMLtext(Rd->reply, "password", "Re-enter your password", "password", "", 16, 0, FALSE);
+    Rd->reply->addstr(Rd->reply, "<p>Warning, the limit on password length is set by your viewer, some can't handle longer than 16 characters.</p>\n");
+    Rd->reply->addstr(Rd->reply, "<p>While viewers will usually remember your name and password for you, you'll need to remember it for this web site to. &nbsp; "
+				 "I highly recommend using a password manager. &nbsp; KeePass and it's variations is a great password manager.</p>\n");
     HTMLtext(Rd->reply, "email", "email", "email", getStrH(Rd->stuff, "email"), 42, 254, FALSE);
     HTMLtext(Rd->reply, "email", "Repeat your email, to be sure you got it correct", "emayl", getStrH(Rd->stuff, "emayl"), 42, 254, FALSE);
     Rd->reply->addstr(Rd->reply, "<p>A validation email will be sent to this email address, you will need to click on the link in it to continue your account creation.</p>\n");
-    HTMLtext(Rd->reply, "password", "Re-enter your password", "password", "", 16, 0, FALSE);
-    Rd->reply->addstr(Rd->reply, "<p>Warning, the limit on password length is set by your viewer, some can't handle longer than 16 characters.</p>\n");
-    Rd->reply->addstr(Rd->reply, "<p>While viewers will usually remember your name and password for you, you'll need to remember it for this web site to. %nbsp; "
-				 "I highly recommend using a password manager.  KeePass and it's variations is a great password manager.</p>\n");
-    Rd->reply->addstr(Rd->reply, "<table><tr><td>");
+    Rd->reply->addstr(Rd->reply, "<table><tr><td>\n");
     HTMLselect(Rd->reply, "Date of birth", "year");
     t = getStrH(Rd->stuff, "year");
     if (NULL == t)
@@ -4035,10 +4035,12 @@ void accountCreationPage(reqData *Rd, char *message)
       HTMLoption(Rd->reply, months[i], sel);
     }
     HTMLselectEnd(Rd->reply);
-    Rd->reply->addstr(Rd->reply, "</td></tr></table>");
+    Rd->reply->addstr(Rd->reply, "</td></tr></table>\n");
     HTMLcheckBox(Rd->reply, "adult", "I'm allegedly an adult in my country.", !strcmp("on", getStrH(Rd->stuff, "adult")));
-    HTMLcheckBox(Rd->reply, "agree", "I accept the Terms & Conditions of Use.", !strcmp("on", getStrH(Rd->stuff, "agree")));
-    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />");	// Stop Enter key on text fields triggering the first submit button.
+    HTMLcheckBox(Rd->reply, "agree", "I accept the Terms of Service.", !strcmp("on", getStrH(Rd->stuff, "agree")));
+    Rd->reply->addstrf(Rd->reply, "<h2>Terms of Service</h2><pre>%s</pre>\n", getStrH(Rd->configs, "ToS"));
+    // For maxlength - the MySQL database field is type text, which has a max length of 64 Kilobytes byets, but characters might take up 1 - 4 bytes, and maxlength is in characters.
+    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />\n");	// Stop Enter key on text fields triggering the first submit button.
     HTMLbutton(Rd->reply, "confirm");
     HTMLbutton(Rd->reply, "cancel");
   if (0 != Rd->errors->size(Rd->errors))
@@ -4075,7 +4077,7 @@ void loggedOnPage(reqData *Rd, char *message)
       HTMLoption(Rd->reply, "disabled", false);
       HTMLoption(Rd->reply, "god", false);
       HTMLselectEnd(Rd->reply);
-    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />");	// Stop Enter key on text fields triggering the first submit button.
+    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />\n");	// Stop Enter key on text fields triggering the first submit button.
     HTMLbutton(Rd->reply, "delete");
     HTMLbutton(Rd->reply, "list");
     HTMLbutton(Rd->reply, "logout");
@@ -4106,7 +4108,7 @@ void listPage(reqData *Rd, char *message)
   HTMLform(Rd->reply, "", Rd->shs.munchie);
     HTMLhidden(Rd->reply, "name", name);
     HTMLhidden(Rd->reply, "UUID", getStrH(Rd->stuff, "UUID"));
-    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />");	// Stop Enter key on text fields triggering the first submit button.
+    Rd->reply->addstrf(Rd->reply, "<input type='submit' disabled style='display: none' aria-hidden='true' />\n");	// Stop Enter key on text fields triggering the first submit button.
     HTMLbutton(Rd->reply, "me");
     HTMLbutton(Rd->reply, "logout");
   if (0 != Rd->errors->size(Rd->errors))
-- 
cgit v1.1