1 files changed, 19 insertions, 14 deletions

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index b6e4cd0..5446381 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -2226,17 +2226,22 @@ static void HTMLformEnd(qgrow_t *reply)
   reply->addstr(reply, "    </form>\n");
 }
 
-static void HTMLcheckBox(qgrow_t *reply, char *name, char *title, boolean checked)
+static void HTMLcheckBox(qgrow_t *reply, char *name, char *title, boolean checked, boolean required)
 {
+  reply->addstrf(reply, "      <p>");
+  reply->addstrf(reply, "<label><input type=\"checkbox\" name=\"%s\"", name);
   if (checked)
-    reply->addstrf(reply, "      <p><label for=\"%s\">%s</label> : <input type=\"checkbox\" name=\"%s\" checked></p>\n", name, title, name);
-  else
-    reply->addstrf(reply, "      <p><input type=\"checkbox\" name=\"%s\"><label for=\"%s\">%s</label></p>\n", name, name, title);
+    reply->addstrf(reply, " checked", name);
+//  if (required)
+//    reply->addstr(reply, " required");
+  reply->addstrf(reply, "> %s </label>", title);
+//  reply->addstrf(reply, "> %s  ⛝  □  🞐   🞎   🞎   ☐  ▣️ ◉  ○  </label>", title);
+  reply->addstrf(reply, "</p>\n"); 
 }
 
-static void HTMLtextArea(qgrow_t *reply, char *name, char *title, int rows, int cols, int min, int max, char *holder, char *comp, char *spell, char *wrap, boolean required)
+static void HTMLtextArea(qgrow_t *reply, char *name, char *title, int rows, int cols, int min, int max, char *holder, char *comp, char *spell, char *wrap, char *value, boolean required)
 {
-  reply->addstrf(reply, "      <p><label for=\"%s\">%s</label> : <textarea name=\"%s\"", name, title, name);
+  reply->addstrf(reply, "      <p><label>%s : <textarea name=\"%s\"", title, name);
   if (0 < rows)
     reply->addstrf(reply, " rows=\"%d\"", rows); 
   if (0 < cols)
@@ -2255,12 +2260,12 @@ static void HTMLtextArea(qgrow_t *reply, char *name, char *title, int rows, int
     reply->addstrf(reply, " spellcheck=\"%s\"", spell);
   if ("" != wrap)
     reply->addstrf(reply, " wrap=\"%s\"", wrap);
-  reply->addstr(reply, "></textarea></p>\n"); 
+  reply->addstrf(reply, ">%s</textarea></label></p>\n", value); 
 }
 
 static void HTMLtext(qgrow_t *reply, char *type, char *title, char *name, char *val, int size, int max, boolean required)
 {
-  reply->addstrf(reply, "      <p><label for=\"%s\">%s</label> : <input type=\"%s\" name=\"%s\"", name, title, type, name);
+  reply->addstrf(reply, "      <p><label>%s : <input type=\"%s\" name=\"%s\"", title, type, name);
   if ("" != val)
     reply->addstrf(reply, "value=\"%s\"", val);
   if (0 < size)
@@ -2269,7 +2274,7 @@ static void HTMLtext(qgrow_t *reply, char *type, char *title, char *name, char *
     reply->addstrf(reply, " maxlength=\"%d\"", max); 
   if (required)
     reply->addstr(reply, " required");
-  reply->addstr(reply, "></p>\n"); 
+  reply->addstr(reply, "></label></p>\n"); 
 }
 
 static void HTMLselect(qgrow_t *reply, char *title, char *name)
@@ -4027,8 +4032,8 @@ void accountCreationPage(reqData *Rd, char *message)
     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);
+    HTMLtext(Rd->reply, "email", "email", "email", getStrH(Rd->body, "email"), 42, 254, FALSE);
+    HTMLtext(Rd->reply, "email", "Repeat your email, to be sure you got it correct", "emayl", getStrH(Rd->body, "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");
     Rd->reply->addstr(Rd->reply, "<table><tr><td>\n");
     HTMLselect(Rd->reply, "Date of birth", "year");
@@ -4062,14 +4067,14 @@ void accountCreationPage(reqData *Rd, char *message)
     }
     HTMLselectEnd(Rd->reply);
     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 of Service.", !strcmp("on", getStrH(Rd->stuff, "agree")));
+    HTMLcheckBox(Rd->reply, "adult", "I'm allegedly an adult in my country.", !strcmp("on", getStrH(Rd->body, "adult")), TRUE);
+    HTMLcheckBox(Rd->reply, "agree", "I accept the Terms of Service.", !strcmp("on", getStrH(Rd->body, "agree")), TRUE);
     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.
     // For rows and cols, seems a bit broken, I ask for 5/42, I get 6,36.  In world it seems to be 7,46
 // TODO - check against the limit for in world profiles, coz this will become that.
 // TODO - validate aboutMe, it should not be empty, and should not be longer than 64 kilobytes.
-    HTMLtextArea(Rd->reply, "aboutMe", "About me", 7, 50, 4, 16384, "Describe yourself here.", "off", "true", "soft", FALSE);
+    HTMLtextArea(Rd->reply, "aboutMe", "About me", 7, 50, 4, 16384, "Describe yourself here.", "off", "true", "soft", getStrH(Rd->body, "aboutMe"), FALSE);
     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");