Improve confirmation mails

Change-Id: Ida840dfc4c4477fd8b86a7dcb640360c96c99be1
diff --git a/templates/email.php b/templates/email.php
index 3033d65..7d61eef 100644
--- a/templates/email.php
+++ b/templates/email.php
@@ -1,9 +1,55 @@
 <?php
+$REGISTRATION_INFORMATION = "
+<h3>Registration information</h3>
+<p>
+<table style='border: 1px solid #e1e4e8; border-collapse: collapse; width: 100%;'>
+<tr>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+<strong>Username</strong>
+</td>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+{{username}}
+</td>
+</tr>
+<tr>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+<strong>Name</strong>
+</td>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+{{full_name}}
+</td>
+</tr>
+<tr>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+<strong>Organization</strong>
+</td>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+{{organization}}
+</td>
+</tr>
+<tr>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+<strong>Email</strong>
+</td>
+<td style='border: 1px solid #e1e4e8; padding: 6px 13px;'>
+{{email}}
+</td>
+</tr>
+</table>
+</p>
+";
+
 $MAIL_TEMPLATE = (object)[
         "subject" => "[" . $SERVICE_ACRONYM . "] Confirm your email address",
         "text"    => "To complete your registration please paste this to your browser: {{url}}",
         "html" => "<html><body>
-                <p>Almost there! Click on the confirm button below to confirm your email address and to complete your " . $SERVICE_ACRONYM . " registration</p>
+                <p>Dear {{full_name}},</p>
+                <p>Please check the information below and click on the confirm button to complete your " . $SERVICE_ACRONYM . " registration:</p>"
+                . $REGISTRATION_INFORMATION . "
+                <p>
+                If you did not request this registration, please ignore this email.
+                If you find errors in the information above, please ignore this email and repeat the registration process.
+                </p>
                 <a style='display: inline-block; outline: 0; cursor: pointer;
                 padding: 5px 16px;
                 font-size: 14px;
@@ -25,6 +71,8 @@
                     transition-duration: 0.1s;
                 }
             ' href='{{url}}'>Confirm " . $SERVICE_ACRONYM . " registration</a>
+            <p>Best regards,</p>
+                <p>" . $SERVICE_ACRONYM . " team</p>
         </body></html>"
 ];
 
diff --git a/templates/register.htm b/templates/register.htm
index 60b7bd5..62466fc 100644
--- a/templates/register.htm
+++ b/templates/register.htm
@@ -175,7 +175,7 @@
             </div>
         </div>
         <input pattern="[^\s]{<?php echo $CAPTCHA_LENGTH; ?>,}" required
-            title="Please fill the captcha. It has 5 characters" name="captcha" type="text" id="form3Example6"
+            title="Please fill the captcha. It has <?php echo $CAPTCHA_LENGTH; ?> characters" name="captcha" type="text" id="form3Example6"
             class="form-control" placeholder="Type what you see on the image above" />
             <div class="invalid-feedback">
                 Type what you see on the image above.
diff --git a/templates/resend_mail.htm b/templates/resend_mail.htm
index be5a7c6..7f8557d 100644
--- a/templates/resend_mail.htm
+++ b/templates/resend_mail.htm
@@ -1 +1 @@
-<h2>Another email was sent!</h2>
+<h2>Another email has been sent to <?php echo $_SESSION['email']; ?>!</h2>