From 34b02336ed5f6bdfbae3e295b7c963fb0ad00ba0 Mon Sep 17 00:00:00 2001
From: Azareal <azareal@users.noreply.github.com>
Date: Sun, 20 Aug 2017 11:11:49 +0100
Subject: [PATCH] Fixed a crash bug caused by the previous commit. Renamed a
 few templates. Added the required attribute to a few form inputs.

---
 template_list.go                                 | 4 ++--
 templates/account-own-edit-avatar.html           | 2 +-
 templates/account-own-edit-username.html         | 2 +-
 templates/account-own-edit.html                  | 6 +++---
 templates/{areyousure.html => are-you-sure.html} | 0
 templates/create-topic.html                      | 4 ++--
 templates/{custom_page.html => custom-page.html} | 0
 templates/login.html                             | 4 ++--
 templates/register.html                          | 8 ++++----
 templates/topic.html                             | 2 +-
 templates/topic_alt.html                         | 2 +-
 user.go                                          | 6 +++---
 12 files changed, 20 insertions(+), 20 deletions(-)
 rename templates/{areyousure.html => are-you-sure.html} (100%)
 rename templates/{custom_page.html => custom-page.html} (100%)

diff --git a/template_list.go b/template_list.go
index 69a0fe69..ff2ad7e3 100644
--- a/template_list.go
+++ b/template_list.go
@@ -225,7 +225,7 @@ var topic_85 []byte = []byte(`
 		<input name="tid" value='`)
 var topic_86 []byte = []byte(`' type="hidden" />
 		<div class="formrow real_first_child">
-			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here"></textarea></div>
+			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here" required></textarea></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="reply-button" class="formbutton">Create Reply</button></div>
@@ -408,7 +408,7 @@ var topic_alt_86 []byte = []byte(`
 		<input name="tid" value='`)
 var topic_alt_87 []byte = []byte(`' type="hidden" />
 		<div class="formrow">
-			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here"></textarea></div>
+			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here" required></textarea></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="reply-button" class="formbutton">Create Reply</button></div>
diff --git a/templates/account-own-edit-avatar.html b/templates/account-own-edit-avatar.html
index 0afddd69..8371ba5e 100644
--- a/templates/account-own-edit-avatar.html
+++ b/templates/account-own-edit-avatar.html
@@ -13,7 +13,7 @@
 		<form action="/user/edit/avatar/submit/" method="post" enctype="multipart/form-data">
 			<div class="formrow real_first_child">
 				<div class="formitem formlabel"><a>Upload Avatar</a></div>
-				<div class="formitem"><input name="account-avatar" type="file" /></div>
+				<div class="formitem"><input name="account-avatar" type="file" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem"><button name="account-button" class="formbutton">Update</button></div>
diff --git a/templates/account-own-edit-username.html b/templates/account-own-edit-username.html
index f42c272d..7665b9c3 100644
--- a/templates/account-own-edit-username.html
+++ b/templates/account-own-edit-username.html
@@ -12,7 +12,7 @@
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>New Username</a></div>
-				<div class="formitem"><input name="account-new-username" type="text" /></div>
+				<div class="formitem"><input name="account-new-username" type="text" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem"><button name="account-button" class="formbutton form_middle_button">Update</button></div>
diff --git a/templates/account-own-edit.html b/templates/account-own-edit.html
index e02ca811..4066b2e0 100644
--- a/templates/account-own-edit.html
+++ b/templates/account-own-edit.html
@@ -8,15 +8,15 @@
 		<form action="/user/edit/critical/submit/" method="post">
 			<div class="formrow real_first_child">
 				<div class="formitem formlabel"><a>Current Password</a></div>
-				<div class="formitem"><input name="account-current-password" type="password" placeholder="*****" /></div>
+				<div class="formitem"><input name="account-current-password" type="password" placeholder="*****" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>New Password</a></div>
-				<div class="formitem"><input name="account-new-password" type="password" placeholder="*****" /></div>
+				<div class="formitem"><input name="account-new-password" type="password" placeholder="*****" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>Confirm Password</a></div>
-				<div class="formitem"><input name="account-confirm-password" type="password" placeholder="*****" /></div>
+				<div class="formitem"><input name="account-confirm-password" type="password" placeholder="*****" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem"><button name="account-button" class="formbutton form_middle_button">Update</button></div>
diff --git a/templates/areyousure.html b/templates/are-you-sure.html
similarity index 100%
rename from templates/areyousure.html
rename to templates/are-you-sure.html
diff --git a/templates/create-topic.html b/templates/create-topic.html
index 4e177147..a495ad39 100644
--- a/templates/create-topic.html
+++ b/templates/create-topic.html
@@ -13,11 +13,11 @@
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>Topic Name</a></div>
-				<div class="formitem"><input name="topic-name" type="text" placeholder="Topic Name" /></div>
+				<div class="formitem"><input name="topic-name" type="text" placeholder="Topic Name" required /></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem formlabel"><a>Content</a></div>
-				<div class="formitem"><textarea class="large" name="topic-content" placeholder="Insert content here"></textarea></div>
+				<div class="formitem"><textarea class="large" name="topic-content" placeholder="Insert content here" required></textarea></div>
 			</div>
 			<div class="formrow">
 				<div class="formitem"><button name="topic-button" class="formbutton form_middle_button">Create Topic</button></div>
diff --git a/templates/custom_page.html b/templates/custom-page.html
similarity index 100%
rename from templates/custom_page.html
rename to templates/custom-page.html
diff --git a/templates/login.html b/templates/login.html
index 4dd03b5a..3ea09bd0 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -6,11 +6,11 @@
 	<form action="/accounts/login/submit/" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Account Name</a></div>
-			<div class="formitem"><input name="username" type="text" placeholder="Account Name" /></div>
+			<div class="formitem"><input name="username" type="text" placeholder="Account Name" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Password</a></div>
-			<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" /></div>
+			<div class="formitem"><input name="password" type="password" autocomplete="current-password" placeholder="*****" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="login-button" class="formbutton">Login</div>
diff --git a/templates/register.html b/templates/register.html
index 2b33f450..aabe2b0c 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -8,19 +8,19 @@
 	<form action="/accounts/create/submit/" method="post">
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Account Name</a></div>
-			<div class="formitem"><input name="username" type="text" placeholder="Account Name" /></div>
+			<div class="formitem"><input name="username" type="text" placeholder="Account Name" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Email</a></div>
-			<div class="formitem"><input name="email" type="email" placeholder="joe.doe@example.com" /></div>
+			<div class="formitem"><input name="email" type="email" placeholder="joe.doe@example.com" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Password</a></div>
-			<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" /></div>
+			<div class="formitem"><input name="password" type="password" autocomplete="new-password" placeholder="*****" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem formlabel"><a>Confirm Password</a></div>
-			<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" /></div>
+			<div class="formitem"><input name="confirm_password" type="password" placeholder="*****" required /></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="register-button" class="formbutton">Create Account</div></div>
diff --git a/templates/topic.html b/templates/topic.html
index 0bb1b7a1..6c4d2fd4 100644
--- a/templates/topic.html
+++ b/templates/topic.html
@@ -82,7 +82,7 @@
 	<form action="/reply/create/" method="post">
 		<input name="tid" value='{{.Topic.ID}}' type="hidden" />
 		<div class="formrow real_first_child">
-			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here"></textarea></div>
+			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here" required></textarea></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="reply-button" class="formbutton">Create Reply</button></div>
diff --git a/templates/topic_alt.html b/templates/topic_alt.html
index a4400d5f..51bdd349 100644
--- a/templates/topic_alt.html
+++ b/templates/topic_alt.html
@@ -83,7 +83,7 @@
 	<form action="/reply/create/" method="post">
 		<input name="tid" value='{{.Topic.ID}}' type="hidden" />
 		<div class="formrow">
-			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here"></textarea></div>
+			<div class="formitem"><textarea name="reply-content" placeholder="Insert reply here" required></textarea></div>
 		</div>
 		<div class="formrow">
 			<div class="formitem"><button name="reply-button" class="formbutton">Create Reply</button></div>
diff --git a/user.go b/user.go
index 376f7680..0d23979a 100644
--- a/user.go
+++ b/user.go
@@ -351,7 +351,7 @@ func words_to_score(wcount int, topic bool) (score int) {
 		score = 1
 	}
 
-	settings := settingBox.Load().(map[string]interface{})
+	settings := settingBox.Load().(SettingBox)
 	if wcount >= settings["megapost_min_words"].(int) {
 		score += 4
 	} else if wcount >= settings["bigpost_min_words"].(int) {
@@ -371,7 +371,7 @@ func increase_post_user_stats(wcount int, uid int, topic bool, user User) error
 		base_score = 2
 	}
 
-	settings := settingBox.Load().(map[string]interface{})
+	settings := settingBox.Load().(SettingBox)
 	if wcount >= settings["megapost_min_words"].(int) {
 		_, err := increment_user_megaposts_stmt.Exec(1,1,1,uid)
 		if err != nil {
@@ -411,7 +411,7 @@ func decrease_post_user_stats(wcount int, uid int, topic bool, user User) error
 		base_score = -2
 	}
 
-	settings := settingBox.Load().(map[string]interface{})
+	settings := settingBox.Load().(SettingBox)
 	if wcount >= settings["megapost_min_words"].(int) {
 		_, err := increment_user_megaposts_stmt.Exec(-1,-1,-1,uid)
 		if err != nil {