From d80816ad866e77ab6d26c3ce37436eb72d8d21c9 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 28 Sep 2014 10:39:42 +0000 Subject: [PATCH 1/6] DomainHandler: - $CONF[default_aliases] can now use the new domain as alias target http://sourceforge.net/p/postfixadmin/patches/124/ config.inc.php: - update comment for $CONF[default_aliases] git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1690 a1433add-5e2c-0410-b055-b7f2511e0802 --- CHANGELOG.TXT | 1 + config.inc.php | 3 +++ model/DomainHandler.php | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 930cc369..b2193354 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -21,6 +21,7 @@ SVN changes since 3.0 beta1 (2.91) - fix logging (run setup.php to fix old log entries) (bug#317) - fetchmail.php: change error_reporting() to exclude E_NOTICE (bug#322) - fr.lang translation update (patch#123) +- $CONF[default_aliases] can now use the new domain as alias target (patch#124) Version 3.0 beta1 (2.91) - 2014/05/06 - SVN r1670 ------------------------------------------------- diff --git a/config.inc.php b/config.inc.php index 294fefdd..5f7278c5 100644 --- a/config.inc.php +++ b/config.inc.php @@ -180,6 +180,9 @@ $CONF['page_size'] = '10'; // Default Aliases // The default aliases that need to be created for all domains. +// You can specify the target address in two ways: +// a) a full mail address +// b) only a localpart ('postmaster' => 'admin') - the alias target will point to the same domain $CONF['default_aliases'] = array ( 'abuse' => 'abuse@change-this-to-your.domain.tld', 'hostmaster' => 'hostmaster@change-this-to-your.domain.tld', diff --git a/model/DomainHandler.php b/model/DomainHandler.php index 30de0e93..8db77375 100644 --- a/model/DomainHandler.php +++ b/model/DomainHandler.php @@ -104,6 +104,10 @@ class DomainHandler extends PFAHandler { if ($this->new && $this->values['default_aliases']) { foreach (Config::read('default_aliases') as $address=>$goto) { $address = $address . "@" . $this->id; + # if $goto doesn't contain @, let the alias point to the same domain + if(!strstr($goto, '@')) { + $goto = $goto . "@" . $this->id; + } # TODO: use AliasHandler->add instead of writing directly to the alias table $arr = array( 'address' => $address, From 2e6f20a4735fe7db1c80df0c782828ffac8f6370 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 5 Oct 2014 15:33:02 +0000 Subject: [PATCH 2/6] *.lang: - add pViewlog_action_delete_admin (needed to avoid an error when deleting an admin) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1691 a1433add-5e2c-0410-b055-b7f2511e0802 --- languages/bg.lang | 1 + languages/ca.lang | 1 + languages/cn.lang | 1 + languages/cs.lang | 1 + languages/da.lang | 1 + languages/de.lang | 1 + languages/en.lang | 1 + languages/es.lang | 1 + languages/et.lang | 1 + languages/eu.lang | 1 + languages/fi.lang | 1 + languages/fo.lang | 1 + languages/fr.lang | 3 ++- languages/hr.lang | 1 + languages/hu.lang | 1 + languages/is.lang | 1 + languages/it.lang | 1 + languages/ja.lang | 1 + languages/lt.lang | 1 + languages/mk.lang | 1 + languages/nb.lang | 1 + languages/nl.lang | 1 + languages/nn.lang | 1 + languages/pl.lang | 1 + languages/pt-br.lang | 1 + languages/ru.lang | 1 + languages/sk.lang | 1 + languages/sl.lang | 1 + languages/sv.lang | 1 + languages/tr.lang | 1 + languages/tw.lang | 1 + 31 files changed, 32 insertions(+), 1 deletion(-) diff --git a/languages/bg.lang b/languages/bg.lang index 3c61feb7..771e6f3b 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Не мога да открия логовете!'; diff --git a/languages/ca.lang b/languages/ca.lang index 0c5ae994..0309f035 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -191,6 +191,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Imposible trobar els logs!'; diff --git a/languages/cn.lang b/languages/cn.lang index 12f8024a..e9631226 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -192,6 +192,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = '未找到相关的日志!'; diff --git a/languages/cs.lang b/languages/cs.lang index 48b6d276..7cbb0b08 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -200,6 +200,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'změna hesla'; $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Nepodařilo se najít záznamy!'; diff --git a/languages/da.lang b/languages/da.lang index c6466a15..39dda5eb 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -200,6 +200,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'ændr domæne-alias status $PALANG['pViewlog_action_edit_password'] = 'ændr adgangskode'; $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Loggen kan ikke findes.'; diff --git a/languages/de.lang b/languages/de.lang index 7574b855..747dc872 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -197,6 +197,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'Alias-Domain Aktiv bearbei $PALANG['pViewlog_action_edit_password'] = 'Passwort ändern'; $PALANG['pViewlog_action_create_admin'] = 'Admin erstellen'; $PALANG['pViewlog_action_edit_admin'] = 'Admin ändern'; +$PALANG['pViewlog_action_delete_admin'] = 'Admin löschen'; $PALANG['pViewlog_action_edit_vacation'] = 'Automatische Antwort ändern'; $PALANG['pViewlog_result_error'] = 'Kann keine Einträge finden!'; diff --git a/languages/en.lang b/languages/en.lang index bb6e5b9b..06902397 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -198,6 +198,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; $PALANG['pViewlog_action_create_admin'] = 'create admin'; $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; $PALANG['pViewlog_result_error'] = 'Unable to find the logs!'; diff --git a/languages/es.lang b/languages/es.lang index 7a7da710..7debc670 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'editar alias de dominio ac $PALANG['pViewlog_action_edit_password'] = 'cambiar contraseña'; $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = '¡Imposible encontrar los logs!'; diff --git a/languages/et.lang b/languages/et.lang index 13f9975a..5d8a3f71 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -192,6 +192,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Logi ei leitud!'; diff --git a/languages/eu.lang b/languages/eu.lang index 987e4445..c0891327 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -190,6 +190,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Ezinezkoa logak aurkitzea!'; diff --git a/languages/fi.lang b/languages/fi.lang index 4efba378..b71c5473 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -192,6 +192,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'muokkaa aktiivista alias d $PALANG['pViewlog_action_edit_password'] = 'vaihda salasana'; $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Lokeja ei löydy!'; diff --git a/languages/fo.lang b/languages/fo.lang index a6fea4a5..3f29fce1 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -192,6 +192,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; $PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX $PALANG['pViewlog_action_create_admin'] = 'create admin'; # XXX $PALANG['pViewlog_action_edit_admin'] = 'edit admin'; # XXX +$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX $PALANG['pViewlog_action_edit_vacation'] = 'edit vacation'; # XXX $PALANG['pViewlog_result_error'] = 'Finni ikki loggarnar!'; diff --git a/languages/fr.lang b/languages/fr.lang index f4386ff5..1dad659b 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -1,4 +1,4 @@ - Date: Sun, 5 Oct 2014 21:45:45 +0000 Subject: [PATCH 3/6] VIRTUAL_VACATION/INSTALL.TXT: - change instructions to use /usr/lib/postfixadmin to avoid vacation.pl has write access to itsself - replace instructions for /var/spool/vacation/ with instructions for a log file or directory - various other changes git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1692 a1433add-5e2c-0410-b055-b7f2511e0802 --- VIRTUAL_VACATION/INSTALL.TXT | 58 +++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/VIRTUAL_VACATION/INSTALL.TXT b/VIRTUAL_VACATION/INSTALL.TXT index e8ab73d0..c7046a9e 100644 --- a/VIRTUAL_VACATION/INSTALL.TXT +++ b/VIRTUAL_VACATION/INSTALL.TXT @@ -1,6 +1,6 @@ -################################################## -# Virtual Vacation for Postfix Admin Release 2.x # -################################################## +###################################### +# Virtual Vacation for Postfix Admin # +###################################### # # Postfix Admin (Virtual Vacation) # Originally authored by Mischa Peters @@ -38,6 +38,7 @@ Install Virtual Vacation 1. Create a local account ------------------------- + Create a dedicated local user account called "vacation". This user handles all potentially dangerous mail content - that is why it should be a separate account. @@ -46,6 +47,8 @@ Do not use "nobody", and most certainly do not use "root" or "postfix". The user will never log in, and can be given a "*" password and non-existent shell and home directory. +Also create a separate "vacation" group. + This should look like this: #/etc/passwd @@ -55,24 +58,30 @@ vacation:*:65501:65501:Virtual Vacation:/nonexistent:/sbin/nologin vacation:*:65501: -2. Create a directory ---------------------- -Create a directory, for example /var/spool/vacation, that is accessible -only to the "vacation" user. This is where the vacation script is supposed -to store its temporary files. +2. Create a log directory or log file +------------------------------------- + +If you want to log to a file ($log_to_file), create a log directory or an +empty log file. +This file or directory needs to be writeable for the "vacation" user. -3. Copy the files ------------------ +Note: If you are logging to syslog, you can skip this step. -Copy the vacation.pl file to the directory you created above: - $ cp vacation.pl /vacation.pl - $ chown -R vacation:vacation +3. Install vacation.pl +---------------------- + +Create a directory /usr/lib/postfixadmin/ and copy the vacation.pl file to it: + + $ mkdir /usr/lib/postfixadmin + $ cp vacation.pl /usr/lib/postfixadmin/vacation.pl + $ chown -R root:vacation /usr/lib/postfixadmin + $ chmod 750 /usr/lib/postfixadmin/ /usr/lib/postfixadmin/vacation.pl Which will then look something like: --rwx------ 1 vacation vacation 3356 Dec 21 00:00 vacation.pl* +-rwxr-x--- 1 root vacation 3356 Dec 21 00:00 vacation.pl* 4. Setup the transport type @@ -81,7 +90,7 @@ Define the transport type in the Postfix master file: #/etc/postfix/master.cf: vacation unix - n n - - pipe - flags=Rq user=vacation argv=/var/spool/vacation/vacation.pl -f ${sender} -- ${recipient} + flags=Rq user=vacation argv=/usr/lib/postfixadmin/vacation.pl -f ${sender} -- ${recipient} 5. Setup the transport maps file -------------------------------- @@ -124,14 +133,20 @@ file. You can do this in two ways: -a) edit vacation.pl directly +a) edit vacation.pl directly (not recommended!) -b) create /etc/mail/postfixadmin/vacation.conf and enter your settings there +b) create /etc/postfixadmin/vacation.conf and enter your settings there Just use perl syntax there to fill the config variables listed in vacation.pl (without the "our" keyword). Example: $db_username = 'mail'; + To make sure nobody except vacation.pl can read your vacation.conf (including the + database password), run + + $ chown root:vacation /etc/postfixadmin/vacation.conf + $ chmod 640 /etc/postfixadmin/vacation.conf + 7. Check the alias expansion ---------------------------- @@ -141,7 +156,7 @@ your postfix master.cf file. This is especially the case if you are also using A another content filtering system when mail is re-injected into Postfix using the smtpd daemon. If you are, it's likely that alias expansion may happen more than once, in which case you -may see vacation-style responses duplicated. To suppress this behaviour, you need to add : +may see vacation-style responses duplicated. To suppress this behaviour, you need to add: -o receive_override_options=no_address_mappings @@ -186,9 +201,10 @@ joeuser#something.com@autoreply.yourdomain.com vacation.pl then checks the database to see wether a user is on holiday and what message to send back. Make sure that vacation.pl is able to communicate -to your database. In the first couple of lines you have to specify the -database, username and password for it. -NOTE: Make sure that the path to perl is correct. +to your database. You have to specify the database, username and password for +it as described in the "Configure vacation.pl" section. + +NOTE: Make sure that the path to perl in vacation.pl is correct. I'm in trouble! From b30292c4202db2271a16c36735defab79f7f6c50 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 5 Oct 2014 22:09:42 +0000 Subject: [PATCH 4/6] MailboxHandler.php: - storemore(): - fix undefined variable if creating subfolders fails (bug#328) - remove some outdated TODO notes - create_mailbox_subfolders(): add $this->id to error_log git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1693 a1433add-5e2c-0410-b055-b7f2511e0802 --- model/MailboxHandler.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index d2335eae..2cce7521 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -247,12 +247,7 @@ class MailboxHandler extends PFAHandler { } if ( !$this->create_mailbox_subfolders() ) { - # TODO: implement $tShowpass - $this->infomsg[] = Config::lang_f('pCreate_mailbox_result_succes_nosubfolders', "$fUsername$tShowpass"); - } else { # everything ok - # TODO: implement $tShowpass - # $this->infomsg[] = Config::lang_f('pCreate_mailbox_result_success'], "$fUsername$tShowpass"); - # TODO: currently edit.php displays the default success message from webformConfig + $this->infomsg[] = Config::lang_f('pCreate_mailbox_result_succes_nosubfolders', $this->id); } } else { # edit mode @@ -659,7 +654,7 @@ class MailboxHandler extends PFAHandler { $i=@imap_open($s, $this->id, $this->values['password']); if (FALSE==$i) { - error_log('Could not log into IMAP/POP server: '.imap_last_error()); + error_log('Could not log into IMAP/POP server: ' . $this->id . ': ' . imap_last_error()); return FALSE; } @@ -668,7 +663,7 @@ class MailboxHandler extends PFAHandler { $f='{'.$s_host.'}'.$s_prefix.$f; $res=imap_createmailbox($i,$f); if (!$res) { - error_log('Could not create IMAP folder $f: '.imap_last_error()); + error_log('Could not create IMAP folder $f: ' . $this->id . ': ' . imap_last_error()); @imap_close($i); return FALSE; } From fb4af233afc4ad9879e8c510ca7052b9ab532a00 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Tue, 7 Oct 2014 16:11:49 +0000 Subject: [PATCH 5/6] config.inc.php: - add note that $CONF[vacation_domain] can't be used for "normal" mails model/DomainHandler.php: - validate_new_id(): - error out when trying to add $CONF[vacation_domain] - some whitespace fixes - remove superfluous comment on initStruct() *.lang: - add 'domain_conflict_vacation_domain' error message git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1694 a1433add-5e2c-0410-b055-b7f2511e0802 --- config.inc.php | 1 + languages/bg.lang | 1 + languages/ca.lang | 1 + languages/cn.lang | 1 + languages/cs.lang | 1 + languages/da.lang | 1 + languages/de.lang | 1 + languages/en.lang | 1 + languages/es.lang | 1 + languages/et.lang | 1 + languages/eu.lang | 1 + languages/fi.lang | 1 + languages/fo.lang | 1 + languages/fr.lang | 1 + languages/hr.lang | 1 + languages/hu.lang | 1 + languages/is.lang | 1 + languages/it.lang | 1 + languages/ja.lang | 1 + languages/lt.lang | 1 + languages/mk.lang | 1 + languages/nb.lang | 1 + languages/nl.lang | 1 + languages/nn.lang | 1 + languages/pl.lang | 1 + languages/pt-br.lang | 1 + languages/ru.lang | 1 + languages/sk.lang | 1 + languages/sl.lang | 1 + languages/sv.lang | 1 + languages/tr.lang | 1 + languages/tw.lang | 1 + model/DomainHandler.php | 21 +++++++++++++-------- 33 files changed, 45 insertions(+), 8 deletions(-) diff --git a/config.inc.php b/config.inc.php index 5f7278c5..7dd1b132 100644 --- a/config.inc.php +++ b/config.inc.php @@ -317,6 +317,7 @@ $CONF['vacation'] = 'NO'; // This is the autoreply domain that you will need to set in your Postfix // transport maps to handle virtual vacations. It does not need to be a // real domain (i.e. you don't need to setup DNS for it). +// This domain must exclusively be used for vacation. Do NOT use it for "normal" mail addresses. $CONF['vacation_domain'] = 'autoreply.change-this-to-your.domain.tld'; // Vacation Control diff --git a/languages/bg.lang b/languages/bg.lang index 771e6f3b..9ae2037c 100644 --- a/languages/bg.lang +++ b/languages/bg.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн'; $PALANG['pAdminEdit_domain_aliases_text'] = '0 = изключени | -1 = неограничени'; diff --git a/languages/ca.lang b/languages/ca.lang index 0309f035..e64d479d 100644 --- a/languages/ca.lang +++ b/languages/ca.lang @@ -240,6 +240,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ilimitat | 0 = deshabilitar'; diff --git a/languages/cn.lang b/languages/cn.lang index e9631226..327b5212 100644 --- a/languages/cn.lang +++ b/languages/cn.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = '修改域'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 禁止 | 0 = 无限制'; # XXX check / compare with pAdminCreate_domain_aliases_text - should be "-1 = disable | ..." diff --git a/languages/cs.lang b/languages/cs.lang index 7cbb0b08..4e1d4883 100644 --- a/languages/cs.lang +++ b/languages/cs.lang @@ -250,6 +250,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = znepřístupnit | 0 = neomezeně'; diff --git a/languages/da.lang b/languages/da.lang index 39dda5eb..9d8f0688 100644 --- a/languages/da.lang +++ b/languages/da.lang @@ -250,6 +250,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Domæne-aliaset kunne ikke slettes!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Redigér et domæne'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = annullér | 0 = uendeligt'; diff --git a/languages/de.lang b/languages/de.lang index 747dc872..5ff5bcd8 100644 --- a/languages/de.lang +++ b/languages/de.lang @@ -247,6 +247,7 @@ $PALANG['mailbox_postdel_failed'] = 'Fehler beim Ausführen des mailbox postdele $PALANG['mailbox_postedit_failed'] = 'Fehler beim Ausführen des mailbox postedit-Scripts, überprüfen Sie das Error-Log für Details!'; $PALANG['mailbox_postcreate_failed'] = 'Fehler beim Ausführen des mailbox postcreate-Scripts, überprüfen Sie das Error-Log für Details!'; $PALANG['pAdminDelete_alias_domain_error'] = 'Alias-Domain konnte nicht gelöscht werden!'; +$PALANG['domain_conflict_vacation_domain'] = 'Sie können die Vacation-Domain nicht als Maildomain benutzen!'; $PALANG['pAdminEdit_domain_welcome'] = 'Domain bearbeiten'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ausschalten | 0 = kein Limit'; diff --git a/languages/en.lang b/languages/en.lang index 06902397..542817da 100644 --- a/languages/en.lang +++ b/languages/en.lang @@ -248,6 +248,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; $PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = disable | 0 = unlimited'; diff --git a/languages/es.lang b/languages/es.lang index 7debc670..ccc01038 100644 --- a/languages/es.lang +++ b/languages/es.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deshabilitar | 0 = ilimitado'; diff --git a/languages/et.lang b/languages/et.lang index 5d8a3f71..5c643fd8 100644 --- a/languages/et.lang +++ b/languages/et.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = keelatud | 0 = piiramatult'; diff --git a/languages/eu.lang b/languages/eu.lang index c0891327..9c1aee6e 100644 --- a/languages/eu.lang +++ b/languages/eu.lang @@ -239,6 +239,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = desegokitu | 0 = mugagabea'; diff --git a/languages/fi.lang b/languages/fi.lang index b71c5473..ea8def4e 100644 --- a/languages/fi.lang +++ b/languages/fi.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = ei käytössä | 0 = rajoittamaton'; diff --git a/languages/fo.lang b/languages/fo.lang index 3f29fce1..80c86da7 100644 --- a/languages/fo.lang +++ b/languages/fo.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Broyt navnaøki'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = óvirkja | 0 = óavmarkað'; diff --git a/languages/fr.lang b/languages/fr.lang index 1dad659b..a7ba035e 100644 --- a/languages/fr.lang +++ b/languages/fr.lang @@ -243,6 +243,7 @@ $PALANG['mailbox_postdel_failed'] = 'Le script postdeletion du compte courriel a $PALANG['mailbox_postedit_failed'] = 'Le script postedit du compte courriel a échoué, consultez la log!'; $PALANG['mailbox_postcreate_failed'] = 'Le script postcreate du compte courriel a échoué, consultez la log!'; $PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimé cet alias de domaine!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = désactivé | 0 = illimité'; diff --git a/languages/hr.lang b/languages/hr.lang index a6a5dd4c..41c2b3f8 100644 --- a/languages/hr.lang +++ b/languages/hr.lang @@ -240,6 +240,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Uredi domenu'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = onemogući | 0 = bezgranično'; diff --git a/languages/hu.lang b/languages/hu.lang index 919ba3e8..9fb21f99 100644 --- a/languages/hu.lang +++ b/languages/hu.lang @@ -247,6 +247,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = kikapcsol | 0 = végtelen'; diff --git a/languages/is.lang b/languages/is.lang index 0b7c16a8..1aa9f087 100644 --- a/languages/is.lang +++ b/languages/is.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Breyta léni'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = óvirkt | 0 = ótakmarkað'; diff --git a/languages/it.lang b/languages/it.lang index 516a3b60..0b69ad8d 100644 --- a/languages/it.lang +++ b/languages/it.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = disabilita | 0 = illimitati'; diff --git a/languages/ja.lang b/languages/ja.lang index 3e8171f2..47415a15 100644 --- a/languages/ja.lang +++ b/languages/ja.lang @@ -247,6 +247,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'ドメインの修正'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 無効 | 0 = 無制限'; diff --git a/languages/lt.lang b/languages/lt.lang index 8c0c05c2..1256381f 100644 --- a/languages/lt.lang +++ b/languages/lt.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Nepavyko panaikinti srities sinonimo!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Keisti sritį'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = išjungta(s) | 0 = neribota(s)'; diff --git a/languages/mk.lang b/languages/mk.lang index ff307d67..5d6c3f64 100644 --- a/languages/mk.lang +++ b/languages/mk.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Измена на домен'; $PALANG['pAdminEdit_domain_aliases_text'] = '0 = забрането | -1 = неограничено'; diff --git a/languages/nb.lang b/languages/nb.lang index 4e1c1209..5c306979 100644 --- a/languages/nb.lang +++ b/languages/nb.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Kunne ikke fjerne domenealias!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deaktiver | 0 = ubegrenset'; diff --git a/languages/nl.lang b/languages/nl.lang index 065cdf93..48b57983 100644 --- a/languages/nl.lang +++ b/languages/nl.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = uit | 0 = onbeperkt'; diff --git a/languages/nn.lang b/languages/nn.lang index ad54db6d..39adbe75 100644 --- a/languages/nn.lang +++ b/languages/nn.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Endre domenet'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deaktivere | 0 = ubegrenset'; diff --git a/languages/pl.lang b/languages/pl.lang index 3d732720..798cf439 100644 --- a/languages/pl.lang +++ b/languages/pl.lang @@ -244,6 +244,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Nie można usunąć aliasu domeny!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = wyłączone | 0 = bez limitów'; diff --git a/languages/pt-br.lang b/languages/pt-br.lang index ff226d82..d4815954 100644 --- a/languages/pt-br.lang +++ b/languages/pt-br.lang @@ -249,6 +249,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Não foi possível remover o alias de domínio!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = desativar | 0 = ilimitado'; diff --git a/languages/ru.lang b/languages/ru.lang index 69a2d4d4..99853619 100644 --- a/languages/ru.lang +++ b/languages/ru.lang @@ -249,6 +249,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Невозможно удалить домен-алиас!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Редактирование домена'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = отключить | 0 = неограниченное'; diff --git a/languages/sk.lang b/languages/sk.lang index b25d6f1a..98098240 100644 --- a/languages/sk.lang +++ b/languages/sk.lang @@ -242,6 +242,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Nepodario sa odstrániť alias domény!'; +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = zakázať | 0 = neobmedzene'; diff --git a/languages/sl.lang b/languages/sl.lang index 437119da..ba5d02b3 100644 --- a/languages/sl.lang +++ b/languages/sl.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Uredi domeno'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = onemogoči | 0 = neomejeno'; diff --git a/languages/sv.lang b/languages/sv.lang index 012b77d1..136099f2 100644 --- a/languages/sv.lang +++ b/languages/sv.lang @@ -243,6 +243,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = avaktivera | 0 = obegränsat'; diff --git a/languages/tr.lang b/languages/tr.lang index 1ec9e267..4c1be7c6 100644 --- a/languages/tr.lang +++ b/languages/tr.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = 'Domain düzenle'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = iptal | 0 = limitsiz'; # XXX check - "limisiz" or "limi_t_siz"? diff --git a/languages/tw.lang b/languages/tw.lang index 10f7f7ab..00ace3d6 100644 --- a/languages/tw.lang +++ b/languages/tw.lang @@ -241,6 +241,7 @@ $PALANG['mailbox_postdel_failed'] = 'The mailbox postdeletion script failed, che $PALANG['mailbox_postedit_failed'] = 'The mailbox postedit script failed, check the error log for details!'; # XXX $PALANG['mailbox_postcreate_failed'] = 'The mailbox postcreate script failed, check the error log for details!'; # XXX $PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX +$PALANG['domain_conflict_vacation_domain'] = 'You can\'t use the vacation domain as mail domain!'; # XXX $PALANG['pAdminEdit_domain_welcome'] = '修改網域'; $PALANG['pAdminEdit_domain_aliases_text'] = '-1 = 禁止 | 0 = 無限制'; # XXX check / compare with pAdminCreate_domain_aliases_text - should be "-1 = disable | ..." diff --git a/model/DomainHandler.php b/model/DomainHandler.php index 8db77375..f13dfeb6 100644 --- a/model/DomainHandler.php +++ b/model/DomainHandler.php @@ -10,18 +10,23 @@ class DomainHandler extends PFAHandler { protected $id_field = 'domain'; protected $domain_field = 'domain'; - protected function validate_new_id() { - $domain_check = check_domain($this->id); + protected function validate_new_id() { + $domain_check = check_domain($this->id); - if ($domain_check == '') { - return true; - } else { + if ($domain_check != '') { $this->errormsg[$this->id_field] = $domain_check; return false; - } - } + } + + if (Config::read('vacation_domain') == $this->id) { + $this->errormsg[$this->id_field] = Config::Lang('domain_conflict_vacation_domain'); + return false; + } + + # still here? good. + return true; + } - # init $this->struct, $this->db_table and $this->id_field protected function initStruct() { # TODO: shorter PALANG labels ;-) From 06c1125e19f8db877dc8b56208259eb0946d4849 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Thu, 9 Oct 2014 11:56:10 +0000 Subject: [PATCH 6/6] broadcast-message.php: - remove raw HTML ("
") from flash_info()/flash_error() calls git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1695 a1433add-5e2c-0410-b055-b7f2511e0802 --- broadcast-message.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/broadcast-message.php b/broadcast-message.php index 0b60ddd4..0487658a 100644 --- a/broadcast-message.php +++ b/broadcast-message.php @@ -73,11 +73,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST") if (!smtp_mail ($fTo, $smtp_from_email, $fHeaders)) { - flash_error("
" . $PALANG['pSendmail_result_error'] . "
"); + flash_error($PALANG['pSendmail_result_error']); } else { - flash_info("
" . $PALANG['pSendmail_result_success'] . "
"); + flash_info($PALANG['pSendmail_result_success']); } } }