Skip to content

Commit 86926a6

Browse files
author
Michele
committed
Added switch to "System > Server config > mail"
1 parent 7f0eba6 commit 86926a6

File tree

4 files changed

+14
-0
lines changed

4 files changed

+14
-0
lines changed

install/lib/installer_base.lib.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ public function add_database_server_record() {
314314
$tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi'];
315315
$tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier';
316316
$tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop';
317+
$tpl_ini_array['mail']['mailinglist'] = ($conf['mlmmj']['installed'] == true)?'mlmmj':'mailman';
317318
$tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user'];
318319
$tpl_ini_array['dns']['bind_group'] = $conf['bind']['bind_group'];
319320
$tpl_ini_array['dns']['bind_zonefiles_dir'] = $conf['bind']['bind_zonefiles_dir'];

install/tpl/server.ini.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ overquota_notify_client=y
5454
overquota_notify_freq=7
5555
overquota_notify_onok=n
5656
sendmail_path=/usr/sbin/sendmail
57+
mailinglist=mlmmj
5758

5859
[getmail]
5960
getmail_config_dir=/etc/getmail

interface/web/admin/form/server_config.tform.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,12 @@
608608
'default' => 'n',
609609
'value' => array(0 => 'n', 1 => 'y')
610610
),
611+
'mailinglist' => array(
612+
'datatype' => 'VARCHAR',
613+
'formtype' => 'SELECT',
614+
'default' => '20',
615+
'value' => array('mlmmj' => 'Mlmmj', 'mailman' => 'Mailman')
616+
),
611617
//#################################
612618
// ENDE Datatable fields
613619
//#################################

interface/web/admin/templates/server_config_mail_edit.htm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
117117
{tmpl_var name='overquota_notify_onok'}
118118
</div>
119119
</div>
120+
<div class="form-group">
121+
<label class="col-sm-3 control-label">{tmpl_var name='mailinglist_txt'}</label>
122+
<div class="col-sm-9"><select name="mailinglist" id="mailinglist" class="form-control">
123+
{tmpl_var name='mailinglist'}
124+
</select></div>
125+
</div>
120126

121127

122128
<input type="hidden" name="id" value="{tmpl_var name='id'}">

0 commit comments

Comments
 (0)