diff --git a/.env.example b/.env.example index f6b419e2..71920d44 100644 --- a/.env.example +++ b/.env.example @@ -63,5 +63,6 @@ RECAPTCHA_PRIVATE_KEY= BANNING_ENABLE= SUPPORT_EMAIL= +USER_SPAM_PROCESSOR_TO= MAIL_FROM_EMAIL="noreply@openstack.org" MAIL_FROM_NAME="noreply@openstack.org" \ No newline at end of file diff --git a/app/Console/Commands/SpammerProcess/UserSpammerProcessor.php b/app/Console/Commands/SpammerProcess/UserSpammerProcessor.php index 2d24be24..cade79f8 100644 --- a/app/Console/Commands/SpammerProcess/UserSpammerProcessor.php +++ b/app/Console/Commands/SpammerProcess/UserSpammerProcessor.php @@ -120,7 +120,7 @@ final class UserSpammerProcessor extends Command ]; } - if(count($users) > 0){ + if(count($users) > 0 && !empty(Config::get('mail.user_spam_processor_to'))){ Mail::queue(new UserSpammerProcessorResultsEmail($users)); } } diff --git a/app/Mail/UserSpammerProcessorResultsEmail.php b/app/Mail/UserSpammerProcessorResultsEmail.php index 54f525c7..e02178fe 100644 --- a/app/Mail/UserSpammerProcessorResultsEmail.php +++ b/app/Mail/UserSpammerProcessorResultsEmail.php @@ -44,7 +44,7 @@ class UserSpammerProcessorResultsEmail extends Mailable $subject = sprintf("[%s] User Spammer Process Result", Config::get('app.app_name')); return $this->from(Config::get("mail.from")) - ->to(Config::get("mail.from")) + ->to(Config::get("mail.user_spam_processor_to")) ->subject($subject) ->view('emails.user_spammer_process_result'); } diff --git a/config/mail.php b/config/mail.php index e9a3f6f9..cae44756 100644 --- a/config/mail.php +++ b/config/mail.php @@ -112,4 +112,5 @@ return [ 'reset_password_email_subject' => env('MAIL_USER_RESET_PASSWORD_EMAIL_SUBJECT'), 'locked_user_email_subject' => env("MAIL_LOCKED_USER_EMAIL_SUBJECT"), 'support_email' => env("MAIL_SUPPORT_ADDRESS"), + 'user_spam_processor_to' => env('USER_SPAM_PROCESSOR_TO') ];