From e1c74b126019f5838c7d61396d50fc5fe8551892 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Sat, 13 Aug 2016 12:17:08 +0200
Subject: [PATCH] add: HTML5-defined 'required' attributes on mandatory input
 fields

This is done for client-side form validation as defined in:
https://www.w3.org/TR/html5/forms.html#the-required-attribute

Change-Id: I2f3390d4abdbed3ec68b2a6fef9d48151c7de7ab
---
 src/org/cacert/gigi/pages/LoginPage.templ          |  4 ++--
 src/org/cacert/gigi/pages/PasswordResetForm.templ  |  6 +++---
 .../gigi/pages/account/ChangePasswordForm.templ    |  6 +++---
 .../gigi/pages/account/domain/DomainAddForm.templ  |  2 +-
 .../gigi/pages/account/mail/MailAddForm.templ      |  2 +-
 .../pages/admin/support/FindUserByDomainForm.templ |  2 +-
 .../pages/admin/support/FindUserByEmailForm.templ  |  2 +-
 .../admin/support/SupportEnterTicketForm.templ     |  2 +-
 .../cacert/gigi/pages/orga/AffiliationForm.templ   |  2 +-
 src/org/cacert/gigi/pages/orga/CreateOrgForm.templ |  6 +++---
 src/org/cacert/gigi/pages/wot/AssuranceForm.templ  | 14 +++++++-------
 src/org/cacert/gigi/pages/wot/AssureeSearch.templ  |  2 +-
 12 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/org/cacert/gigi/pages/LoginPage.templ b/src/org/cacert/gigi/pages/LoginPage.templ
index d9c21d38..b4d04be8 100644
--- a/src/org/cacert/gigi/pages/LoginPage.templ
+++ b/src/org/cacert/gigi/pages/LoginPage.templ
@@ -1,8 +1,8 @@
 <div class='loginbox'>
 <h1><?=_Login?></h1>
 <p class='smalltext'><?=_Warning! This site requires cookies to be enabled to ensure your privacy and security. This site uses session cookies to store temporary values to prevent people from copying and pasting the session ID to someone else exposing their account, personal details and identity theft as a result.?></p>
-<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username"/><br />
-<label for="password"><?=_Pass Phrase?>:</label><input class="form-control" type='password' name='password'/><br />
+<label for="username"><?=_Email Address?>:</label><input class="form-control" type='text' name="username" required/><br />
+<label for="password"><?=_Pass Phrase?>:</label><input class="form-control" type='password' name='password' required/><br />
 <button type='submit' name="process" value="Login" class="btn btn-primary"><?=_Login?></button><br /><br />
 <p class='smalltext'><?=_If you are having trouble with your username or password, please visit our !'<a href="http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount" target="_new">'wiki page!'</a>' for more information?></p>
 </div>
diff --git a/src/org/cacert/gigi/pages/PasswordResetForm.templ b/src/org/cacert/gigi/pages/PasswordResetForm.templ
index 1d12004d..b43e9152 100644
--- a/src/org/cacert/gigi/pages/PasswordResetForm.templ
+++ b/src/org/cacert/gigi/pages/PasswordResetForm.templ
@@ -7,15 +7,15 @@
   <tbody>
   <tr>
     <td><?=_Password reset token (A-Word)?>: </td>
-    <td><input type="password" name="private_token"></td>
+    <td><input type="password" name="private_token" required></td>
   </tr>
   <tr>
     <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
-    <td><input type="password" name="pword1"></td>
+    <td><input type="password" name="pword1" required></td>
   </tr>
   <tr>
     <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
-    <td><input type="password" name="pword2"></td>
+    <td><input type="password" name="pword2" required></td>
   </tr>
   <tr>
     <td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. Learn more in our !'<a href="http://wiki.cacert.org/wiki/FAQ" target="_new">'FAQ!'</a>'.?></td>
diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
index 33f349f7..a0fc4529 100644
--- a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
@@ -7,15 +7,15 @@
   <tbody>
   <tr>
     <td><?=_Old Pass Phrase?>: </td>
