From a126d73f3530fb7c7e6d0fda047058fb75c58695 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 8 Feb 2013 08:38:40 +0000
Subject: [PATCH] - Added: path to sendmail in server config (prepared for
 mailsafe module)

---
 install/tpl/server.ini.master                         |  1 +
 interface/web/admin/form/server_config.tform.php      | 11 +++++++++++
 interface/web/admin/lib/lang/de_server_config.lng     |  2 ++
 interface/web/admin/lib/lang/en_server_config.lng     |  2 ++
 .../web/admin/templates/server_config_mail_edit.htm   |  4 ++++
 5 files changed, 20 insertions(+)

diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 4dae4f67fc..eccf00e115 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -34,6 +34,7 @@ mailbox_size_limit=0
 message_size_limit=0
 mailbox_quota_stats=y
 realtime_blackhole_list=
+sendmail_path=/usr/sbin/sendmail
 
 [getmail]
 getmail_config_dir=/etc/getmail
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index c52096dafe..3789348e2d 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -321,6 +321,17 @@ $form["tabs"]['mail'] = array(
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'sendmail_path' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'TEXT',
+			'default' => '/usr/sbin/sendmail',
+			'validators' => array(0 => array('type' => 'NOTEMPTY',
+					'errmsg' => 'sendmail_path_error_empty'),
+			),
+			'value' => '',
+			'width' => '40',
+			'maxlength' => '255'
+		),
 	##################################
 	# ENDE Datatable fields
 	##################################
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 18a1e38ae4..670fbe02c5 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -176,4 +176,6 @@ $wb['v6_prefix_wrong'] = 'Falsches IPv6 Netzmasken Format.';
 $wb['php_ini_check_minutes_txt'] = 'Pr&uuml;fe System php.ini Dateien auf &Auml;nderungen alle';
 $wb['php_ini_check_minutes_info_txt'] = 'Minute(n) (0 deaktiviert diese Funktion)';
 $wb['php_ini_check_minutes_error_empty'] = 'Der Wert f&uuml;r die Einstellung der php.ini Pr&uuml;fung ist ung&uuml;ltig.';
+$wb["sendmail_path_txt"] = 'Pfad zu Sendmail';
+$wb["sendmail_path_error_empty"] = 'Sendmail Pfad ist leer.';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index e94c4d3a08..3897fc4f0c 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -176,4 +176,6 @@ $wb["v6_prefix_wrong"] = 'Invalid v6 Netmask format.';
 $wb["php_ini_check_minutes_txt"] = 'Check system php.ini files for changes each';
 $wb["php_ini_check_minutes_info_txt"] = 'minutes (0 disables checking)';
 $wb['php_ini_check_minutes_error_empty'] = 'Invalid value for php.ini checking.';
+$wb["sendmail_path_txt"] = 'Sendmail Path';
+$wb["sendmail_path_error_empty"] = 'Sendmail Path is empty.';
 ?>
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index 4bfd430b94..fba0bf72ec 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -81,6 +81,10 @@
                 <label for="realtime_blackhole_list">{tmpl_var name='realtime_blackhole_list_txt'}</label>
                 <input name="realtime_blackhole_list" id="realtime_blackhole_list" value="{tmpl_var name='realtime_blackhole_list'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='realtime_blackhole_list_note_txt'}
             </div>
+            <div class="ctrlHolder">
+                <label for="sendmail_path">{tmpl_var name='sendmail_path_txt'}</label>
+                <input name="sendmail_path" id="sendmail_path" value="{tmpl_var name='sendmail_path'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
         </fieldset>
             
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
-- 
GitLab