SF.net SVN: postfixadmin:[1694] trunk

[<chr...@us...>]

Revision: 1694
          http://sourceforge.net/p/postfixadmin/code/1694
Author:   christian_boltz
Date:     2014-10-07 16:11:49 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/config.inc.php
    trunk/languages/bg.lang
    trunk/languages/ca.lang
    trunk/languages/cn.lang
    trunk/languages/cs.lang
    trunk/languages/da.lang
    trunk/languages/de.lang
    trunk/languages/en.lang
    trunk/languages/es.lang
    trunk/languages/et.lang
    trunk/languages/eu.lang
    trunk/languages/fi.lang
    trunk/languages/fo.lang
    trunk/languages/fr.lang
    trunk/languages/hr.lang
    trunk/languages/hu.lang
    trunk/languages/is.lang
    trunk/languages/it.lang
    trunk/languages/ja.lang
    trunk/languages/lt.lang
    trunk/languages/mk.lang
    trunk/languages/nb.lang
    trunk/languages/nl.lang
    trunk/languages/nn.lang
    trunk/languages/pl.lang
    trunk/languages/pt-br.lang
    trunk/languages/ru.lang
    trunk/languages/sk.lang
    trunk/languages/sl.lang
    trunk/languages/sv.lang
    trunk/languages/tr.lang
    trunk/languages/tw.lang
    trunk/model/DomainHandler.php

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/config.inc.php	2014-10-07 16:11:49 UTC (rev 1694)
@@ -317,6 +317,7 @@
 // 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

Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/bg.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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 = неограничени';

Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/ca.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -240,6 +240,7 @@
 $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';

Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/cn.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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 | ..."

Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/cs.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -250,6 +250,7 @@
 $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ě';

Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/da.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -250,6 +250,7 @@
 $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';

Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/de.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -247,6 +247,7 @@
 $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';

Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/en.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -248,6 +248,7 @@
 $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';

Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/es.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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';

Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/et.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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';

Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/eu.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -239,6 +239,7 @@
 $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';

Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/fi.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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';

Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/fo.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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ð';

Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/fr.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -243,6 +243,7 @@
 $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é';

Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/hr.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -240,6 +240,7 @@
 $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';

Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/hu.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -247,6 +247,7 @@
 $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';

Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/is.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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ð';

Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/it.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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';

Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/ja.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -247,6 +247,7 @@
 $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 = 無制限';

Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/lt.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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)';

Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/mk.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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 = неограничено';

Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/nb.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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';

Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/nl.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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';

Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/nn.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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';

Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/pl.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -244,6 +244,7 @@
 $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';

Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/pt-br.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -249,6 +249,7 @@
 $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';

Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/ru.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -249,6 +249,7 @@
 $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 = неограниченное';

Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/sk.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -242,6 +242,7 @@
 $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';

Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/sl.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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';

Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/sv.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -243,6 +243,7 @@
 $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';

Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/tr.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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"?

Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/languages/tw.lang	2014-10-07 16:11:49 UTC (rev 1694)
@@ -241,6 +241,7 @@
 $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 | ..."

Modified: trunk/model/DomainHandler.php
===================================================================
--- trunk/model/DomainHandler.php	2014-10-05 22:09:42 UTC (rev 1693)
+++ trunk/model/DomainHandler.php	2014-10-07 16:11:49 UTC (rev 1694)
@@ -10,18 +10,23 @@
     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;
-       }
-   }
+        }
 
-    # init $this->struct, $this->db_table and $this->id_field
+        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;
+    }
+
     protected function initStruct() {
         # TODO: shorter PALANG labels ;-)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.