From c574dd4c6673d1245cca5175b87a8307f41ed86f Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Wed, 2 Nov 2022 03:46:56 +0000
Subject: [PATCH] More cleanup and improvements in email verification.

---
 Rocksolid_Light/common/register.php       | 6 +++++-
 Rocksolid_Light/rslight/phpmailer.inc.php | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Rocksolid_Light/common/register.php b/Rocksolid_Light/common/register.php
index 033b2b1..3ce54e8 100644
--- a/Rocksolid_Light/common/register.php
+++ b/Rocksolid_Light/common/register.php
@@ -300,11 +300,15 @@ $mail->Username   = $mailer['username'];
 $mail->Password   = $mailer['password'];;
 $mail->SMTPSecure = 'tls';
 
-$mail->setFrom($mailer['username'].'@'.$mailer['host'], $mailer['username']);
+$mail->setFrom($mail_user.'@'.$mail_domain, $mail_name);
 $mail->addAddress($user_email);
 
 $mail->Subject = "Confirmation code for ".$_SERVER['HTTP_HOST']; 
 
+foreach($mail_custom_header as $key => $value) {
+  $mail->addCustomHeader($key, $value);
+}
+
 $mycode = create_code($username);
 $msg="A request to create an account on ".$_SERVER['HTTP_HOST'];
 $msg.=" has been made using ".$user_email.".\n\n";
diff --git a/Rocksolid_Light/rslight/phpmailer.inc.php b/Rocksolid_Light/rslight/phpmailer.inc.php
index 8444e1d..12936de 100644
--- a/Rocksolid_Light/rslight/phpmailer.inc.php
+++ b/Rocksolid_Light/rslight/phpmailer.inc.php
@@ -6,6 +6,15 @@
   $phpmailer['smtp'] = '/usr/share/php/libphp-phpmailer/src/SMTP.php';
   $phpmailer['exception'] = '/usr/share/php/libphp-phpmailer/src/Exception.php';
 
+# Custom Headers (you can add multiple)
+#$mail_custom_header['X-Custom-Header-Name'] = "header info";
+
+# Display From info
+$mail_user = "user";
+$mail_domain = "domain";
+$mail_name = "Name for user";
+
+# Log in info
 $mailer = array();
 $mailer['host'] = "mail.example.com";
 $mailer['port'] = "587";