openinfra
/
openstackid
Code Issues Proposed changes

Fixed spam process mail 

Change-Id: I295d38eb1d0a9a611a1cbcec76962f0d33989936
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-03-25 11:14:22 -03:00
parent aebb6224ce
commit 640ae9cab4
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -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"

2
app/Console/Commands/SpammerProcess/UserSpammerProcessor.php
View File

@ -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));
}
}

2
app/Mail/UserSpammerProcessorResultsEmail.php
View File

@ -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');
}

1
config/mail.php
View File

@ -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')
];