-    <td><input class="form-control" type="password" name="oldpassword"></td>
+    <td><input class="form-control" type="password" name="oldpassword" required></td>
   </tr>
   <tr>
     <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
-    <td><input class="form-control" type="password" name="pword1"></td>
+    <td><input class="form-control" type="password" name="pword1" required></td>
   </tr>
   <tr>
     <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
-    <td><input class="form-control" type="password" name="pword2"></td>
+    <td><input class="form-control" type="password" name="pword2" required></td>
   </tr>
   <tr>
     <td colspan="2"><span class="formMandatory">*</span><?=_Your password is one of many factors to protect your account from unauthorised access. A good password is hard to guess, long, and contains a diverse set of characters. Learn more in our !'<a href="http://wiki.cacert.org/wiki/FAQ" target="_new">'FAQ!'</a>'.?></td>
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
index d16aa3ef..94e04edc 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
@@ -7,7 +7,7 @@
 <tbody>
   <tr>
     <td><?=_Domain?> </td>
-    <td><input class="form-control" type="text" name="newdomain" value=""> (<?=_In the following:?> <span class='exampleDomainPlace'>example.org</span>)</td>
+    <td><input class="form-control" type="text" name="newdomain" value="" required> (<?=_In the following:?> <span class='exampleDomainPlace'>example.org</span>)</td>
   </tr>
   <?=$pingconfig?>
   <tr>
diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
index 23d98c42..31325860 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
@@ -1,7 +1,7 @@
 <table class="table">
   <tr>
     <td><?=_Email Addresses?> </td>
-    <td><input class="form-control" type="text" name="newemail" value=""></td>
+    <td><input class="form-control" type="text" name="newemail" value="" required></td>
   </tr>
   <tr>
     <td colspan="2"><input type="submit" name="addmail" value="<?=_I own or am authorised to control this email address?>"></td>
diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
index 0eb660d4..2a5a8523 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ
@@ -4,7 +4,7 @@
   </tr>
   <tr>
     <td><?=_Domain?>:</td>
-    <td><input class="form-control" type="text" value="" name="domain" placeholder="<?=_For search by ID use # prefix e.g. #123456?>"></td>
+    <td><input class="form-control" type="text" value="" name="domain" placeholder="<?=_For search by ID use # prefix e.g. #123456?>" required></td>
   </tr>
   <tr>
     <td colspan="2"><input type="submit" value="<?=_Next?>" name="process"></td>
diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
index a6b4549c..8563721e 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ
@@ -15,7 +15,7 @@
   </tr>
   <tr>
     <td><?=_Email?>:</td>
-    <td><input class="form-control" name="email" value="" size="30" title="<?=_use % as wildcard?>" placeholder="<?=_use % as wildcard?>" type="text"/></td>
+    <td><input class="form-control" name="email" value="" size="30" title="<?=_use % as wildcard?>" placeholder="<?=_use % as wildcard?>" type="text" required/></td>
   </tr>
   <tr>
     <td colspan="2"><input name="process" value="<?=_Next?>" type="submit"/></td>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
index 292e8b2d..27b901b4 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
@@ -4,7 +4,7 @@
         </tr>
         <tr>
             <td><?=_Ticket no?>:</td>
-            <td><input type="text" class="form-control" <? if($ticketNo) {?>value="<?=$ticketNo?>" <? } ?>name="ticketno"></td>
+            <td><input type="text" class="form-control" <? if($ticketNo) {?>value="<?=$ticketNo?>" <? } ?>name="ticketno" required></td>
         </tr>
         <tr>
             <td colspan="2"><input type="submit" name="setTicket" value="<?=_Set ticket number?>"></td>
diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
index a67730f8..84be5cc4 100644
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
@@ -15,7 +15,7 @@
 <? } ?>
   <tr>
     <td></td>
-    <td><input class="form-control" type="text" name="email"></td>
+    <td><input class="form-control" type="text" name="email" required></td>
     <td><input type="checkbox" name="master" value="y"></td>
     <td><input type="submit" name="do_affiliate" value="<?=_Add?>"></td>
   </tr>
diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
index 7f34782b..7fdd98de 100644
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
@@ -12,17 +12,17 @@
   </tr>
   <tr>
     <td><?=_Organisation Name?>:</td>
-    <td><input class="form-control" type="text" name="O" value="<?=$O?>" maxlength="64" size="90">
+    <td><input class="form-control" type="text" name="O" value="<?=$O?>" maxlength="64" size="90" required>
         <?=_(max. 64 characters)?>
     </td>
   </tr>
   <tr>
     <td><?=_Town/Suburb?>:</td>
-    <td><input class="form-control" type="text" name="L" value="<?=$L?>" maxlength="255" size="90"></td>
+    <td><input class="form-control" type="text" name="L" value="<?=$L?>" maxlength="255" size="90" required></td>
   </tr>
   <tr>
     <td><?=_State/Province?>:</td>
-    <td><input class="form-control" type="text" name="ST" value="<?=$ST?>" maxlength="255" size="90"></td>
+    <td><input class="form-control" type="text" name="ST" value="<?=$ST?>" maxlength="255" size="90" required></td>
   </tr>
   <tr>
     <td><?=_Country?>:</td>
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 004710aa..297397c6 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -1,4 +1,4 @@
-<table class="table">
+	<table class="table">
 <thead>
 <tr><th colspan="2"><?=_Verification Confirmation?></th></tr>
 </thead>
@@ -16,23 +16,23 @@
 		<td><span class="accountdetail dob"><?=$dob?> (<?=$dobFmt2?>)</span></td>
 	</tr>
 	<tr>
-		<td><input type="checkbox" name="certify" value="1"></td>
+		<td><input type="checkbox" name="certify" value="1" required></td>
 		<td><?=_I certify that ${name} has appeared in person.?></td>
 	</tr>
 	<tr>
 		<td><?=_Location?></td>
-		<td><input class="form-control" type="text" name="location" value="<?=$location?>"></td>
+		<td><input class="form-control" type="text" name="location" value="<?=$location?>" required></td>
 	</tr>
 	<tr>
 		<td><?=_Date?></td>
-		<td><input class="form-control" type="text" name="date" value="<?=$date?>"><br/><?=_The date when the verification took place. Please adjust the date if you verified the person on a different day (YYYY-MM-DD).?></td>
+		<td><input class="form-control" type="text" name="date" value="<?=$date?>" required><br/><?=_The date when the verification took place. Please adjust the date if you verified the person on a different day (YYYY-MM-DD).?></td>
 	</tr>
 	<tr>
-		<td><input type="checkbox" name="assertion" value="1"></td>
+		<td><input type="checkbox" name="assertion" value="1" required></td>
 		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the SomeCA Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
 	</tr>
 	<tr>
-		<td><input type="checkbox" name="rules" value="1"></td>
+		<td><input type="checkbox" name="rules" value="1" required></td>
 		<td><?=_I have read and understood the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>'), Verification Policy and the Verification Handbook. I am making this verification subject to and in compliance with the ToS, Verification Policy and Handbook.?></td>
 	</tr>
 	<tr>
@@ -45,7 +45,7 @@
 	</tr>
 	<tr>
 		<td><?=_Points?></td>
-		<td><input class="form-control" type="text" name="points"><br/>(Max. <?=$maxpoints?>)</td>
+		<td><input class="form-control" type="text" name="points" required><br/>(Max. <?=$maxpoints?>)</td>
 	</tr>
 	<tr>
 		<td><?=_Type?></td>
diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
index de9282e5..7fc80b17 100644
--- a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
+++ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
@@ -8,7 +8,7 @@
   <tbody>
   <tr>
     <td><?=_Email?>: </td>
-    <td><input class="form-control" type="text" name="email"></td>
+    <td><input class="form-control" type="text" name="email" required></td>
   </tr>
   <tr>
     <td><?=_Date of Birth?><br>
-- 
2.39.2