Comments + minor HTML change

src/email/email_connection.nim

@@ -127,17 +127,19 @@ proc sendMailMimeNow*(
   # Add first part to message
   multi.parts.add(first)
 
-  when defined(dev) and not defined(forcemail):
+  when defined(dev):
     echo "\n"
     echo "##################"
     echo "Email to: " & recipient
     echo "Subject:  " & subject
     echo "Message:  " & message
     echo "##################"
     echo "\n"
-    return (true, "dev" & $rand(100000), 1)
+    when not defined(forcemail):
+      return (true, "dev" & $rand(100000), 1)
 
   if smtpData.smtpHost == "smtp_host":
+    echo "SMTP not configured"
     return (false, "SMTP_not_configured_" & $rand(100000), 1)
 
   # Make SMTP connection
@@ -147,8 +149,13 @@ proc sendMailMimeNow*(
     messageID: string
 
   try:
-    smtpAuth(client, smtpData.smtpHost, smtpData.smtpPort, smtpData.smtpUser, smtpData.smtpPass)
+    client.connect(smtpData.smtpHost, Port(smtpData.smtpPort.parseInt()))
+    client.auth(smtpData.smtpUser, smtpData.smtpPass)
     (success, messageID) = sendMail(client, smtpData.smtpFromEmail, recipient, multi)
+
+    when defined(dev):
+      echo "Message sent: " & $success
+      echo "Message ID:   " & messageID
   except:
     echo getCurrentExceptionMsg()
     success = false

src/html/optin.nimf

@@ -45,8 +45,8 @@
           # end if
           # if signupForm:
           <form action="/subscribe/${listUUID}" method="post" class="center">
-            <input type="email" name="email" placeholder="Email" required>
             <input type="text" name="name" placeholder="Name">
+            <input type="email" name="email" placeholder="Email" required>
             <input type="text" name="username_second" placeholder="Name" class="hideme">
             <div class="buttonArea">
               <button type="submit" class="buttonIcon">