Commit 92e50958 authored by tbrehm's avatar tbrehm

Fixed: FS#1712 - Welcome email in multiserver setup problem (welcome mail not...

Fixed: FS#1712 - Welcome email in multiserver setup problem (welcome mail not send because MySQL delay)
parent d2f8d345
...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -'; $wb['no_policy'] = '- not enabled -';
$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
$wb['welcome_mail_message'] = 'Welcome to your new email account. Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP'; $wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3'; $wb['disablepop3_txt'] = 'Disable POP3';
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.'; $wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -'; $wb['no_policy'] = '- not enabled -';
$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
$wb['welcome_mail_message'] = 'Welcome to your new email account.
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP'; $wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3'; $wb['disablepop3_txt'] = 'Disable POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3'; $wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desativado -'; $wb['no_policy'] = '- desativado -';
$wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para sua conta foi atingido.'; $wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para sua conta foi atingido.';
$wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.'; $wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.ext';
$wb['welcome_mail_subject'] = 'Parabéns sua conta de correio foi criada.';
$wb['welcome_mail_message'] = 'Parabéns sua conta de correio foi criada. Att. Seu webmaster.';
$wb['disableimap_txt'] = 'Desativar IMAP'; $wb['disableimap_txt'] = 'Desativar IMAP';
$wb['disablepop3_txt'] = 'Disativar POP3'; $wb['disablepop3_txt'] = 'Disativar POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Já existe um aliase o encaminhamento com este endereço de correio.'; $wb['duplicate_alias_or_forward_txt'] = 'Já existe um aliase o encaminhamento com este endereço de correio.';
......
...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfiltr'; ...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfiltr';
$wb['no_policy'] = '- nepovoleno -'; $wb['no_policy'] = '- nepovoleno -';
$wb['limit_mailbox_txt'] = 'Dosažen maximální počet mailboxů pro Váš účet.'; $wb['limit_mailbox_txt'] = 'Dosažen maximální počet mailboxů pro Váš účet.';
$wb['limit_mailquota_txt'] = 'Dosažen maximální prostor pro mailboxy. Max. dostupné místo v MB je'; $wb['limit_mailquota_txt'] = 'Dosažen maximální prostor pro mailboxy. Max. dostupné místo v MB je';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Vítejte do Vašeho nového email účtu.';
$wb['welcome_mail_message'] = 'Vítejte do Vašeho nového email účtu. Váš webmaster.';
$wb['disableimap_txt'] = 'Zakázat IMAP'; $wb['disableimap_txt'] = 'Zakázat IMAP';
$wb['disablepop3_txt'] = 'Zakázat POP3'; $wb['disablepop3_txt'] = 'Zakázat POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Alias nebo přesměrování s touto adresou již existuje.'; $wb['duplicate_alias_or_forward_txt'] = 'Alias nebo přesměrování s touto adresou již existuje.';
......
...@@ -20,13 +20,9 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -20,13 +20,9 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nicht aktiviert -'; $wb['no_policy'] = '- nicht aktiviert -';
$wb['limit_mailbox_txt'] = 'Die maximale Anzahl an Mailboxen für ihr Konto wurde erreich.'; $wb['limit_mailbox_txt'] = 'Die maximale Anzahl an Mailboxen für ihr Konto wurde erreich.';
$wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für ihre Mailboxen wurde erreicht. Der maximal verfügbare Speicher in MB ist'; $wb['limit_mailquota_txt'] = 'Der maximale Speicherplatz für ihre Mailboxen wurde erreicht. Der maximal verfügbare Speicher in MB ist';
$wb['welcome_mail_subject'] = 'Ihr neuer Mailaccount ist aktiv';
$wb['welcome_mail_message'] = 'Ihr Mailaccount ist jetzt aktiv. Viel Vergnügen.';
$wb['disableimap_txt'] = 'IMAP deaktivieren'; $wb['disableimap_txt'] = 'IMAP deaktivieren';
$wb['disablepop3_txt'] = 'POP3 deaktivieren'; $wb['disablepop3_txt'] = 'POP3 deaktivieren';
$wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['password_strength_txt'] = 'Passwortkomplexität';
$wb['welcome_mail_fromname_txt'] = 'Support';
$wb['welcome_mail_fromemail_txt'] = 'root@localhost';
$wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.'; $wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.';
$wb['quota_error_value'] = 'Ungültige Quota Eingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1'; $wb['quota_error_value'] = 'Ungültige Quota Eingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1';
$wb['autoresponder_start_date_txt'] = 'Startet am'; $wb['autoresponder_start_date_txt'] = 'Startet am';
......
...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ανενεργή -'; $wb['no_policy'] = '- ανενεργή -';
$wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.'; $wb['limit_mailbox_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των θυρίδων για τον λογαριασμό σας.';
$wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι'; $wb['limit_mailquota_txt'] = 'Έχετε φτάσει στο μέγεστο χώρο της θυρίδα σας.Ο μέγιστος διαθέσιμος χώρος σε MB είναι';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'info@iopen.gr';
$wb['welcome_mail_subject'] = 'Καλωσήρθατε στον νέο σας λογαριασμό ηλεκτρονικού ταχυδρομείου.';
$wb['welcome_mail_message'] = 'Καλωσήρθατε στον νέο σας λογαριασμό ηλεκτρονικού ταχυδρομείου. Ο διαχειριστής σας.';
$wb['disableimap_txt'] = 'Απενεργοποίηση IMAP'; $wb['disableimap_txt'] = 'Απενεργοποίηση IMAP';
$wb['disablepop3_txt'] = 'Απενεργοποίηση POP3'; $wb['disablepop3_txt'] = 'Απενεργοποίηση POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Υπάρχει ήδη ένα ψευδωνύμο ή μία προώθηση με αυτή τη διεύθυνση email.'; $wb['duplicate_alias_or_forward_txt'] = 'Υπάρχει ήδη ένα ψευδωνύμο ή μία προώθηση με αυτή τη διεύθυνση email.';
......
...@@ -25,10 +25,6 @@ $wb["policy_txt"] = 'Spamfilter'; ...@@ -25,10 +25,6 @@ $wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -'; $wb["no_policy"] = '- not enabled -';
$wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.'; $wb["limit_mailbox_txt"] = 'The max. number of mailboxes for your account is reached.';
$wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb["limit_mailquota_txt"] = 'The max space for mailboxes is reached. The max. available space in MB is';
$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
$wb["welcome_mail_subject"] = 'Welcome to your new email account.';
$wb["welcome_mail_message"] = "Welcome to your new email account. Your webmaster.";
$wb["disableimap_txt"] = 'Disable IMAP'; $wb["disableimap_txt"] = 'Disable IMAP';
$wb["disablepop3_txt"] = 'Disable POP3'; $wb["disablepop3_txt"] = 'Disable POP3';
$wb["duplicate_alias_or_forward_txt"] = 'There is already an alias or forward with this email address.'; $wb["duplicate_alias_or_forward_txt"] = 'There is already an alias or forward with this email address.';
......
...@@ -21,12 +21,8 @@ $wb['policy_txt'] = 'Filtro de spam'; ...@@ -21,12 +21,8 @@ $wb['policy_txt'] = 'Filtro de spam';
$wb['no_policy'] = '- no habilitado -'; $wb['no_policy'] = '- no habilitado -';
$wb['limit_mailbox_txt'] = 'Se ha alcanzado el número máximo de buzones de correo de su cuenta.'; $wb['limit_mailbox_txt'] = 'Se ha alcanzado el número máximo de buzones de correo de su cuenta.';
$wb['limit_mailquota_txt'] = 'Se ha alcanzado el espacio máximo para sus buzones de correo. El espacio máximo disponible en MB es'; $wb['limit_mailquota_txt'] = 'Se ha alcanzado el espacio máximo para sus buzones de correo. El espacio máximo disponible en MB es';
$wb['welcome_mail_subject'] = 'Bienvenido a su nueva cuenta de correo electrónico.';
$wb['welcome_mail_message'] = 'Bienvenido a su nueva cuenta de correo electrónico. Fdo: Su administrador web.';
$wb['disableimap_txt'] = 'Inhabilitar IMAP'; $wb['disableimap_txt'] = 'Inhabilitar IMAP';
$wb['disablepop3_txt'] = 'Inhabilitar POP3'; $wb['disablepop3_txt'] = 'Inhabilitar POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['duplicate_alias_or_forward_txt'] = 'Ya existe un alias o reenvío con esta dirección de correo electrónico.'; $wb['duplicate_alias_or_forward_txt'] = 'Ya existe un alias o reenvío con esta dirección de correo electrónico.';
$wb['quota_error_value'] = 'Valor de cuota no válido. Los valores permitidos son: 0 para ilimitado o números > 1'; $wb['quota_error_value'] = 'Valor de cuota no válido. Los valores permitidos son: 0 para ilimitado o números > 1';
$wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_txt'] = 'Start on';
......
...@@ -20,10 +20,6 @@ $wb['policy_txt'] = 'Roskapostisuodatin'; ...@@ -20,10 +20,6 @@ $wb['policy_txt'] = 'Roskapostisuodatin';
$wb['no_policy'] = '- ei käytössä -'; $wb['no_policy'] = '- ei käytössä -';
$wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.'; $wb['limit_mailbox_txt'] = 'Tilisi sallittu postilaatikoiden määrä on ylitetty.';
$wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on'; $wb['limit_mailquota_txt'] = 'Tilisi sallittu postilaatikoiden koko on ylitetty. Vapaa tila megatavuina on';
$wb["welcome_mail_fromname_txt"] = 'ISPConfig3';
$wb["welcome_mail_fromemail_txt"] = "webmaster@localhost.tld";
$wb['welcome_mail_subject'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi.';
$wb['welcome_mail_message'] = 'Tervetuloa käyttämään uutta sähköpotitiliäsi toivottaa Postmaster';
$wb['disableimap_txt'] = 'Estä IMAP'; $wb['disableimap_txt'] = 'Estä IMAP';
$wb['disablepop3_txt'] = 'Estä POP3'; $wb['disablepop3_txt'] = 'Estä POP3';
$wb['password_strength_txt'] = 'Salasanan vahvuus'; $wb['password_strength_txt'] = 'Salasanan vahvuus';
......
...@@ -21,12 +21,8 @@ $wb['policy_txt'] = 'Filtre antispam'; ...@@ -21,12 +21,8 @@ $wb['policy_txt'] = 'Filtre antispam';
$wb['no_policy'] = '- inactif -'; $wb['no_policy'] = '- inactif -';
$wb['limit_mailbox_txt'] = 'Le nombre maximal de boites email pour votre compte est atteint..'; $wb['limit_mailbox_txt'] = 'Le nombre maximal de boites email pour votre compte est atteint..';
$wb['limit_mailquota_txt'] = 'L\'espace maximal pour les boites email est atteint. L\'espace maximal disponible est de '; $wb['limit_mailquota_txt'] = 'L\'espace maximal pour les boites email est atteint. L\'espace maximal disponible est de ';
$wb['welcome_mail_subject'] = 'Bienvenue sur votre nouveau compte mail.';
$wb['welcome_mail_message'] = 'Bienvenue sur votre nouveau compte mail. Votre webmaster.';
$wb['disableimap_txt'] = 'Désactiver IMAP'; $wb['disableimap_txt'] = 'Désactiver IMAP';
$wb['disablepop3_txt'] = 'Désactiver POP3'; $wb['disablepop3_txt'] = 'Désactiver POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d\'email sur cette adresse.'; $wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d\'email sur cette adresse.';
$wb['autoresponder_start_date_txt'] = 'Démarrer le'; $wb['autoresponder_start_date_txt'] = 'Démarrer le';
$wb['autoresponder_start_date_isfuture'] = 'La date de démarrage ne peut être une date passée.'; $wb['autoresponder_start_date_isfuture'] = 'La date de démarrage ne peut être une date passée.';
......
...@@ -20,13 +20,9 @@ $wb['policy_txt'] = 'Spam szűrő'; ...@@ -20,13 +20,9 @@ $wb['policy_txt'] = 'Spam szűrő';
$wb['no_policy'] = '- nem engelyézett -'; $wb['no_policy'] = '- nem engelyézett -';
$wb['limit_mailbox_txt'] = 'Nincs több mailbox lehetőség.'; $wb['limit_mailbox_txt'] = 'Nincs több mailbox lehetőség.';
$wb['limit_mailquota_txt'] = 'Mailbox tárhely elfogyott.'; $wb['limit_mailquota_txt'] = 'Mailbox tárhely elfogyott.';
$wb['welcome_mail_subject'] = 'Isten hozta az új levelezőládjában';
$wb['welcome_mail_message'] = 'Isten hozta az új levelezőládjában. Az Ön webmestere.';
$wb['disableimap_txt'] = 'IMAP Tiltás'; $wb['disableimap_txt'] = 'IMAP Tiltás';
$wb['disablepop3_txt'] = 'POP3 Tiltás'; $wb['disablepop3_txt'] = 'POP3 Tiltás';
$wb['password_strength_txt'] = 'Jelszó erőssége'; $wb['password_strength_txt'] = 'Jelszó erőssége';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.'; $wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1'; $wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_txt'] = 'Start on';
......
...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- tidak diaktifkan -'; $wb['no_policy'] = '- tidak diaktifkan -';
$wb['limit_mailbox_txt'] = 'Jumlah maks mailbox untuk akun Anda sudah tercapai.'; $wb['limit_mailbox_txt'] = 'Jumlah maks mailbox untuk akun Anda sudah tercapai.';
$wb['limit_mailquota_txt'] = 'Ruang maks untuk mailbox sudah tercapai. Ruang maks yang tersedia dalam MB adalah'; $wb['limit_mailquota_txt'] = 'Ruang maks untuk mailbox sudah tercapai. Ruang maks yang tersedia dalam MB adalah';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Selamat Datang di Akun Email Baru Anda.';
$wb['welcome_mail_message'] = 'Selamat datang di akun email baru Anda. Webmaster Anda.';
$wb['disableimap_txt'] = 'Nonaktifkan IMAP'; $wb['disableimap_txt'] = 'Nonaktifkan IMAP';
$wb['disablepop3_txt'] = 'Nonaktifkan POP3'; $wb['disablepop3_txt'] = 'Nonaktifkan POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Sudah ada alias atau forward untuk alamat email ini.'; $wb['duplicate_alias_or_forward_txt'] = 'Sudah ada alias atau forward untuk alamat email ini.';
......
...@@ -21,14 +21,8 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,14 +21,8 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -'; $wb['no_policy'] = '- not enabled -';
$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
$wb['welcome_mail_message'] = 'Welcome to your new email account.
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP'; $wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3'; $wb['disablepop3_txt'] = 'Disable POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.'; $wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1'; $wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_txt'] = 'Start on';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'スパムフィルター'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'スパムフィルター';
$wb['no_policy'] = '- 利用しない -'; $wb['no_policy'] = '- 利用しない -';
$wb['limit_mailbox_txt'] = 'メールボックスが最大数に達した為、これ以上追加できません。'; $wb['limit_mailbox_txt'] = 'メールボックスが最大数に達した為、これ以上追加できません。';
$wb['limit_mailquota_txt'] = 'メールボックスが一杯です。 上限(MB):'; $wb['limit_mailquota_txt'] = 'メールボックスが一杯です。 上限(MB):';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'ご利用ありがとうございます。';
$wb['welcome_mail_message'] = 'Welcome to your new email account. Your webmaster.';
$wb['disableimap_txt'] = 'IMAP を無効にする'; $wb['disableimap_txt'] = 'IMAP を無効にする';
$wb['disablepop3_txt'] = 'POP3 を無効にする'; $wb['disablepop3_txt'] = 'POP3 を無効にする';
$wb['duplicate_alias_or_forward_txt'] = 'このメールアドレスには既にエイリアスまたはフォワードが設定されています。'; $wb['duplicate_alias_or_forward_txt'] = 'このメールアドレスには既にエイリアスまたはフォワードが設定されています。';
......
...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -25,10 +25,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- niet ingeschakeld -'; $wb['no_policy'] = '- niet ingeschakeld -';
$wb['limit_mailbox_txt'] = 'Het max. aantal mailboxen voor uw account is bereikt.'; $wb['limit_mailbox_txt'] = 'Het max. aantal mailboxen voor uw account is bereikt.';
$wb['limit_mailquota_txt'] = 'De max. ruimte voor uw mailboxen is bereikt. De max. beschikbare ruimte in MB is'; $wb['limit_mailquota_txt'] = 'De max. ruimte voor uw mailboxen is bereikt. De max. beschikbare ruimte in MB is';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Welkom op uw nieuwe email account.';
$wb['welcome_mail_message'] = 'Welkom op uw nieuwe email account. Uw webmaster.';
$wb['disableimap_txt'] = 'Uitschakelen IMAP'; $wb['disableimap_txt'] = 'Uitschakelen IMAP';
$wb['disablepop3_txt'] = 'Uitschakelen POP3'; $wb['disablepop3_txt'] = 'Uitschakelen POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Er is al een alias of forward met dir e-mailadres.'; $wb['duplicate_alias_or_forward_txt'] = 'Er is al een alias of forward met dir e-mailadres.';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Filtr spamu'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '- nie dostępny -'; $wb['no_policy'] = '- nie dostępny -';
$wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.'; $wb['limit_mailbox_txt'] = 'Maksymalna ilość skrzynek pocztowych dla Twojego konta została przekroczona.';
$wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: '; $wb['limit_mailquota_txt'] = 'Maksymalna pojemność skrzynki pocztowej została przekroczona. Maksymalne dostępne miejsce w MB to: ';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Witaj w swoim nowym koncie pocztowym.';
$wb['welcome_mail_message'] = 'Witaj w swoim nowym koncie pocztowym. Twój Webmaster.';
$wb['disableimap_txt'] = 'Wyłącz IMAP'; $wb['disableimap_txt'] = 'Wyłącz IMAP';
$wb['disablepop3_txt'] = 'Wyłącz POP3'; $wb['disablepop3_txt'] = 'Wyłącz POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Istnieje już alias lub przekierowanie dla tego adresu e-mail.'; $wb['duplicate_alias_or_forward_txt'] = 'Istnieje już alias lub przekierowanie dla tego adresu e-mail.';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desactivado -'; $wb['no_policy'] = '- desactivado -';
$wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para a conta foi atingido.'; $wb['limit_mailbox_txt'] = 'O número máximo de caixas de correio para a conta foi atingido.';
$wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.'; $wb['limit_mailquota_txt'] = 'O espaço em disco disponível para criação de contas foi atingido.';
$wb['welcome_mail_fromname_txt'] = 'LAsi';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Nova conta de correio.';
$wb['welcome_mail_message'] = 'Parabéns a conta de correio foi criada.';
$wb['disableimap_txt'] = 'Desactivar IMAP'; $wb['disableimap_txt'] = 'Desactivar IMAP';
$wb['disablepop3_txt'] = 'Desactivar POP3'; $wb['disablepop3_txt'] = 'Desactivar POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Já existe um alias ou encaminhamento com este endereço de correio.'; $wb['duplicate_alias_or_forward_txt'] = 'Já existe um alias ou encaminhamento com este endereço de correio.';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -'; $wb['no_policy'] = '- not enabled -';
$wb['limit_mailbox_txt'] = 'Numarul maxim de MAILBOX pe contul dumneavoastra a fost atins'; $wb['limit_mailbox_txt'] = 'Numarul maxim de MAILBOX pe contul dumneavoastra a fost atins';
$wb['limit_mailquota_txt'] = 'Spatiul maxim pentru MAILBOX a fost atins.Acesta este '; $wb['limit_mailquota_txt'] = 'Spatiul maxim pentru MAILBOX a fost atins.Acesta este ';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Bine ati sosit in contul dumneavoastra';
$wb['welcome_mail_message'] = 'Bine ati sosit la contul de mail. al dumneavoastra webmaster.';
$wb['disableimap_txt'] = 'Blocheaza IMAP'; $wb['disableimap_txt'] = 'Blocheaza IMAP';
$wb['disablepop3_txt'] = 'Blocheaza POP3'; $wb['disablepop3_txt'] = 'Blocheaza POP3';
$wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_txt'] = 'Start on';
......
...@@ -20,15 +20,9 @@ $wb['policy_txt'] = 'Спам-фильтр'; ...@@ -20,15 +20,9 @@ $wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -'; $wb['no_policy'] = '- не включено -';
$wb['limit_mailbox_txt'] = 'Число почтовых ящиков превышено.'; $wb['limit_mailbox_txt'] = 'Число почтовых ящиков превышено.';
$wb['limit_mailquota_txt'] = 'Место под почтовые ящики превышено. Максимально доступно MB'; $wb['limit_mailquota_txt'] = 'Место под почтовые ящики превышено. Максимально доступно MB';
$wb['welcome_mail_subject'] = 'Добро пожаловать в ваш новый счет электронной почты.';
$wb['welcome_mail_message'] = 'Добро пожаловать в ваш новый счет электронной почты.
Ваш вебмастер.';
$wb['password_strength_txt'] = 'Стойкость пароля'; $wb['password_strength_txt'] = 'Стойкость пароля';
$wb['disableimap_txt'] = 'Запретить IMAP'; $wb['disableimap_txt'] = 'Запретить IMAP';
$wb['disablepop3_txt'] = 'Запретить POP3'; $wb['disablepop3_txt'] = 'Запретить POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'info@youdomain.com';
$wb['duplicate_alias_or_forward_txt'] = 'Алиас или пересылка уже существуют для этого адреса.'; $wb['duplicate_alias_or_forward_txt'] = 'Алиас или пересылка уже существуют для этого адреса.';
$wb['quota_error_value'] = 'Неверное значение квоты. Допустимые значения: 0 не ограничено, или число больше 1'; $wb['quota_error_value'] = 'Неверное значение квоты. Допустимые значения: 0 не ограничено, или число больше 1';
$wb['autoresponder_start_date_txt'] = 'Запускать'; $wb['autoresponder_start_date_txt'] = 'Запускать';
......
...@@ -21,14 +21,8 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,14 +21,8 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -'; $wb['no_policy'] = '- not enabled -';
$wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.'; $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
$wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is'; $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
$wb['welcome_mail_subject'] = 'Welcome to your new email account.';
$wb['welcome_mail_message'] = 'Welcome to your new email account.
Your webmaster.';
$wb['disableimap_txt'] = 'Disable IMAP'; $wb['disableimap_txt'] = 'Disable IMAP';
$wb['disablepop3_txt'] = 'Disable POP3'; $wb['disablepop3_txt'] = 'Disable POP3';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.'; $wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
$wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1'; $wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
$wb['autoresponder_start_date_txt'] = 'Start on'; $wb['autoresponder_start_date_txt'] = 'Start on';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nepovolená -'; $wb['no_policy'] = '- nepovolená -';
$wb['limit_mailbox_txt'] = 'Max. počet poštových schránok pre váš účet je dosiahnutý.'; $wb['limit_mailbox_txt'] = 'Max. počet poštových schránok pre váš účet je dosiahnutý.';
$wb['limit_mailquota_txt'] = 'Maximálny priestor pre poštové schránky je dosiahnutý. Max. dostupné miesto v MB je'; $wb['limit_mailquota_txt'] = 'Maximálny priestor pre poštové schránky je dosiahnutý. Max. dostupné miesto v MB je';
$wb['welcome_mail_fromname_txt'] = 'ISPCONFIG 3';
$wb['welcome_mail_fromemail_txt'] = 'webhosting@domain.ltd';
$wb['welcome_mail_subject'] = 'Vitajte na svojom novom e-mailovom konte.';
$wb['welcome_mail_message'] = 'Vitajte na svojom novom e-mailovom konte.';
$wb['disableimap_txt'] = 'Deaktivovať IMAP'; $wb['disableimap_txt'] = 'Deaktivovať IMAP';
$wb['disablepop3_txt'] = 'Deaktivovať POP3'; $wb['disablepop3_txt'] = 'Deaktivovať POP3';
$wb['duplicate_alias_or_forward_txt'] = 'Existuje už alias alebo preposlanie pre túto e-mailovú adresu.'; $wb['duplicate_alias_or_forward_txt'] = 'Existuje už alias alebo preposlanie pre túto e-mailovú adresu.';
......
...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spam filtresi'; ...@@ -21,10 +21,6 @@ $wb['policy_txt'] = 'Spam filtresi';
$wb['no_policy'] = '- aktif değil -'; $wb['no_policy'] = '- aktif değil -';
$wb['limit_mailbox_txt'] = 'Hesabınızdaki mail kutusu limiti sayısına ulaştınız.'; $wb['limit_mailbox_txt'] = 'Hesabınızdaki mail kutusu limiti sayısına ulaştınız.';
$wb['limit_mailquota_txt'] = 'Mail kutunuz için max. alana ulaştınız. Max. kullanılabilir alan MB:'; $wb['limit_mailquota_txt'] = 'Mail kutunuz için max. alana ulaştınız. Max. kullanılabilir alan MB:';
$wb['welcome_mail_fromname_txt'] = 'ISPConfig3';
$wb['welcome_mail_fromemail_txt'] = 'webmaster@localhost.tld';
$wb['welcome_mail_subject'] = 'Yeni email hesabınıza hoşgeldiniz.';
$wb['welcome_mail_message'] = 'Yeni email hesabınıza hoşgeldiniz. Webmaster\ınız...';
$wb['disableimap_txt'] = 'IMAP Devre Dışı'; $wb['disableimap_txt'] = 'IMAP Devre Dışı';
$wb['disablepop3_txt'] = 'POP3 Devre Dışı'; $wb['disablepop3_txt'] = 'POP3 Devre Dışı';
$wb['duplicate_alias_or_forward_txt'] = 'Bu email adresinde alias veya yönlendirme zaten var.'; $wb['duplicate_alias_or_forward_txt'] = 'Bu email adresinde alias veya yönlendirme zaten var.';
......
...@@ -227,55 +227,6 @@ class page_action extends tform_actions { ...@@ -227,55 +227,6 @@ class page_action extends tform_actions {
$domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r')); $domain = $app->db->queryOneRecord("SELECT sys_groupid, server_id FROM mail_domain WHERE domain = '".$app->db->quote($_POST["email_domain"])."' AND ".$app->tform->getAuthSQL('r'));
$app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id); $app->db->query("UPDATE mail_user SET sys_groupid = ".$domain["sys_groupid"]." WHERE mailuser_id = ".$this->id);
// send a welcome email to create the mailbox
// mail($this->dataRecord["email"],$app->tform->wordbook["welcome_mail_subject"],$app->tform->wordbook["welcome_mail_message"]);
/*
// the conversion to iso-8859-1 causes compatibility problems, therefore the transition to utf-8
// tries to detect current charset, and encode subject-header and body from it to ISO-8859-1.
$fromCharset = mb_detect_encoding($app->tform->lng("welcome_mail_subject"));
$iconvPreferences = array("input-charset" => $fromCharset,
"output-charset" => "ISO-8859-1",
"line-length" => 76,
"line-break-chars" => "\n",
"scheme" => "Q");
$welcomeFromName = $app->tform->lng("welcome_mail_fromname_txt");
$welcomeFromEmail = $app->tform->lng("welcome_mail_fromemail_txt");
$mailHeaders = "MIME-Version: 1.0" . "\n";
$mailHeaders .= "Content-type: text/plain; charset=iso-8859-1" . "\n";
$mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
$mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n";
$mailTarget = $this->dataRecord["email"];
$mailSubject = iconv_mime_encode("trimoff", $app->tform->lng("welcome_mail_subject"), $iconvPreferences);
$mailSubject = str_replace("trimoff: ", "", $mailSubject);
$mailBody = iconv ($fromCharset, "ISO-8859-1", $app->tform->lng("welcome_mail_message"));
mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
*/
$welcomeFromName = $app->tform->lng("welcome_mail_fromname_txt");
$welcomeFromEmail = $app->tform->lng("welcome_mail_fromemail_txt");
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('mail');
if(!empty($global_config['admin_mail']))$welcomeFromEmail = $global_config['admin_mail'];
if(!empty($global_config['admin_name']))$welcomeFromName = $global_config['admin_name'];
$mailHeaders = "MIME-Version: 1.0" . "\n";
$mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n";
$mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
$mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n";
$mailTarget = $this->dataRecord["email"];
$mailSubject = "=?utf-8?Q?" . imap_8bit($app->tform->lng("welcome_mail_subject")) . "?=";
$mailBody = $app->tform->lng("welcome_mail_message");
mail($mailTarget, $mailSubject, $mailBody, $mailHeaders);
// Spamfilter policy // Spamfilter policy
$policy_id = intval($this->dataRecord["policy"]); $policy_id = intval($this->dataRecord["policy"]);
if($policy_id > 0) { if($policy_id > 0) {
......
Subject: Welcome to your new email account.
Welcome to your new email account. Your webmaster.
\ No newline at end of file
...@@ -157,6 +157,37 @@ class mail_plugin { ...@@ -157,6 +157,37 @@ class mail_plugin {
$app->log('Set Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG); $app->log('Set Maildir quota: '."su -c 'maildirmake -q ".$data['new']['quota']."S ".escapeshellcmd($data['new']['maildir'])."' ".$mail_config['mailuser_name'],LOGLEVEL_DEBUG);
} }
} }
//* Send the welcome email message
if(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt')) {
$tmp = file($conf['rootpath'].'/conf-custom/mail/welcome_email_'.$conf['language'].'.txt');
} elseif(file_exists($conf['rootpath'].'/conf-custom/mail/welcome_email_en.txt')) {
$tmp = file($conf['rootpath'].'/conf-custom/mail/welcome_email_en.txt');
} elseif(file_exists($conf['rootpath'].'/conf/mail/welcome_email_'.$conf['language'].'.txt')) {
$tmp = file($conf['rootpath'].'/conf/mail/welcome_email_'.$conf['language'].'.txt');
} else {
$tmp = file($conf['rootpath'].'/conf/mail/welcome_email_en.txt');
}
$welcome_mail_subject = trim(substr($tmp[0],8));
unset($tmp[0]);
$welcome_mail_message = trim(implode($tmp));
unset($tmp);
$welcomeFromEmail = $mail_config['admin_mail'];
$welcomeFromName = $mail_config['admin_name'];
$mailHeaders = "MIME-Version: 1.0" . "\n";
$mailHeaders .= "Content-type: text/plain; charset=utf-8" . "\n";
$mailHeaders .= "Content-Transfer-Encoding: 8bit" . "\n";
$mailHeaders .= "From: $welcomeFromName <$welcomeFromEmail>" . "\n";
$mailHeaders .= "Reply-To: <$welcomeFromEmail>" . "\n";
$mailTarget = $data["new"]["email"];
$mailSubject = "=?utf-8?Q?" . imap_8bit($welcome_mail_subject) . "?=";
mail($mailTarget, $mailSubject, $welcome_mail_message, $mailHeaders);
} }
function user_update($event_name,$data) { function user_update($event_name,$data) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment