mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
Merge remote-tracking branch 'svnexport/master'
This commit is contained in:
commit
6ade796829
37 files changed
+127
-40
No files matched your search
@@ -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
|
||||
-------------------------------------------------
|
||||
|
||||
@@ -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 <mischa at high5 dot net>
|
||||
@@ -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.
|
||||
|
||||
Note: If you are logging to syslog, you can skip this step.
|
||||
|
||||
|
||||
3. Copy the files
|
||||
-----------------
|
||||
3. Install vacation.pl
|
||||
----------------------
|
||||
|
||||
Copy the vacation.pl file to the directory you created above:
|
||||
Create a directory /usr/lib/postfixadmin/ and copy the vacation.pl file to it:
|
||||
|
||||
$ cp vacation.pl <HOME>/vacation.pl
|
||||
$ chown -R vacation:vacation <HOME>
|
||||
$ 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!
|
||||
|
||||
@@ -73,11 +73,11 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
|
||||
|
||||
if (!smtp_mail ($fTo, $smtp_from_email, $fHeaders))
|
||||
{
|
||||
flash_error("<br />" . $PALANG['pSendmail_result_error'] . "<br />");
|
||||
flash_error($PALANG['pSendmail_result_error']);
|
||||
}
|
||||
else
|
||||
{
|
||||
flash_info("<br />" . $PALANG['pSendmail_result_success'] . "<br />");
|
||||
flash_info($PALANG['pSendmail_result_success']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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',
|
||||
@@ -314,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
|
||||
|
||||
@@ -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'] = 'Не мога да открия логовете!';
|
||||
@@ -241,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 = неограничени';
|
||||
|
||||
@@ -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!';
|
||||
@@ -239,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';
|
||||
|
||||
@@ -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'] = '未找到相关的日志!';
|
||||
@@ -240,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 | ..."
|
||||
|
||||
@@ -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!';
|
||||
@@ -249,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ě';
|
||||
|
||||
@@ -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.';
|
||||
@@ -249,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -246,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -247,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -241,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -240,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -238,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -240,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';
|
||||
|
||||
@@ -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!';
|
||||
@@ -240,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ð';
|
||||
|
||||
+3
-1
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
<?php
|
||||
# $Id$
|
||||
//
|
||||
// Language file French
|
||||
@@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'editer alias de domaine ac
|
||||
$PALANG['pViewlog_action_edit_password'] = 'changer le mot de passe';
|
||||
$PALANG['pViewlog_action_create_admin'] = 'créer un admin';
|
||||
$PALANG['pViewlog_action_edit_admin'] = 'modifier un admin';
|
||||
$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX
|
||||
$PALANG['pViewlog_action_edit_vacation'] = 'modifier le répondeur';
|
||||
|
||||
$PALANG['pViewlog_result_error'] = 'Impossible de trouver le journal des événements!';
|
||||
@@ -242,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é';
|
||||
|
||||
@@ -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'] = 'Zapise nije bilo moguče naći!';
|
||||
@@ -239,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';
|
||||
|
||||
@@ -197,6 +197,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active';
|
||||
$PALANG['pViewlog_action_edit_password'] = 'jelszó módosítása';
|
||||
$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'] = 'Nemsikerült megtalálni a napló fájlokat!';
|
||||
@@ -246,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';
|
||||
|
||||
@@ -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'] = 'Get ekki fundið log skráningu!';
|
||||
@@ -240,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ð';
|
||||
|
||||
@@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active';
|
||||
$PALANG['pViewlog_action_edit_password'] = 'cambia password';
|
||||
$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'] = 'Impossibile trovare i file di log!';
|
||||
@@ -241,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';
|
||||
|
||||
@@ -197,6 +197,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active';
|
||||
$PALANG['pViewlog_action_edit_password'] = 'パスワード変更';
|
||||
$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'] = 'ログが見つかりません!';
|
||||
@@ -246,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 = 無制限';
|
||||
|
||||
@@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = '(į)išjungtas srities sin
|
||||
$PALANG['pViewlog_action_edit_password'] = 'pakeistas slaptažodis';
|
||||
$PALANG['pViewlog_action_create_admin'] = 'sukurtas adminas';
|
||||
$PALANG['pViewlog_action_edit_admin'] = 'pakeistas adminas';
|
||||
$PALANG['pViewlog_action_delete_admin'] = 'delete admin'; # XXX
|
||||
$PALANG['pViewlog_action_edit_vacation'] = 'pakeistas atostogų nust.';
|
||||
|
||||
$PALANG['pViewlog_result_error'] = 'Įvykių žurnalas nerastas!';
|
||||
@@ -241,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)';
|
||||
|
||||
@@ -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'] = 'Не можам да ги пронајдам записите!';
|
||||
@@ -241,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 = неограничено';
|
||||
|
||||
@@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'endre aktiv-status på ali
|
||||
$PALANG['pViewlog_action_edit_password'] = 'endre passord';
|
||||
$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'] = 'Finner ikke den aktuelle loggen!';
|
||||
@@ -241,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';
|
||||
|
||||
@@ -194,6 +194,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'status actieve domein alia
|
||||
$PALANG['pViewlog_action_edit_password'] = 'wachtwoord aangepast';
|
||||
$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'] = 'Mislukt om de logs te vinden!';
|
||||
@@ -241,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';
|
||||
|
||||
@@ -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'] = 'Fant ikke loggen!';
|
||||
@@ -240,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';
|
||||
|
||||
@@ -195,6 +195,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edycja statusu aliasu dome
|
||||
$PALANG['pViewlog_action_edit_password'] = 'zmień hasło';
|
||||
$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'] = 'Nie można odszukać logów!';
|
||||
@@ -243,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';
|
||||
|
||||
@@ -199,6 +199,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'habilitar/desabilitar alia
|
||||
$PALANG['pViewlog_action_edit_password'] = 'alterar senha';
|
||||
$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'] = 'Não foi possível encontrar o histórico!';
|
||||
@@ -248,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';
|
||||
|
||||
@@ -199,6 +199,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'изменение акт
|
||||
$PALANG['pViewlog_action_edit_password'] = 'изменение пароля';
|
||||
$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'] = 'Невозможно найти журнал!';
|
||||
@@ -248,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 = неограниченное';
|
||||
|
||||
@@ -193,6 +193,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'zmena aktivity aliasu dom
|
||||
$PALANG['pViewlog_action_edit_password'] = 'zmena 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'] = 'Nepodarilo sa nájsť záznamy!';
|
||||
@@ -241,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';
|
||||
|
||||
@@ -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'] = 'Dnevnikov ni bilo mogoče najti!';
|
||||
@@ -240,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';
|
||||
|
||||
@@ -194,6 +194,7 @@ $PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active';
|
||||
$PALANG['pViewlog_action_edit_password'] = 'ändra lösenord';
|
||||
$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'] = 'Kan inte hitta loggarna!';
|
||||
@@ -242,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';
|
||||
|
||||
@@ -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'] = 'Loglar bulunamýyor!';
|
||||
@@ -240,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"?
|
||||
|
||||
@@ -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'] = '未找到相關的日誌!';
|
||||
@@ -240,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 | ..."
|
||||
|
||||
+17
-8
@@ -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 ;-)
|
||||
|
||||
@@ -104,6 +109,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,
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user