Refactor mail handling a bit and make registration use the same method as the

other places that send mail.

1 files changed, 48 insertions, 28 deletions

diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index 3b85efeb..deed6b27 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -462,24 +462,23 @@ refresh_limit = "60"
 ; DEFAULT: false
 ;captcha_public_reg = "false"
 
-; This setting defines the mail domain your in.
-; It tries to deliver a test mail before the user can register and uses
-; the from address info@"domain.tld". No mail is send from this address it's
-; only used to test the existence of a mailbox before accepting user registration.
-; DEFAULT: domain.tld
-;mail_domain = "domain.tld"
-
-; This setting will be used as mail from address.
-; It will also be used to notify if a registration occurred.
-; You need to change this when you activate public_registration.
-;mail_from = "info@domain.tld"
-
-; It defines whether this setup checks a mail address strictly.
+; This setting defines the mail domain you're in.
+; DEFAULT: example.com 
+;mail_domain = "example.com"
+
+; This setting will be used as the user part of the mail address for notifications.
+; For example, setting this to 'me' will set the sender to 'me@example.com'.
+; DEFAULT: info
+;mail_user = "info"
+
+; This setting affects how strictly candidate email addresses are checked.
 ; You can select "strict" or "easy" or "none".
+; "easy" does a regex match, "strict" actually performs some SMTP transactions to see if
+; we can send to this address.
 ; DEFAULT: strict
 ;mail_check = "strict"
 
-; This setting turns on/off admin notify off registration.
+; This setting turns on/off admin notification of registration.
 ; DEFAULT: false
 ;admin_notify_reg = "false"
 
@@ -582,38 +581,59 @@ use_rss = true
 ;#############################
 ;   Mail Settings            #
 ;#############################
-; This is needed to use phpmailer
 
-; Mail Send Type. 
-; smtp or sendmail or php.
+;Method used to send mail
+;POSSIBLE VALUES: smtp sendmail php
 ;DEFAULT: php
-;mail_type = "smtp"
+;mail_type = "php"
+
+;Mail domain.
+;DEFAULT: example.com 
+;mail_domain = "example.com"
+
+;This will be combined with mail_domain and used as the source address for
+;emails generated by Ampache.  For example, setting this to 'me' will set the
+;sender to 'me@example.com'.
+;DEFAULT: info
+;mail_user = "info"
+
+;A name to go with the email address.
+;DEFAULT: Ampache
+;mail_name = "Ampache"
+
+;How strictly email addresses should be checked.
+;easy does a regex match, strict actually performs some SMTP transactions
+;to see if we can send to this address.
+;POSSIBLE VALUES: strict easy none
+; DEFAULT: strict
+;mail_check = "strict"
+
+
+;############################
+;   sendmail Settings       #
+;############################
 
-; Sendmail path
-; if you are using sendmail, please set to sendmail path.
 ;DEFAULT: /usr/sbin/sendmail
 ;sendmail_path = "/usr/sbin/sendmail"
 
 ;#############################
-;   Mail SMTP Settings       #
+;   SMTP Settings            #
 ;#############################
-; If you want to use smtp on phpmailer,
-; please set following configs.
 
-; Mail server hostname or IP address
+;Mail server (hostname or IP address)
 ;DEFAULT: localhost
 ;mail_host = "localhost"
 
-; Mail server port
+; SMTP port
 ;DEFAULT: 25
 ;mail_port = 25
 
-; SMTPAuth true or false
+;Enable SMTP authentication
 ;DEFAULT: false
 ;mail_auth = true
 
-; SMTP Username
-; your mail auth username.
+;SMTP Username
+;your mail auth username.
 ;mail_auth_user = ""
 
 ; SMTP Password