Skip to content

Commit c129ac0

Browse files
author
Marius Burkard
committed
Merge branch '1804-disable-welcome-mail' into 'develop'
Resolve "Add option to disable email welcome messages in server settings." Closes #1804 See merge request ispconfig/ispconfig3!1429
2 parents a0f8f9f + 81008bd commit c129ac0

29 files changed

+62
-23
lines changed

install/tpl/system.ini.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ webmail_url=/webmail
1616
dkim_path=/var/lib/amavis/dkim
1717
smtp_enabled=y
1818
smtp_host=localhost
19+
enable_welcome_mail=y
1920

2021
[monitor]
2122

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,12 @@
267267
'default' => 'n',
268268
'value' => array(0 => 'n', 1 => 'y')
269269
),
270+
'enable_welcome_mail' => array(
271+
'datatype' => 'VARCHAR',
272+
'formtype' => 'CHECKBOX',
273+
'default' => 'y',
274+
'value' => array(0 => 'n', 1 => 'y')
275+
),
270276
'mailbox_show_autoresponder_tab' => array (
271277
'datatype' => 'VARCHAR',
272278
'formtype' => 'CHECKBOX',

interface/web/admin/lib/lang/ar_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ $wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
2323
$wb['webdavuser_prefix_txt'] = 'Webdav user prefix';
2424
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
2525
$wb['webftp_url_txt'] = 'WebFTP URL';
26+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2627
$wb['enable_custom_login_txt'] = 'Allow custom login name';
2728
$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
2829
$wb['mailmailinglist_url_txt'] = 'Mailing list URL';

interface/web/admin/lib/lang/bg_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $wb['webftp_url_txt'] = 'WebFTP URL';
2222
$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
2323
$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
2424
$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
25+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2526
$wb['enable_custom_login_txt'] = 'Разреши различни имена за вход';
2627
$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
2728
$wb['mailmailinglist_url_txt'] = 'Мейлинг лист адрес URL';

interface/web/admin/lib/lang/br_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $wb['ftpuser_prefix_error_regex'] = 'Caractere não permitido para o prefixo de
2424
$wb['shelluser_prefix_error_regex'] = 'Caractere não permitido para o prefixo de usuário shell.';
2525
$wb['webdavuser_prefix_error_regex'] = 'Caractere não permitido para o prefixo de usuário Webdav.';
2626
$wb['dblist_phpmyadmin_link_txt'] = 'Link para o PHPMyAdmin';
27+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2728
$wb['enable_custom_login_txt'] = 'Permitir nome de usuário personalizado';
2829
$wb['mailboxlist_webmail_link_txt'] = 'Link para o Webmail';
2930
$wb['mailbox_show_autoresponder_tab_txt'] = 'Exibir aba de auto-resposta nos detalhes da conta de email';

interface/web/admin/lib/lang/ca_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
2424
$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
2525
$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
2626
$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
27+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2728
$wb['enable_custom_login_txt'] = 'Allow custom login name';
2829
$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
2930
$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';

interface/web/admin/lib/lang/cz_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ $wb['new_domain_txt'] = 'HTML vytvořit novou doménu';
2525
$wb['webftp_url_txt'] = 'WebFTP URL';
2626
$wb['admin_mail_txt'] = 'E-mail Administrátora';
2727
$wb['admin_name_txt'] = 'Jméno Administrátora';
28+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2829
$wb['enable_custom_login_txt'] = 'Povolit vlastní přihlašovací jméno u e-mailové schránky';
2930
$wb['mailmailinglist_link_txt'] = 'Ikonový odkaz na aplikaci E-mailových konferencí seznamu e-mailových konferencí';
3031
$wb['mailmailinglist_url_txt'] = 'E-mailové konference URL';

interface/web/admin/lib/lang/de_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ $wb['use_domain_module_txt'] = 'Domain Limits im Kundenmodul benutzen, um neue D
3131
$wb['use_domain_module_hint'] = 'Falls Sie die Domain Limits benutzen, können Ihre Kunden nur eine der Domains auswählen, die der Admin für sie angelegt hat. Die Kunden können das Domain-Feld nicht frei editieren. Sie müssen sich neu einloggen, wenn Sie diesen Wert ändern.';
3232
$wb['new_domain_txt'] = 'HTML Text zum Anlegen einer neuen Domain';
3333
$wb['webftp_url_txt'] = 'WebFTP URL';
34+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
3435
$wb['enable_custom_login_txt'] = 'Abweichenden Login Namen erlauben';
3536
$wb['mailmailinglist_link_txt'] = 'Link zur Mailingliste in der Mailinglisten Übersicht';
3637
$wb['mailmailinglist_url_txt'] = 'Mailinglisten URL';

interface/web/admin/lib/lang/dk_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $wb['ftpuser_prefix_error_regex'] = 'Char ikke tilladt i ftp bruger prefix.';
2222
$wb['shelluser_prefix_error_regex'] = 'Char ikke tilladt i shell bruger prefix.';
2323
$wb['webdavuser_prefix_error_regex'] = 'Char ikke tilladt i webdav bruger prefix.';
2424
$wb['dblist_phpmyadmin_link_txt'] = 'Link til phpmyadmin i DB liste';
25+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2526
$wb['enable_custom_login_txt'] = 'Tillad brugerdefinerede login-navn';
2627
$wb['mailboxlist_webmail_link_txt'] = 'Link til webmail i Postboks liste';
2728
$wb['webmail_url_txt'] = 'Webmail URL';

interface/web/admin/lib/lang/el_system_config.lng

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ $wb['use_domain_module_txt'] = 'Χρήση του αρθρώματος-domain γ
2323
$wb['use_domain_module_hint'] = 'Αν χρησιμοποιήσετε αυτό το άρθρωμα, οι πελάτες σας μπορούν μόνο να διαλέξουν ένα από τα domains που δημιούργησε για αυτούς ο διαχειριστής. Δεν μπορούν να επεξεργαστούν ελεύθερα τα πεδία του domain.Πρέπει να επανασυνδεθείτε αν αλλάξετε αυτή την τιμή, για να γίνουν οι αλλαγές σας, ορατές.';
2424
$wb['new_domain_txt'] = 'HTML για την δημιουργία domain';
2525
$wb['webftp_url_txt'] = 'URL του WebFTP';
26+
$wb['enable_welcome_mail_txt'] = 'Enable welcome email';
2627
$wb['enable_custom_login_txt'] = 'Αποδοχή προσαρμοσμένου ονόματος login';
2728
$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
2829
$wb['mailmailinglist_url_txt'] = 'URL της Mailing list ';

0 commit comments

Comments
 (0)