From 4d01ecaef350c6df0c27913f05cc0537bed5f7e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Br=C3=B6ms?= <cez81@users.noreply.github.com>
Date: Thu, 26 Oct 2017 10:47:16 +0200
Subject: [PATCH] Show Sendmail settings on admin config page (#2782)

* Show Sendmail settings on admin config page

* Remove unecessary if statement
---
 options/locale/locale_en-US.ini |  3 +++
 templates/admin/config.tmpl     | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 686e353ea..6fa33e97c 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1412,6 +1412,9 @@ config.mailer_disable_helo = Disable HELO
 config.mailer_name = Name
 config.mailer_host = Host
 config.mailer_user = User
+config.mailer_use_sendmail = Use Sendmail
+config.mailer_sendmail_path = Sendmail Path
+config.mailer_sendmail_args = Extra arguments to Sendmail
 config.send_test_mail = Send Test Email
 config.test_mail_failed = Failed to send test email to '%s': %v
 config.test_mail_sent = Test email has been sent to '%s'.
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index b57b1847f..3af0c870c 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -170,10 +170,19 @@
 				{{if .MailerEnabled}}
 					<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt>
 					<dd>{{.Mailer.Name}}</dd>
-					<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
-					<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
-					<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
-					<dd>{{.Mailer.Host}}</dd>
+					{{if not .Mailer.UseSendmail}}
+						<dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt>
+						<dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd>
+						<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
+						<dd>{{.Mailer.Host}}</dd>
+					{{else}}
+						<dt>{{.i18n.Tr "admin.config.mailer_use_sendmail"}}</dt>
+						<dd><i class="fa fa-check-square-o"></i></dd>
+						<dt>{{.i18n.Tr "admin.config.mailer_sendmail_path"}}</dt>
+						<dd>{{.Mailer.SendmailPath}}</dd>
+						<dt>{{.i18n.Tr "admin.config.mailer_sendmail_args"}}</dt>
+						<dd>{{.Mailer.SendmailArgs}}</dd>
+					{{end}}
 					<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
 					<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
 					<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">