From 28a1de6319da8b481b9b5ec08f070bce65e17bb3 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Fri, 4 Aug 2017 13:09:47 -0400 Subject: Bug 1387459 - Tidy the Bugzilla/Config/*.pm modules --- Bugzilla/Config/MTA.pm | 113 +++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 55 deletions(-) (limited to 'Bugzilla/Config/MTA.pm') diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm index 8bbee3501..a12b425e2 100644 --- a/Bugzilla/Config/MTA.pm +++ b/Bugzilla/Config/MTA.pm @@ -36,6 +36,7 @@ use strict; use warnings; use Bugzilla::Config::Common; + # Return::Value 1.666002 pollutes the error log with warnings about this # deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send # to disable these warnings. @@ -47,64 +48,66 @@ use Email::Send; our $sortkey = 1200; sub get_param_list { - my $class = shift; - my @param_list = ( - { - name => 'mail_delivery_method', - type => 's', - # Bugzilla is not ready yet to send mails to newsgroups, and 'IO' - # is of no use for now as we already have our own 'Test' mode. - choices => [grep {$_ ne 'NNTP' && $_ ne 'IO'} Email::Send->new()->all_mailers(), 'None'], - default => 'Sendmail', - checker => \&check_mail_delivery_method - }, + my $class = shift; + my @param_list = ( + { + name => 'mail_delivery_method', + type => 's', + + # Bugzilla is not ready yet to send mails to newsgroups, and 'IO' + # is of no use for now as we already have our own 'Test' mode. + choices => [ grep { $_ ne 'NNTP' && $_ ne 'IO' } Email::Send->new()->all_mailers(), 'None' ], + default => 'Sendmail', + checker => \&check_mail_delivery_method + }, - { - name => 'mailfrom', - type => 't', - default => 'bugzilla-daemon' - }, + { + name => 'mailfrom', + type => 't', + default => 'bugzilla-daemon' + }, - { - name => 'use_mailer_queue', - type => 'b', - default => 0, - checker => \&check_theschwartz_available, - }, + { + name => 'use_mailer_queue', + type => 'b', + default => 0, + checker => \&check_theschwartz_available, + }, - { - name => 'smtpserver', - type => 't', - default => 'localhost' - }, - { - name => 'smtp_username', - type => 't', - default => '', - checker => \&check_smtp_auth - }, - { - name => 'smtp_password', - type => 'p', - default => '' - }, - { - name => 'smtp_debug', - type => 'b', - default => 0 - }, - { - name => 'whinedays', - type => 't', - default => 7, - checker => \&check_numeric - }, - { - name => 'globalwatchers', - type => 't', - default => '', - }, ); - return @param_list; + { + name => 'smtpserver', + type => 't', + default => 'localhost' + }, + { + name => 'smtp_username', + type => 't', + default => '', + checker => \&check_smtp_auth + }, + { + name => 'smtp_password', + type => 'p', + default => '' + }, + { + name => 'smtp_debug', + type => 'b', + default => 0 + }, + { + name => 'whinedays', + type => 't', + default => 7, + checker => \&check_numeric + }, + { + name => 'globalwatchers', + type => 't', + default => '', + }, + ); + return @param_list; } 1; -- cgit v1.2.3-24-g4f1b