Skip to content

Commit 4d01eca

Browse files
cez81lunny
authored andcommitted
Show Sendmail settings on admin config page (#2782)
* Show Sendmail settings on admin config page * Remove unecessary if statement
1 parent 6a107e5 commit 4d01eca

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

options/locale/locale_en-US.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,6 +1412,9 @@ config.mailer_disable_helo = Disable HELO
14121412
config.mailer_name = Name
14131413
config.mailer_host = Host
14141414
config.mailer_user = User
1415+
config.mailer_use_sendmail = Use Sendmail
1416+
config.mailer_sendmail_path = Sendmail Path
1417+
config.mailer_sendmail_args = Extra arguments to Sendmail
14151418
config.send_test_mail = Send Test Email
14161419
config.test_mail_failed = Failed to send test email to '%s': %v
14171420
config.test_mail_sent = Test email has been sent to '%s'.

templates/admin/config.tmpl

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,19 @@
170170
{{if .MailerEnabled}}
171171
<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt>
172172
<dd>{{.Mailer.Name}}</dd>
173-
<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
174-
<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
175-
<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
176-
<dd>{{.Mailer.Host}}</dd>
173+
{{if not .Mailer.UseSendmail}}
174+
<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
175+
<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
176+
<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
177+
<dd>{{.Mailer.Host}}</dd>
178+
{{else}}
179+
<dt>{{.i18n.Tr "admin.config.mailer_use_sendmail"}}</dt>
180+
<dd><i class="fa fa-check-square-o"></i></dd>
181+
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_path"}}</dt>
182+
<dd>{{.Mailer.SendmailPath}}</dd>
183+
<dt>{{.i18n.Tr "admin.config.mailer_sendmail_args"}}</dt>
184+
<dd>{{.Mailer.SendmailArgs}}</dd>
185+
{{end}}
177186
<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
178187
<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
179188
<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">

0 commit comments

Comments
 (0)