postfixadmin-svn Mailing List for PostfixAdmin (Page 106)
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
postfixadmin-svn — Postfix Admin SVN commit messages - READ ONLY!
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
(63) |
Nov
(79) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(15) |
Feb
(8) |
Mar
(8) |
Apr
(44) |
May
(18) |
Jun
(20) |
Jul
(35) |
Aug
(21) |
Sep
(8) |
Oct
(9) |
Nov
(21) |
Dec
(14) |
| 2009 |
Jan
(53) |
Feb
(13) |
Mar
(36) |
Apr
(40) |
May
(22) |
Jun
(10) |
Jul
(18) |
Aug
(18) |
Sep
(7) |
Oct
(26) |
Nov
(32) |
Dec
(13) |
| 2010 |
Jan
(6) |
Feb
(7) |
Mar
(12) |
Apr
(2) |
May
(12) |
Jun
(8) |
Jul
(9) |
Aug
(12) |
Sep
(12) |
Oct
(7) |
Nov
(9) |
Dec
(42) |
| 2011 |
Jan
(10) |
Feb
(35) |
Mar
(43) |
Apr
(39) |
May
(8) |
Jun
(8) |
Jul
(83) |
Aug
(20) |
Sep
(20) |
Oct
(63) |
Nov
(33) |
Dec
(20) |
| 2012 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
(37) |
May
(16) |
Jun
(7) |
Jul
(3) |
Aug
|
Sep
|
Oct
(3) |
Nov
(1) |
Dec
(4) |
| 2013 |
Jan
(6) |
Feb
(16) |
Mar
(9) |
Apr
(11) |
May
(9) |
Jun
(30) |
Jul
(17) |
Aug
(6) |
Sep
(2) |
Oct
(30) |
Nov
(41) |
Dec
(26) |
| 2014 |
Jan
(16) |
Feb
(20) |
Mar
(5) |
Apr
(4) |
May
(14) |
Jun
(4) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(18) |
Nov
(26) |
Dec
|
| 2015 |
Jan
(4) |
Feb
(9) |
Mar
(12) |
Apr
(26) |
May
(3) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
(15) |
Oct
(13) |
Nov
|
Dec
(1) |
| 2016 |
Jan
(1) |
Feb
(5) |
Mar
(4) |
Apr
(3) |
May
(19) |
Jun
|
Jul
|
Aug
(3) |
Sep
(16) |
Oct
(4) |
Nov
(5) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
(8) |
Mar
|
Apr
(7) |
May
(3) |
Jun
(16) |
Jul
(13) |
Aug
(16) |
Sep
(6) |
Oct
(4) |
Nov
(10) |
Dec
(7) |
| 2018 |
Jan
(16) |
Feb
(17) |
Mar
(11) |
Apr
(13) |
May
(20) |
Jun
(3) |
Jul
(10) |
Aug
|
Sep
(3) |
Oct
(1) |
Nov
(6) |
Dec
(18) |
| 2019 |
Jan
(18) |
Feb
(31) |
Mar
(4) |
Apr
(4) |
May
(1) |
Jun
(8) |
Jul
(7) |
Aug
(10) |
Sep
(23) |
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2020 |
Jan
(10) |
Feb
(18) |
Mar
(34) |
Apr
(19) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(10) |
Sep
(16) |
Oct
(6) |
Nov
(3) |
Dec
(11) |
| 2021 |
Jan
(118) |
Feb
(22) |
Mar
(13) |
Apr
(12) |
May
(48) |
Jun
(21) |
Jul
(17) |
Aug
(12) |
Sep
(19) |
Oct
(25) |
Nov
(16) |
Dec
(7) |
| 2022 |
Jan
(6) |
Feb
(7) |
Mar
(14) |
Apr
(4) |
May
|
Jun
(16) |
Jul
(18) |
Aug
(5) |
Sep
(12) |
Oct
(8) |
Nov
(10) |
Dec
(13) |
| 2023 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
(1) |
May
(2) |
Jun
(6) |
Jul
(3) |
Aug
(3) |
Sep
(3) |
Oct
(2) |
Nov
(7) |
Dec
(13) |
| 2024 |
Jan
(8) |
Feb
(6) |
Mar
(5) |
Apr
(10) |
May
(8) |
Jun
(6) |
Jul
(2) |
Aug
(1) |
Sep
(2) |
Oct
(4) |
Nov
(15) |
Dec
(10) |
| 2025 |
Jan
(3) |
Feb
(12) |
Mar
(3) |
Apr
(7) |
May
(18) |
Jun
(10) |
Jul
(10) |
Aug
(6) |
Sep
(16) |
Oct
(6) |
Nov
(2) |
Dec
|
|
From: <Gin...@us...> - 2008-06-17 20:56:56
|
Revision: 383
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=383&view=rev
Author: GingerDog
Date: 2008-06-17 13:56:56 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
changesets 367, 369, 370 merged from trunk
Modified Paths:
--------------
branches/postfixadmin-2.2.1/create-mailbox.php
branches/postfixadmin-2.2.1/functions.inc.php
branches/postfixadmin-2.2.1/setup.php
Modified: branches/postfixadmin-2.2.1/create-mailbox.php
===================================================================
--- branches/postfixadmin-2.2.1/create-mailbox.php 2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/create-mailbox.php 2008-06-17 20:56:56 UTC (rev 383)
@@ -278,13 +278,6 @@
*/
$tDomain = $fDomain;
- if (create_mailbox_subfolders($fUsername,$fPassword))
- {
- $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
- } else {
- $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
- }
-
if ($CONF['generate_password'] == "YES")
{
$tMessage .= " / $fPassword)</br />";
@@ -326,7 +319,15 @@
$tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
}
}
+
+ if (create_mailbox_subfolders($fUsername,$fPassword))
+ {
+ $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
+ } else {
+ $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
}
+
+ }
}
}
Modified: branches/postfixadmin-2.2.1/functions.inc.php
===================================================================
--- branches/postfixadmin-2.2.1/functions.inc.php 2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/functions.inc.php 2008-06-17 20:56:56 UTC (rev 383)
@@ -1886,6 +1886,8 @@
$s='{'.$s_host.$s_port.$s_options.'}';
+ sleep(1); # give the mail triggering the mailbox creation a chance to do its job
+
$i=@imap_open($s,$login,$cleartext_password);
if (FALSE==$i)
{
Modified: branches/postfixadmin-2.2.1/setup.php
===================================================================
--- branches/postfixadmin-2.2.1/setup.php 2008-06-17 20:44:30 UTC (rev 382)
+++ branches/postfixadmin-2.2.1/setup.php 2008-06-17 20:56:56 UTC (rev 383)
@@ -80,7 +80,9 @@
}
else
{
- print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())<br />(Ignore this warning if you use another webserver software.)</b></li>\n";
+ # not running on Apache.
+ # However postfixadmin _is_ running, so obviously we are on a supported webserver ;-))
+ # No need to confuse the user with a warning.
}
print "</ul>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-06-17 20:44:22
|
Revision: 382
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=382&view=rev
Author: GingerDog
Date: 2008-06-17 13:44:30 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
changesets 357 to 362 merged; changesets 363 to 365 merged
Modified Paths:
--------------
branches/postfixadmin-2.2.1/backup.php
branches/postfixadmin-2.2.1/config.inc.php
branches/postfixadmin-2.2.1/languages/bg.lang
branches/postfixadmin-2.2.1/languages/ca.lang
branches/postfixadmin-2.2.1/languages/cn.lang
branches/postfixadmin-2.2.1/languages/cs.lang
branches/postfixadmin-2.2.1/languages/da.lang
branches/postfixadmin-2.2.1/languages/de.lang
branches/postfixadmin-2.2.1/languages/es.lang
branches/postfixadmin-2.2.1/languages/et.lang
branches/postfixadmin-2.2.1/languages/eu.lang
branches/postfixadmin-2.2.1/languages/fi.lang
branches/postfixadmin-2.2.1/languages/fo.lang
branches/postfixadmin-2.2.1/languages/fr.lang
branches/postfixadmin-2.2.1/languages/hr.lang
branches/postfixadmin-2.2.1/languages/hu.lang
branches/postfixadmin-2.2.1/languages/is.lang
branches/postfixadmin-2.2.1/languages/it.lang
branches/postfixadmin-2.2.1/languages/ja.lang
branches/postfixadmin-2.2.1/languages/language-update.sh
branches/postfixadmin-2.2.1/languages/language.php
branches/postfixadmin-2.2.1/languages/lt.lang
branches/postfixadmin-2.2.1/languages/mk.lang
branches/postfixadmin-2.2.1/languages/nl.lang
branches/postfixadmin-2.2.1/languages/nn.lang
branches/postfixadmin-2.2.1/languages/pl.lang
branches/postfixadmin-2.2.1/languages/pt-br.lang
branches/postfixadmin-2.2.1/languages/ru.lang
branches/postfixadmin-2.2.1/languages/sk.lang
branches/postfixadmin-2.2.1/languages/sl.lang
branches/postfixadmin-2.2.1/languages/sv.lang
branches/postfixadmin-2.2.1/languages/tr.lang
branches/postfixadmin-2.2.1/languages/tw.lang
branches/postfixadmin-2.2.1/templates/header.php
Added Paths:
-----------
branches/postfixadmin-2.2.1/languages/nb.lang
Modified: branches/postfixadmin-2.2.1/backup.php
===================================================================
--- branches/postfixadmin-2.2.1/backup.php 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/backup.php 2008-06-17 20:44:30 UTC (rev 382)
@@ -72,8 +72,19 @@
{
fwrite ($fh, $header);
- $tables = array('admin','alias','config','domain','domain_admins','log','mailbox','vacation','vacation_notification');
- # TODO: also backup fetchmail table
+ $tables = array(
+ 'admin',
+ 'alias',
+ 'alias_domain',
+ 'config',
+ 'domain',
+ 'domain_admins',
+ 'fetchmail',
+ 'log',
+ 'mailbox',
+ 'vacation',
+ 'vacation_notification'
+ );
for ($i = 0 ; $i < sizeof ($tables) ; ++$i)
{
Modified: branches/postfixadmin-2.2.1/config.inc.php
===================================================================
--- branches/postfixadmin-2.2.1/config.inc.php 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/config.inc.php 2008-06-17 20:44:30 UTC (rev 382)
@@ -49,7 +49,7 @@
// pgsql = PostgreSQL
$CONF['database_type'] = 'mysql';
$CONF['database_host'] = 'localhost';
-$CONF['database_user'] = 'postfixadmin';
+$CONF['database_user'] = 'postfix';
$CONF['database_password'] = 'postfixadmin';
$CONF['database_name'] = 'postfix';
$CONF['database_prefix'] = '';
@@ -59,6 +59,7 @@
$CONF['database_tables'] = array (
'admin' => 'admin',
'alias' => 'alias',
+ 'alias_domain' => 'alias_domain',
'config' => 'config',
'domain' => 'domain',
'domain_admins' => 'domain_admins',
Modified: branches/postfixadmin-2.2.1/languages/bg.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/bg.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/bg.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ïðåãëåä';
$PALANG['pMenu_create_alias'] = 'Ñúçäàé íîâ Alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Ñúçäàé íîâà ïîùåíñêà êóòèÿ';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Èçïðàòè Email';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top';
$PALANG['pOverview_right_arrow'] = 'Next Page';
$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
$PALANG['pOverview_button'] = 'Íàïðåä';
$PALANG['pOverview_welcome'] = 'Ïðåãëåä íà ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias-è';
$PALANG['pOverview_alias_mailbox_count'] = 'Ïîùåíñêè êóòèè';
$PALANG['pOverview_alias_address'] = 'Îò';
$PALANG['pOverview_alias_goto'] = 'Äî';
$PALANG['pOverview_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Å-ìåéë';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = 'Äîìåéí';
$PALANG['pOverview_get_aliases'] = 'Alias-è';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Ïîùåíñêè êóòèè';
$PALANG['pOverview_get_quota'] = 'Îáåì íà ïîùåíñêàòà êóòèÿ (MB)';
$PALANG['pOverview_get_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø! ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Ñúçäàé íîâ alias çà âàøèÿ äîìåéí.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Íå ñòå âúâåëè íèùî â ïîëåòî Êúì</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Å-ìåéë àäðåñà, êîéòî ñòå âúâåëè íå å âàëèäåí: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
$PALANG['pEdit_alias_button'] = 'Ðåäàêòèðàé Alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Íàïðåä';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ äîìåéíà!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Äîìåéíà áå äîáàâåí óñïåøíî!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Ðåäàêòèðàíå íà äîìåéí';
$PALANG['pAdminEdit_domain_domain'] = 'Äîìåéí';
Modified: branches/postfixadmin-2.2.1/languages/ca.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/ca.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/ca.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resum';
$PALANG['pMenu_create_alias'] = 'Afegir àlies';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Afegir bústia';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Ves';
$PALANG['pOverview_welcome'] = 'Resum de ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Àlies';
$PALANG['pOverview_alias_mailbox_count'] = 'Bústies';
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destí';
$PALANG['pOverview_alias_modified'] = 'Última modificació';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Domini';
$PALANG['pOverview_get_aliases'] = 'Àlies';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Bústies';
$PALANG['pOverview_get_quota'] = 'Quota de bústia (MB)';
$PALANG['pOverview_get_modified'] = 'Última Modificació';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Aquest domini no et pertany ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.';
$PALANG['pCreate_alias_address'] = 'Àlies';
@@ -104,6 +123,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No has introduït res al destí</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">L\'adreça d\'e-mail introduida no és vàlida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Aquest domini no et pertany: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Editar àlies';
@@ -173,9 +193,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ves';
@@ -252,6 +275,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Imposible afegir el domini!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
$PALANG['pAdminEdit_domain_domain'] = 'Domini';
Modified: branches/postfixadmin-2.2.1/languages/cn.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/cn.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/cn.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = '概览';
$PALANG['pMenu_create_alias'] = '新建别名';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = '新建邮箱';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = '发送邮件';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = '返回顶端';
$PALANG['pOverview_right_arrow'] = '下一页';
$PALANG['pOverview_left_arrow'] = '上一页';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: 别名';
$PALANG['pOverview_mailbox_title'] = ':: 邮箱';
$PALANG['pOverview_button'] = '执行';
$PALANG['pOverview_welcome'] = '浏览 ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = '别名';
$PALANG['pOverview_alias_mailbox_count'] = '邮箱';
$PALANG['pOverview_alias_address'] = '前往';
$PALANG['pOverview_alias_goto'] = '转到';
$PALANG['pOverview_alias_modified'] = '最后修改日期';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = '邮件地址';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = '域';
$PALANG['pOverview_get_aliases'] = '别名';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = '邮箱';
$PALANG['pOverview_get_quota'] = '邮箱限制 (MB)';
$PALANG['pOverview_get_modified'] = '最后修改日期';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">你没有该域的管理权限';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.';
$PALANG['pCreate_alias_address'] = '别名';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">你没有填写收信人</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">邮件地址非法: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">你没有该域的管理权限: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = '编辑别名';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '执行';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增域失败!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '新增域成功!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改域';
$PALANG['pAdminEdit_domain_domain'] = '域名';
Modified: branches/postfixadmin-2.2.1/languages/cs.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/cs.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/cs.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -34,6 +34,7 @@
$PALANG['pMenu_main'] = 'Hlavní';
$PALANG['pMenu_overview'] = 'Přehled';
$PALANG['pMenu_create_alias'] = 'Přidat přesměrování';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Přidat schránku';
$PALANG['pMenu_fetchmail'] = 'Stahování pošty';
$PALANG['pMenu_sendmail'] = 'Poslat email';
@@ -56,16 +57,21 @@
$PALANG['pOverview_up_arrow'] = 'Na Začátek';
$PALANG['pOverview_right_arrow'] = 'Další Stránka';
$PALANG['pOverview_left_arrow'] = 'Předchozí Stránka';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Přesměrování';
$PALANG['pOverview_mailbox_title'] = ':: Schránky';
$PALANG['pOverview_button'] = 'Přejít';
$PALANG['pOverview_welcome'] = 'Přehled domény ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Přesměrování';
$PALANG['pOverview_alias_mailbox_count'] = 'Schránek';
$PALANG['pOverview_alias_address'] = 'Od';
$PALANG['pOverview_alias_goto'] = 'Pro';
$PALANG['pOverview_alias_modified'] = 'Naposledy změněno';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktivní';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Přesměrování';
$PALANG['and_x_more'] = '[a %s dalších...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -78,6 +84,7 @@
$PALANG['pOverview_get_domain'] = 'Doména';
$PALANG['pOverview_get_aliases'] = 'Přesměrování';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Schránky';
$PALANG['pOverview_get_quota'] = 'Místo pro schránku (MB)';
$PALANG['pOverview_get_modified'] = 'Naposledy změněno';
@@ -86,7 +93,19 @@
$PALANG['pDelete_delete_success'] = '%s odstraněn.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nelze odstranit schránku ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tato doména není vaše ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nelze odstranit přesměrování ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.';
$PALANG['pCreate_alias_address'] = 'Přesměrování';
@@ -110,6 +129,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nezadali jste cíl</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Emailová adresa kterou jste zadali není platná: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Tato doména není vaše: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Doručovat i do schránky.';
$PALANG['pEdit_alias_forward_only'] = 'Přesměrovat pouze na dané adresy.';
$PALANG['pEdit_alias_button'] = 'Upravit';
@@ -182,9 +202,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'úprava schránky';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'změna stavu schránky';
$PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'změna hesla';
$PALANG['pViewlog_button'] = 'Jít';
@@ -262,6 +285,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodařilo se odstranit doménu!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
$PALANG['pAdminEdit_domain_domain'] = 'Doména';
Modified: branches/postfixadmin-2.2.1/languages/da.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/da.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/da.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -31,6 +31,7 @@
$PALANG['pMenu_main'] = 'Start';
$PALANG['pMenu_overview'] = 'Oversigt';
$PALANG['pMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
$PALANG['pMenu_fetchmail'] = 'Hent email';
$PALANG['pMenu_sendmail'] = 'Send email';
@@ -53,16 +54,21 @@
$PALANG['pOverview_up_arrow'] = 'Gå til top';
$PALANG['pOverview_right_arrow'] = 'Næste side';
$PALANG['pOverview_left_arrow'] = 'Foregående side';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Postbokse';
$PALANG['pOverview_button'] = 'Vis';
$PALANG['pOverview_welcome'] = 'Oversigt for ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias';
$PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
$PALANG['pOverview_alias_address'] = 'Alias';
$PALANG['pOverview_alias_goto'] = 'Modtager';
$PALANG['pOverview_alias_modified'] = 'Senest ændret';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktiveret';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[og %s til...]';
$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
@@ -76,6 +82,7 @@
$PALANG['pOverview_get_domain'] = 'Domæne';
$PALANG['pOverview_get_aliases'] = 'Alias';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postbokse';
$PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';
$PALANG['pOverview_get_modified'] = 'Senest ændret';
@@ -84,7 +91,19 @@
$PALANG['pDelete_delete_success'] = '%s er slettet.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -108,6 +127,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.';
$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.';
$PALANG['pEdit_alias_button'] = 'Ret alias';
@@ -180,9 +200,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv';
$PALANG['pViewlog_action_create_alias'] = 'tilføj alias';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
$PALANG['pViewlog_action_edit_alias_state'] = 'ændre alias aktiv';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode';
$PALANG['pViewlog_button'] = 'Vis';
@@ -260,6 +283,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
Modified: branches/postfixadmin-2.2.1/languages/de.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/de.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/de.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -31,6 +31,7 @@
$PALANG['pMenu_main'] = 'Startseite';
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf';
$PALANG['pMenu_sendmail'] = 'Email versenden';
@@ -53,16 +54,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top';
$PALANG['pOverview_right_arrow'] = 'Nächste Seite';
$PALANG['pOverview_left_arrow'] = 'Vorherige Seite';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
$PALANG['pOverview_button'] = 'Los';
$PALANG['pOverview_welcome'] = 'Überblick über ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliase';
$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxen';
$PALANG['pOverview_alias_address'] = 'Von';
$PALANG['pOverview_alias_goto'] = 'An';
$PALANG['pOverview_alias_modified'] = 'Zuletzt verändert';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktiv';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[und %s weitere...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -75,6 +81,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliases';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
$PALANG['pOverview_get_modified'] = 'Zuletzt verändert';
@@ -83,7 +90,19 @@
$PALANG['pDelete_delete_success'] = '%s gelöscht.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Mailbox konnte nicht gelöscht werden ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -107,6 +126,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Sie haben im "To"-Feld nichts angegeben!</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Die angegebene eMail-Adresse ist nicht korrekt: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Mail in der lokalen Mailbox ablegen.';
$PALANG['pEdit_alias_forward_only'] = 'Nur zur angegebenen Adresse weiterleiten.';
$PALANG['pEdit_alias_button'] = 'Alias ändern';
@@ -179,9 +199,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bearbeiten';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'Mailbox Aktiv bearbeiten';
$PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'Alias löschen';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
$PALANG['pViewlog_button'] = 'Los';
@@ -259,6 +282,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
Modified: branches/postfixadmin-2.2.1/languages/es.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/es.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/es.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resumen';
$PALANG['pMenu_create_alias'] = 'Añadir alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Añadir buzón';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Ir';
$PALANG['pOverview_welcome'] = 'Resumen de ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias'; # XXX
$PALANG['pOverview_alias_mailbox_count'] = 'Buzones';
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destino';
$PALANG['pOverview_alias_modified'] = 'Última modificación';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Dominio';
$PALANG['pOverview_get_aliases'] = 'Alias';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Buzones';
$PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)';
$PALANG['pOverview_get_modified'] = 'Última Modificación';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Este dominio no le pertenece ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -104,6 +123,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No ha introducido nada en el destino</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">La dirección de e-mail introducida no es válida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Este dominio no le pertenece: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Editar alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
$PALANG['pAdminEdit_domain_domain'] = 'Dominio';
Modified: branches/postfixadmin-2.2.1/languages/et.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/et.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/et.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ülevaade';
$PALANG['pMenu_create_alias'] = 'Lisa alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Lisa postkast';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Saada kiri';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = 'Mine üles';
$PALANG['pOverview_right_arrow'] = 'Järgmine leht';
$PALANG['pOverview_left_arrow'] = 'Eelmine leht';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Postkastid';
$PALANG['pOverview_button'] = 'Mine';
$PALANG['pOverview_welcome'] = 'Ülevaade domeenist: ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliasi';
$PALANG['pOverview_alias_mailbox_count'] = 'Postkaste';
$PALANG['pOverview_alias_address'] = 'Kellelt';
$PALANG['pOverview_alias_goto'] = 'Kellele';
$PALANG['pOverview_alias_modified'] = 'Viimati muudetud';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = 'Domeen';
$PALANG['pOverview_get_aliases'] = 'Aliased';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postkastid';
$PALANG['pOverview_get_quota'] = 'Postkasti kettaruumi piirang (MB)';
$PALANG['pOverview_get_modified'] = 'Viimati muudetud';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Puuduvad õigused. Domeen: ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Loo uus alias domeenis.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Kellele väli on tühi.</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Sisestatud e/posti aadress pole kehtiv: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Puuduvad õigused. Domeen: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Muuda alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Mine';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domeeni lisamine ebaõnnestus!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni';
$PALANG['pAdminEdit_domain_domain'] = 'Domeen';
Modified: branches/postfixadmin-2.2.1/languages/eu.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/eu.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/eu.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Laburpena';
$PALANG['pMenu_create_alias'] = 'Aliasa gehitu';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Postontzia gehitu';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'e-maila bidali';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Joan';
$PALANG['pOverview_welcome'] = 'Laburpena ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliasa';
$PALANG['pOverview_alias_mailbox_count'] = 'Postontziak';
$PALANG['pOverview_alias_address'] = 'Igorlea';
$PALANG['pOverview_alias_goto'] = 'Norakoa';
$PALANG['pOverview_alias_modified'] = 'Azken aldaketa';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Domeinua';
$PALANG['pOverview_get_aliases'] = 'Aliasa';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postontziak';
$PALANG['pOverview_get_quota'] = 'Postontzi kuota (MB)';
$PALANG['pOverview_get_modified'] = 'Azken aldaketa';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ez zara domeinu honen jabe';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Domeinuarentzat alias berri bat sortu.';
$PALANG['pCreate_alias_address'] = 'Aliasa';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">ALIASa okerra da!</span>';
@@ -103,6 +122,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Norakoan ez duzu ezer jarri</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Sartutako e-mail helbidea baliiogabekoa da: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ez zara domeinu honen jabe: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Aliasa aldatu';
@@ -172,9 +192,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Joan';
@@ -251,6 +274,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Ezinezkoa domeinua gehitzea!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu';
$PALANG['pAdminEdit_domain_domain'] = 'Domeinua';
Modified: branches/postfixadmin-2.2.1/languages/fi.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/fi.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/fi.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -32,6 +32,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Yleisnäkymä';
$PALANG['pMenu_create_alias'] = 'Lisää alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Lisää postilaatikko';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Lähetä postia';
@@ -54,16 +55,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Siirry';
$PALANG['pOverview_welcome'] = 'Yleisnäkymä ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliakset';
$PALANG['pOverview_alias_mailbox_count'] = 'Postilaatikot';
$PALANG['pOverview_alias_address'] = 'Keneltä';
$PALANG['pOverview_alias_goto'] = 'Kenelle';
$PALANG['pOverview_alias_modified'] = 'Viimeksi muokattu';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Sähköposti';
@@ -76,6 +82,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliakset';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postilaatikot';
$PALANG['pOverview_get_quota'] = 'Postilaatikon kiintiö (MB)';
$PALANG['pOverview_get_modified'] = 'Viimeksi muokattu';
@@ -84,7 +91,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Luo uusi alias.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -107,6 +126,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Et kirjoitanut mitään Kenelle: -riville</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Antamasi sähköpostiosoite ei ole oikean muotoinen: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Muokkaa aliasta';
@@ -176,9 +196,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Siirry';
@@ -255,6 +278,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domainin lisäys ei onnistunut!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
Modified: branches/postfixadmin-2.2.1/languages/fo.lang
===================================================================
--- branches/postfixadmin-2.2.1/languages/fo.lang 2008-06-17 20:36:37 UTC (rev 381)
+++ branches/postfixadmin-2.2.1/languages/fo.lang 2008-06-17 20:44:30 UTC (rev 382)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = ...
[truncated message content] |
|
From: <Gin...@us...> - 2008-06-17 20:36:48
|
Revision: 381
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=381&view=rev
Author: GingerDog
Date: 2008-06-17 13:36:37 -0700 (Tue, 17 Jun 2008)
Log Message:
-----------
begin the 2.2.1 branch
Added Paths:
-----------
branches/postfixadmin-2.2.1/
Copied: branches/postfixadmin-2.2.1 (from rev 380, tags/postfixadmin-2.2.0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gin...@us...> - 2008-06-16 09:30:10
|
Revision: 380
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=380&view=rev
Author: gingerdog
Date: 2008-06-16 02:30:00 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
add link to postfixadmin/roundcube thing
Modified Paths:
--------------
website/index.php
Modified: website/index.php
===================================================================
--- website/index.php 2008-06-10 22:34:25 UTC (rev 379)
+++ website/index.php 2008-06-16 09:30:00 UTC (rev 380)
@@ -16,47 +16,34 @@
<h3>Community</h3>
<ul>
-<li><a href="http://sourceforge.net/forum/forum.php?forum_id=676076">Postfixadmin Discussion Forum</a></li>
-<li><a href="http://sourceforge.net/mail/?group_id=191583">Mailing lists</a></li>
-<li>IRC - #postfixadmin on irc.freenode.net </li>
+ <li><a href="http://sourceforge.net/forum/forum.php?forum_id=676076">Postfixadmin Discussion Forum</a></li>
+ <li><a href="http://sourceforge.net/mail/?group_id=191583">Mailing lists</a></li>
+ <li>IRC - #postfixadmin on irc.freenode.net </li>
</ul>
<h3>Requirements</h3>
<ul>
<li><a href="http://www.postfix.org">Postfix</a> (success has been reported with Exim!)</li>
<li><a href="http://mysql.org">MySQL</a> or <a href="http://postgresql.org">PostgreSQL</a></li>
- <li><a href="http://php.net">PHP</a></li>
- <li>And presumably a compatible IMAP/POP3 server (dovecot, courier or cyrus?)</li>
+ <li><a href="http://php.net">PHP</a> v4 or v5 should both work</li>
+ <li>And presumably a compatible IMAP/POP3 server (dovecot and courier seem to be the most popular)</li>
</ul>
-<h3>Download - Nearly stable release</h3>
+<h3>Download - version 2.2.0</h3>
-<p>We've created a .deb and .rpm packages to try and make installation easier. </p>
-<p>RPM packages for Fedora and openSUSE are available via openSUSE buildservice and usually contain the latest Subversion version.</p>
-<p>This should be judged as being a <b>snapshot</b>, and although it <u>should work</u> - it may not - or some features may be lacking suitable documentation.</p>
-<p>As this is based on the development branch, it's setup is slightly different from that for v2.1.0; but you should be able to figure that out when you visit http://yoursever/postfixadmin after installing it. Note, the .deb does not setup your database in any useful way - so you'll need to do this manually (see /usr/share/doc/postfixadmin)</p>
+<p>v2.2.0 was released in April 2008. It is the latest version and we'd recommend users of previous versions upgrade.</p>
-<p><a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300">GingerDog's experimental .deb</a> for installation</p>
-<p><a href="http://software.opensuse.org/search?q=postfixadmin">RPM packages for openSUSE and Fedora</a> (usually latest Subversion revision).</p>
+<p>v2.2.0 includes more language translations, support for fetchmail, a better upgrade procedure, improved vacation support, UTF8 support, broadcast message and many bug fixes.</p>
-<h3>Download - Previous stable release</h3>
+<p>You can download the software <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300">here</a>, with the 2.2.0 release we also provide a .deb package (and there are <a href=""http://software.opensuse.org/search?q=postfixadmin">RPM packages elsewhere</a>) to hopefully make installation somewhat easier.</p>
-<p>Note: This version is pretty much unsupported; you are strongly encouraged to use one of the newer builds off the 2.2 development cycle.</p>
-<p>If you still want to use it, try <a href="http://sourceforge.net/project/showfiles.php?group_id=191583&package_id=225300&release_id=495972">here</a></p>
-
<h3>Download - Development/Subversion release</h3>
-<p>The development team expected the codebase in Subversion to become 2.2.0 before the end of 2007. Suffice to say, they're not very good at estimating release dates, but as of April 2008, they think 2.2.0rc4 is probably pretty close to the final release.</p>
+<p>Since release of v2.2.0, not much has happened (yet). If you wish to live on the edge and run from Subversion, feel free to do so. You may occassionally experience breakage, and we'd suggest you join the IRC channel before 'svn update'ing any important installations.</p>
-<p>We would recommend that all new users use one of the 2.2.0rc releases, or run from Subversion. Use of v2.1.0 will probably cause you unnecessary headaches. </p>
-
-
-<p>You can download the source code to Postfixadmin using Subversion :</p>
-
<code>svn co https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin postfixadmin</code>
-
<h3>Upgrading Postfixadmin</h3>
<p>The database schema between version 2.1.0 and anything later has changed in a number of ways, you should therefore run the 'upgrade.php' script which should take care of all database changes between revisions. </p>
@@ -65,10 +52,11 @@
<ul>
<li><a href="http://squirrelmail-postfixadmin.palepurple.co.uk">Postfixadmin/Squirrelmail plugin</a> - Integrate together <A href="http://squirrelmail.org">Squirrelmail</a> with Postfixadmin</a></li>
-<li><a href="http://codepoets.co.uk/postfixadmin-postgresql-courier-squirrelmail-debian-etch-howto-tutorial@">Guide to installation on Etch with PostgreSQL and Courier</a></li>
+<li><a href="http://nejc.skoberne.net/rcpfa">Postfixadmin/Roundcube plugin</a> - Integrate together <A href="http://roundcube.net">RoundCube</a> with Postfixadmin</a></li>
+<li><a href="http://codepoets.co.uk/postfixadmin-postgresql-courier-squirrelmail-debian-etch-howto-tutorial">Guide to installation on Etch with PostgreSQL and Courier</a></li>
</ul>
-(If you would like to add links to any other relevant projects, please poke GingerDog on irc)
+(If you would like to add links to any other relevant projects or documentation, please poke GingerDog on irc)
<?php
require_once('footer.php');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-06-10 22:34:21
|
Revision: 379
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=379&view=rev
Author: christian_boltz
Date: 2008-06-10 15:34:25 -0700 (Tue, 10 Jun 2008)
Log Message:
-----------
setup.php:
- check if imap_open is available. If not, print a warning.
This was indirectly ;-) requested in
https://sourceforge.net/forum/forum.php?thread_id=2071718&forum_id=676076
Modified Paths:
--------------
trunk/setup.php
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2008-06-08 15:57:49 UTC (rev 378)
+++ trunk/setup.php 2008-06-10 22:34:25 UTC (rev 379)
@@ -52,6 +52,7 @@
$f_session_start = function_exists ("session_start");
$f_preg_match = function_exists ("preg_match");
$f_mb_encode_mimeheader = function_exists ("mb_encode_mimeheader");
+$f_imap_open = function_exists ("imap_open");
$file_config = file_exists (realpath ("./config.inc.php"));
@@ -263,6 +264,27 @@
$error =+ 1;
}
+
+//
+// Imap functions
+//
+if ( $f_imap_open == 1)
+{
+ print "<li>Depends on: IMAP functions - OK</li>\n";
+}
+else
+{
+ print "<li><b>Warning: Depends on: IMAP functions - NOT FOUND</b><br />\n";
+ print "To install IMAP support, install php$phpversion-imap<br />\n";
+ print "Without IMAP support, you won't be able to create subfolders when creating mailboxes.</li>\n";
+# $error =+ 1;
+}
+
+
+
+
+
+
print "</ul>";
if ($error != 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-06-08 15:57:41
|
Revision: 378
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=378&view=rev
Author: GingerDog
Date: 2008-06-08 08:57:49 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
templates: add @ signs to make it more obvious what the user should type in when creating aliases/mailboxes; thanks to Kurushiyama on irc
Modified Paths:
--------------
trunk/templates/create-alias.php
trunk/templates/create-mailbox.php
Modified: trunk/templates/create-alias.php
===================================================================
--- trunk/templates/create-alias.php 2008-06-08 15:29:44 UTC (rev 377)
+++ trunk/templates/create-alias.php 2008-06-08 15:57:49 UTC (rev 378)
@@ -8,7 +8,7 @@
<tr>
<td><?php print $PALANG['pCreate_alias_address']; ?></td>
<td><input class="flat" type="text" name="fAddress" value="<?php print $tAddress; ?>" /></td>
- <td>
+ <td>@
<select class="flat" name="fDomain">
<?php
for ($i = 0; $i < sizeof ($list_domains); $i++)
Modified: trunk/templates/create-mailbox.php
===================================================================
--- trunk/templates/create-mailbox.php 2008-06-08 15:29:44 UTC (rev 377)
+++ trunk/templates/create-mailbox.php 2008-06-08 15:57:49 UTC (rev 378)
@@ -8,7 +8,7 @@
<tr>
<td><?php print $PALANG['pCreate_mailbox_username'] . ":"; ?></td>
<td><input class="flat" type="text" name="fUsername" value="<?php print $tUsername; ?>" autocomplete="off"/></td>
- <td>
+ <td>@
<select name="fDomain">
<?php
for ($i = 0; $i < sizeof ($list_domains); $i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-06-08 15:29:37
|
Revision: 377
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=377&view=rev
Author: GingerDog
Date: 2008-06-08 08:29:44 -0700 (Sun, 08 Jun 2008)
Log Message:
-----------
config.inc.php: doc fix from Kurushiyama via IRC
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-05-27 18:43:08 UTC (rev 376)
+++ trunk/config.inc.php 2008-06-08 15:29:44 UTC (rev 377)
@@ -238,7 +238,7 @@
Welcome to your new account.
EOM;
-// When creating mailboxes, check that the domain-part of the
+// When creating mailboxes or aliases, check that the domain-part of the
// address is legal by performing a name server look-up.
$CONF['emailcheck_resolve_domain']='YES';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-27 18:43:10
|
Revision: 376
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=376&view=rev
Author: christian_boltz
Date: 2008-05-27 11:43:08 -0700 (Tue, 27 May 2008)
Log Message:
-----------
nl.lang:
- updated by Johan Hendriks (sylhouette)
https://sourceforge.net/tracker/?func=detail&atid=937966&aid=1974742&group_id=191583
Modified Paths:
--------------
trunk/languages/nl.lang
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2008-05-26 21:12:47 UTC (rev 375)
+++ trunk/languages/nl.lang 2008-05-27 18:43:08 UTC (rev 376)
@@ -30,7 +30,7 @@
$PALANG['pMenu_main'] = 'Start';
$PALANG['pMenu_overview'] = 'Overzicht';
$PALANG['pMenu_create_alias'] = 'Alias toevoegen';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
+$PALANG['pMenu_create_alias_domain'] = 'Domein alias toevoegen';
$PALANG['pMenu_create_mailbox'] = 'Mailbox toevoegen';
$PALANG['pMenu_fetchmail'] = 'Externe email ophalen';
$PALANG['pMenu_sendmail'] = 'Verstuur E-mail';
@@ -53,21 +53,21 @@
$PALANG['pOverview_up_arrow'] = 'Naar Boven';
$PALANG['pOverview_right_arrow'] = 'Volgende Pagina';
$PALANG['pOverview_left_arrow'] = 'Vorige Pagina';
-$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domein aliasen';
$PALANG['pOverview_alias_title'] = ':: Alias';
-$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
+$PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
$PALANG['pOverview_button'] = 'Ga';
$PALANG['pOverview_welcome'] = 'Overzicht voor ';
-$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias domeinen';
+$PALANG['pOverview_alias_domain_target'] = '%s is een alias voor domein:';
$PALANG['pOverview_alias_alias_count'] = 'Aliasen';
$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes';
$PALANG['pOverview_alias_address'] = 'Van';
$PALANG['pOverview_alias_goto'] = 'Naar';
$PALANG['pOverview_alias_modified'] = 'Laatst Bewerkt';
-$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
+$PALANG['pOverview_alias_domain_modified'] = 'Laatst Bewerkt';
$PALANG['pOverview_alias_active'] = 'Actief';
-$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Actief';
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[en %s meer...]';
$PALANG['pOverview_mailbox_username'] = 'e-mail';
@@ -80,8 +80,8 @@
$PALANG['pOverview_get_domain'] = 'Domein';
$PALANG['pOverview_get_aliases'] = 'Aliassen';
-$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Mailboxes';
+$PALANG['pOverview_get_alias_domains'] = 'Domein aliasen';
+$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
$PALANG['pOverview_get_modified'] = 'Laatst bewerkt';
@@ -89,23 +89,23 @@
$PALANG['pDelete_delete_success'] = '%s verwijdert.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Niet in staat mailbox te verwijderen ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dit is niet uw domein ';
-$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Dit is niet uw domein ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Niet in staat alias te verwijderen ';
-$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
-$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
-$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
-$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
-$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
-$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
-$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
-$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Spiegel een van uw domeinen naar een ander domein.';
+$PALANG['pCreate_alias_domain_alias'] = 'Alias domein';
+$PALANG['pCreate_alias_domain_alias_text'] = 'Het domein waar mail voor binnen komt.';
+$PALANG['pCreate_alias_domain_target'] = 'Doel domein';
+$PALANG['pCreate_alias_domain_target_text'] = 'Domein waar de mail naar toe moet.';
+$PALANG['pCreate_alias_domain_active'] = 'Actief';
+$PALANG['pCreate_alias_domain_button'] = 'Voeg alias domein toe';
+$PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.';
+$PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!';
+$PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database.';
+$PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel!';
$PALANG['pCreate_alias_welcome'] = 'Maak een nieuw alias aan voor uw domein.';
$PALANG['pCreate_alias_address'] = 'Alias';
-$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">De ALIAS is niet geldig!</span>';
+$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">De Alias is niet geldig!</span>';
$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Dit e-mail aders bestaat al, kies aub een andere.</span>';
$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">U bezit het maximum aantal aliassen.</span>';
$PALANG['pCreate_alias_goto'] = 'Naar';
@@ -125,7 +125,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">U heeft geen Naar opgegeven.</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Het e-mail adres wat u opgaf is niet geldig: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dit domein is niet van u: ';
-$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Niet in staat de domein alias te bewerken!</span>';
$PALANG['pEdit_alias_forward_and_store'] = 'Lever af op de lokale mailbox.';
$PALANG['pEdit_alias_forward_only'] = 'Alleen op opgegeven email adres afleveren.';
$PALANG['pEdit_alias_button'] = 'Bewerk Alias';
@@ -195,12 +195,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bewerkt';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'status actieve mailbox bewerkt';
$PALANG['pViewlog_action_create_alias'] = 'alias toegevoegd';
-$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'maak domein alias';
$PALANG['pViewlog_action_delete_alias'] = 'alias verwijdert';
-$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'verwijder alias domein';
$PALANG['pViewlog_action_edit_alias'] = 'alias bewerkt';
$PALANG['pViewlog_action_edit_alias_state'] = 'status actieve alias bewerkt';
-$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'status actieve domein alias bewerkt';
$PALANG['pViewlog_action_edit_password'] = 'wachtwoord aangepast';
$PALANG['pViewlog_button'] = 'Ga';
@@ -214,8 +214,8 @@
$PALANG['pSendmail_subject_text'] = 'Welkom';
$PALANG['pSendmail_body'] = 'Inhoud';
$PALANG['pSendmail_button'] = 'Verstuur bericht';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Mislukt om mailbox te maken!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span>
-$PALANG['pSendmail_result_success'] = 'De mailbox is aangemaakt.'; # XXX text change - new: Email sent!
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Mislukt om mail te versturen!</span>';
+$PALANG['pSendmail_result_success'] = 'E-mail verstuurd!';
$PALANG['pAdminMenu_list_admin'] = 'Beheerders overzicht';
$PALANG['pAdminMenu_list_domain'] = 'Domein overzicht';
@@ -277,7 +277,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Mislukt om het domein toe te voegen.</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domein is toegevoegd!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Niet in staat domein te verwijderen!</span>';
-$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Niet in staat domein alias te verwijderen!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein';
$PALANG['pAdminEdit_domain_domain'] = 'Domein';
@@ -367,8 +367,8 @@
$PALANG['pBroadcast_subject'] = 'Onderwerp';
$PALANG['pBroadcast_message'] = 'Bericht';
$PALANG['pBroadcast_send'] = 'Verzend bericht';
-$PALANG['pBroadcast_success'] = 'Uw broadcast bericht is verzonden.';
-$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast bericht'; # XXX partly translated
+$PALANG['pBroadcast_success'] = 'Uw algemene bericht is verzonden.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Algemeen bericht';
$PALANG['pBroadcast_error_empty'] = 'De velden Naam, Onderwerp en Bericht mogen niet leeg zijn !';
$PALANG['pStatus_undeliverable'] = 'Misschien niet af te leveren ';
$PALANG['pStatus_custom'] = 'Bezorgen op ';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-26 21:12:44
|
Revision: 375
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=375&view=rev
Author: christian_boltz
Date: 2008-05-26 14:12:47 -0700 (Mon, 26 May 2008)
Log Message:
-----------
upgrade.php:
- only include common.php if POSTFIXADMIN is not define()d
Avoids a "already defined" warning in setup.php
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-05-26 21:05:51 UTC (rev 374)
+++ trunk/upgrade.php 2008-05-26 21:12:47 UTC (rev 375)
@@ -1,5 +1,7 @@
<?php
-require_once('common.php');
+if(!defined('POSTFIXADMIN')) {
+ require_once('common.php');
+}
// vim ts=4:sw=4:et
# Note: run with upgrade.php?debug=1 to see all SQL error messages
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-26 21:05:47
|
Revision: 374
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=374&view=rev
Author: christian_boltz
Date: 2008-05-26 14:05:51 -0700 (Mon, 26 May 2008)
Log Message:
-----------
upgrade.php
- upgrade_373_mysql: change domain.description and mailbox.name to utf-8
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1972703&group_id=191583
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-05-25 21:19:58 UTC (rev 373)
+++ trunk/upgrade.php 2008-05-26 21:05:51 UTC (rev 374)
@@ -953,3 +953,22 @@
db_query_parsed("CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)");
db_query_parsed("COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'");
}
+
+/**
+ * Change description fields to UTF-8
+ */
+function upgrade_373_mysql() { # MySQL only
+ $table_domain = table_by_key ('domain');
+ $table_mailbox = table_by_key('mailbox');
+
+ $all_sql = split("\n", trim("
+ ALTER TABLE `$table_domain` CHANGE `description` `description` VARCHAR( 255 ) {UTF-8} NOT NULL
+ ALTER TABLE `$table_mailbox` CHANGE `name` `name` VARCHAR( 255 ) {UTF-8} NOT NULL
+ "));
+
+ foreach ($all_sql as $sql) {
+ $result = db_query_parsed($sql);
+ }
+}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-25 21:19:50
|
Revision: 373
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=373&view=rev
Author: christian_boltz
Date: 2008-05-25 14:19:58 -0700 (Sun, 25 May 2008)
Log Message:
-----------
Applied patch from Michiel van Baak (mvanbaak)
https://sourceforge.net/tracker/index.php?func=detail&aid=1923030&group_id=191583&atid=937966
- added quota parameter in mailbox_postcreation() hook
- new hook to update the quota after editing a mailbox
Modifications to the patch:
- made $quota an required parameter in the mailbox_postedit and
mailbox_postcreation functions
- the scripts always get the quota as 4th parameter. In case $quota
is <= 0, it is set to 0.
config.inc.php:
- new option $CONF['mailbox_postedit_script']
edit-mailbox.php:
- call mailbox_postedit() after editing the mailbox
functions.inc.php:
- added $quota parameter to mailbox_postcreation()
- new function mailbox_postedit()
create-mailbox.php:
- added $quota parameter on mailbox_postcreation() call
Modified Paths:
--------------
trunk/config.inc.php
trunk/create-mailbox.php
trunk/edit-mailbox.php
trunk/functions.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-05-25 20:49:40 UTC (rev 372)
+++ trunk/config.inc.php 2008-05-25 21:19:58 UTC (rev 373)
@@ -282,6 +282,13 @@
// $CONF['mailbox_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postcreation.sh';
// Optional:
+// Script to run after alteration of mailboxes.
+// Note that this may fail if PHP is run in "safe mode", or if
+// operating system features (such as SELinux) or limitations
+// prevent the web-server from executing external scripts.
+// $CONF['mailbox_postedit_script']='sudo -u courier /usr/local/bin/postfixadmin-mailbox-postedit.sh';
+
+// Optional:
// Script to run after deletion of mailboxes.
// Note that this may fail if PHP is run in "safe mode", or if
// operating system features (such as SELinux) or limitations
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-05-25 20:49:40 UTC (rev 372)
+++ trunk/create-mailbox.php 2008-05-25 21:19:58 UTC (rev 373)
@@ -263,7 +263,7 @@
*/
$result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
- if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir))
+ if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
{
$tDomain = $fDomain;
$tMessage .= $PALANG['pCreate_mailbox_result_error'] . "<br />($fUsername)<br />";
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-05-25 20:49:40 UTC (rev 372)
+++ trunk/edit-mailbox.php 2008-05-25 21:19:58 UTC (rev 373)
@@ -153,7 +153,7 @@
$formvars['active']=$sqlActive;
$result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
- if ($result != 1) {
+ if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) {
$tMessage = $PALANG['pEdit_mailbox_result_error'];
}
else {
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-05-25 20:49:40 UTC (rev 372)
+++ trunk/functions.inc.php 2008-05-25 21:19:58 UTC (rev 373)
@@ -1713,7 +1713,7 @@
Called after a mailbox has been created in the DBMS.
Returns: boolean.
*/
-function mailbox_postcreation($username,$domain,$maildir)
+function mailbox_postcreation($username,$domain,$maildir,$quota)
{
if (empty($username) || empty($domain) || empty($maildir))
{
@@ -1729,7 +1729,9 @@
$cmdarg1=escapeshellarg($username);
$cmdarg2=escapeshellarg($domain);
$cmdarg3=escapeshellarg($maildir);
- $command=$CONF[$confpar]." $cmdarg1 $cmdarg2 $cmdarg3";
+ if ($quota <= 0) $quota = 0;
+ $cmdarg4=escapeshellarg($quota);
+ $command=$CONF[$confpar]." $cmdarg1 $cmdarg2 $cmdarg3 $cmdarg4";
$retval=0;
$output=array();
$firstline='';
@@ -1745,6 +1747,44 @@
}
/*
+ Called after a mailbox has been altered in the DBMS.
+ Returns: boolean.
+ */
+function mailbox_postedit($username,$domain,$maildir,$quota)
+{
+ if (empty($username) || empty($domain) || empty($maildir))
+ {
+ trigger_error('In '.__FUNCTION__.': empty username, domain and/or maildir parameter',E_USER_ERROR);
+ return FALSE;
+ }
+
+ global $CONF;
+ $confpar='mailbox_postedit_script';
+
+ if (!isset($CONF[$confpar]) || empty($CONF[$confpar])) return TRUE;
+
+ $cmdarg1=escapeshellarg($username);
+ $cmdarg2=escapeshellarg($domain);
+ $cmdarg3=escapeshellarg($maildir);
+ if ($quota <= 0) $quota = 0;
+ $cmdarg4=escapeshellarg($quota);
+ $command=$CONF[$confpar]." $cmdarg1 $cmdarg2 $cmdarg3 $cmdarg4";
+ $retval=0;
+ $output=array();
+ $firstline='';
+ $firstline=exec($command,$output,$retval);
+ if (0!=$retval)
+ {
+ error_log("Running $command yielded return value=$retval, first line of output=$firstline");
+ print '<p>WARNING: Problems running mailbox postedit script!</p>';
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+/*
Called after a mailbox has been deleted in the DBMS.
Returns: boolean.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-25 20:49:33
|
Revision: 372
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=372&view=rev
Author: christian_boltz
Date: 2008-05-25 13:49:40 -0700 (Sun, 25 May 2008)
Log Message:
-----------
DOVECOT.txt:
- changed default_pass_scheme to MD5-CRYPT to match default config.inc.php
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1971591&group_id=191583
- added description of possible settings
(Note: a dovecot expert should proofread my changes ;-)
Modified Paths:
--------------
trunk/DOCUMENTS/DOVECOT.txt
Modified: trunk/DOCUMENTS/DOVECOT.txt
===================================================================
--- trunk/DOCUMENTS/DOVECOT.txt 2008-05-25 20:33:48 UTC (rev 371)
+++ trunk/DOCUMENTS/DOVECOT.txt 2008-05-25 20:49:40 UTC (rev 372)
@@ -38,9 +38,12 @@
db_client_flags = 0
# Default password scheme.
+# depends on your $CONF['encrypt'] setting:
+# md5crypt -> MD5-CRYPT
+# md5 -> PLAIN-MD5
+# cleartext -> PLAIN
+default_pass_scheme = MD5-CRYPT
-default_pass_scheme = PLAIN-MD5
-
# Query to retrieve password.
password_query = SELECT password FROM mailbox WHERE username = '%u'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-25 20:33:41
|
Revision: 371
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=371&view=rev
Author: christian_boltz
Date: 2008-05-25 13:33:48 -0700 (Sun, 25 May 2008)
Log Message:
-----------
BACKUP_MX.txt:
- updated example config to new mysql map format
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1971444&group_id=191583
- changed example password to match the password used in POSTFIX_CONF.txt
Modified Paths:
--------------
trunk/DOCUMENTS/BACKUP_MX.txt
Modified: trunk/DOCUMENTS/BACKUP_MX.txt
===================================================================
--- trunk/DOCUMENTS/BACKUP_MX.txt 2008-05-25 19:42:40 UTC (rev 370)
+++ trunk/DOCUMENTS/BACKUP_MX.txt 2008-05-25 20:33:48 UTC (rev 371)
@@ -33,13 +33,10 @@
You will need to put this into a text file for postfix to pickup.
user = postfix
-password = postfix
+password = password
hosts = localhost
dbname = postfix
-table = domain
-select_field = domain
-where_field = domain
-additional_conditions = and backupmx = '1'
+query = SELECT domain FROM domain WHERE domain = '%s' AND backupmx = '1'
3. Restart Postfix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-25 19:42:31
|
Revision: 370
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=370&view=rev
Author: christian_boltz
Date: 2008-05-25 12:42:40 -0700 (Sun, 25 May 2008)
Log Message:
-----------
setup.php:
- remove warning that apache version can't be detected when running on
another webserver software
https://sourceforge.net/tracker/index.php?func=detail&aid=1865122&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/setup.php
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2008-05-25 19:33:43 UTC (rev 369)
+++ trunk/setup.php 2008-05-25 19:42:40 UTC (rev 370)
@@ -80,7 +80,9 @@
}
else
{
- print "<li><b>Unable to check for Apache version. (missing function: apache_get_version())<br />(Ignore this warning if you use another webserver software.)</b></li>\n";
+ # not running on Apache.
+ # However postfixadmin _is_ running, so obviously we are on a supported webserver ;-))
+ # No need to confuse the user with a warning.
}
print "</ul>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-25 19:33:38
|
Revision: 369
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=369&view=rev
Author: christian_boltz
Date: 2008-05-25 12:33:43 -0700 (Sun, 25 May 2008)
Log Message:
-----------
create-mailbox.php:
- create subfolders _after_ sending the welcome mail
functions.inc.php:
- sleep(1) before creating subfolders for a newly created mailbox
This fixes subfolder creation when courier is used.
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1970684&group_id=191583
Modified Paths:
--------------
trunk/create-mailbox.php
trunk/functions.inc.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-05-23 11:39:15 UTC (rev 368)
+++ trunk/create-mailbox.php 2008-05-25 19:33:43 UTC (rev 369)
@@ -278,13 +278,6 @@
*/
$tDomain = $fDomain;
- if (create_mailbox_subfolders($fUsername,$fPassword))
- {
- $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
- } else {
- $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
- }
-
if ($CONF['generate_password'] == "YES")
{
$tMessage .= " / $fPassword)</br />";
@@ -326,7 +319,15 @@
$tMessage .= "<br />" . $PALANG['pSendmail_result_success'] . "<br />";
}
}
+
+ if (create_mailbox_subfolders($fUsername,$fPassword))
+ {
+ $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername";
+ } else {
+ $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername";
}
+
+ }
}
}
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-05-23 11:39:15 UTC (rev 368)
+++ trunk/functions.inc.php 2008-05-25 19:33:43 UTC (rev 369)
@@ -1926,6 +1926,8 @@
$s='{'.$s_host.$s_port.$s_options.'}';
+ sleep(1); # give the mail triggering the mailbox creation a chance to do its job
+
$i=@imap_open($s,$login,$cleartext_password);
if (FALSE==$i)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-23 11:39:13
|
Revision: 368
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=368&view=rev
Author: christian_boltz
Date: 2008-05-23 04:39:15 -0700 (Fri, 23 May 2008)
Log Message:
-----------
create-alias-domain.php:
- fixed a comment
- enabled SVN $Id expansion
Modified Paths:
--------------
trunk/create-alias-domain.php
Property Changed:
----------------
trunk/create-alias-domain.php
Modified: trunk/create-alias-domain.php
===================================================================
--- trunk/create-alias-domain.php 2008-05-22 22:16:07 UTC (rev 367)
+++ trunk/create-alias-domain.php 2008-05-23 11:39:15 UTC (rev 368)
@@ -10,7 +10,7 @@
* Further details on the project are available at :
* http://www.postfixadmin.com or http://postfixadmin.sf.net
*
- * File: create-alias.php
+ * File: create-alias-domain.php
* Template File: create-alias-domain.php
* Responsible for allowing for the creation of alias domains.
*
Property changes on: trunk/create-alias-domain.php
___________________________________________________________________
Name: svn:keywords
+ Id Rev
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-22 22:16:00
|
Revision: 367
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=367&view=rev
Author: christian_boltz
Date: 2008-05-22 15:16:07 -0700 (Thu, 22 May 2008)
Log Message:
-----------
menu.php:
- add "create alias domain" to "virtual" menu
Modified Paths:
--------------
trunk/templates/menu.php
Modified: trunk/templates/menu.php
===================================================================
--- trunk/templates/menu.php 2008-05-22 21:42:40 UTC (rev 366)
+++ trunk/templates/menu.php 2008-05-22 22:16:07 UTC (rev 367)
@@ -16,6 +16,9 @@
$url = "create-alias.php"; if (isset ($_GET['domain'])) $url .= "?domain=" . $_GET['domain'];
$submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias']);
+$url = "create-alias-domain.php"; if (isset ($_GET['domain'])) $url .= "?target_domain=" . $_GET['domain'];
+$submenu_virtual .= _menulink($url, $PALANG['pMenu_create_alias_domain']);
+
$submenu_admin = _menulink("create-admin.php", $PALANG['pAdminMenu_create_admin']);
$submenu_fetchmail = _menulink("fetchmail.php?new=1", $PALANG['pFetchmail_new_entry']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-05-22 21:42:35
|
Revision: 366
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=366&view=rev
Author: GingerDog
Date: 2008-05-22 14:42:40 -0700 (Thu, 22 May 2008)
Log Message:
-----------
oops, missed this one -thanks cboltz
Added Paths:
-----------
trunk/create-alias-domain.php
Added: trunk/create-alias-domain.php
===================================================================
--- trunk/create-alias-domain.php (rev 0)
+++ trunk/create-alias-domain.php 2008-05-22 21:42:40 UTC (rev 366)
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Postfix Admin
+ *
+ * LICENSE
+ *
+ * This source file is subject to the GPL license that is bundled with
+ * this package in the file LICENSE.TXT.
+ *
+ * Further details on the project are available at :
+ * http://www.postfixadmin.com or http://postfixadmin.sf.net
+ *
+ * File: create-alias.php
+ * Template File: create-alias-domain.php
+ * Responsible for allowing for the creation of alias domains.
+ *
+ * @version $Id$
+ * @license GNU GPL v2 or later.
+ *
+ * Template Variables:
+ *
+ * tMessage
+ *
+ * Form POST \ GET Variables:
+ *
+ * fAliasDomain
+ * fTargetDomain
+ * fActive
+ *
+ */
+
+require_once('common.php');
+
+authentication_require_role('admin');
+$username = authentication_get_username();
+$SESSID_USERNAME = $username;
+if(authentication_has_role('global-admin')) {
+ $list_domains = list_domains ();
+}
+else {
+ $list_domains = list_domains_for_admin ($username);
+}
+
+# read alias_domain table to see which domains in $list_domains
+# are still available as an alias- or target-domain
+$list_aliases = Array();
+$result = db_query ("SELECT alias_domain, target_domain FROM $table_alias_domain");
+if ($result['rows'] > 0) {
+ while ($row = db_array ($result['result']))
+ {
+ $list_aliases[ $row['alias_domain'] ] = $row['target_domain'];
+ }
+}
+
+if (isset ($_REQUEST['alias_domain'])) {
+ $fAliasDomain = escape_string ($_REQUEST['alias_domain']);
+ $fAliasDomain = strtolower ($fAliasDomain);
+}
+if (isset ($_REQUEST['target_domain'])) {
+ $fTargetDomain = escape_string ($_REQUEST['target_domain']);
+ $fTargetDomain = strtolower ($fTargetDomain);
+}
+if (isset ($_REQUEST['active'])) {
+ $fActive = (bool)$_REQUEST['active'];
+} else {
+ $fActive = true;
+}
+
+if ($_SERVER['REQUEST_METHOD'] == "POST")
+{
+ if(!authentication_has_role ('global-admin') &&
+ !(check_owner ($SESSID_USERNAME, $fAliasDomain) &&
+ check_owner ($SESSID_USERNAME, $fTargetDomain)))
+ {
+ $error = 1;
+ $tMessage = $PALANG['pCreate_alias_domain_error1'];
+ }
+
+ if (isset($list_aliases[$fAliasDomain]) || // alias_domain is unique (primary key, a domain can't be an alias for multiple others)
+ in_array($fAliasDomain,$list_aliases) || // an alias_domain can't be a target_domain for a third domain.
+ isset($list_aliases[$fTargetDomain]) || // same as above, other way around
+ ($fAliasDomain == $fTargetDomain) || // i really don't have to
+ empty($fAliasDomain) || empty($fTargetDomain)) // explain this, do i?
+ {
+ $error = 1;
+ $tMessage = $PALANG['pCreate_alias_domain_error2'];
+ }
+
+ $sqlActive = db_get_boolean($fActive);
+
+ if ($error != 1) {
+ $result = db_query ("INSERT INTO $table_alias_domain (alias_domain,target_domain,created,modified,active) VALUES ('$fAliasDomain','$fTargetDomain',NOW(),NOW(),'$sqlActive')");
+ if ($result['rows'] != 1) {
+ $error = 1;
+ $tMessage = $PALANG['pCreate_alias_domain_error3'];
+ }
+ else {
+ db_log ($SESSID_USERNAME, $fAliasDomain, 'create_alias_domain', "$fAliasDomain -> $fTargetDomain");
+
+ $tMessage = $PALANG['pCreate_alias_domain_success'];
+ }
+ }
+
+ $tMessage .= "<br />($fAliasDomain -> $fTargetDomain)<br />\n";
+}
+
+include ("templates/header.php");
+include ("templates/menu.php");
+include ("templates/create-alias-domain.php");
+include ("templates/footer.php");
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-21 23:25:37
|
Revision: 365
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=365&view=rev
Author: christian_boltz
Date: 2008-05-21 16:25:39 -0700 (Wed, 21 May 2008)
Log Message:
-----------
*.lang:
- included all texts for domain aliases to the *.lang files
language-update.sh:
- new parameter --forcepatch
Similar to --patch, but applies the patch line by line. Useful if
--patch fails because of empty lines etc., but much slower.
Modified Paths:
--------------
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/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/language-update.sh
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
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/bg.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ïðåãëåä';
$PALANG['pMenu_create_alias'] = 'Ñúçäàé íîâ Alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Ñúçäàé íîâà ïîùåíñêà êóòèÿ';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Èçïðàòè Email';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top';
$PALANG['pOverview_right_arrow'] = 'Next Page';
$PALANG['pOverview_left_arrow'] = 'Previous Page';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
$PALANG['pOverview_button'] = 'Íàïðåä';
$PALANG['pOverview_welcome'] = 'Ïðåãëåä íà ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias-è';
$PALANG['pOverview_alias_mailbox_count'] = 'Ïîùåíñêè êóòèè';
$PALANG['pOverview_alias_address'] = 'Îò';
$PALANG['pOverview_alias_goto'] = 'Äî';
$PALANG['pOverview_alias_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Å-ìåéë';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = 'Äîìåéí';
$PALANG['pOverview_get_aliases'] = 'Alias-è';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Ïîùåíñêè êóòèè';
$PALANG['pOverview_get_quota'] = 'Îáåì íà ïîùåíñêàòà êóòèÿ (MB)';
$PALANG['pOverview_get_modified'] = 'Ïîñëåäíî ìîäèôèöèðàí';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø! ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Ñúçäàé íîâ alias çà âàøèÿ äîìåéí.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Íå ñòå âúâåëè íèùî â ïîëåòî Êúì</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Å-ìåéë àäðåñà, êîéòî ñòå âúâåëè íå å âàëèäåí: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Òîçè äîìåéí íå å âàø: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
$PALANG['pEdit_alias_button'] = 'Ðåäàêòèðàé Alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Íàïðåä';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Íå ìîãà äà äîáàâÿ äîìåéíà!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Äîìåéíà áå äîáàâåí óñïåøíî!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Ðåäàêòèðàíå íà äîìåéí';
$PALANG['pAdminEdit_domain_domain'] = 'Äîìåéí';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/ca.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resum';
$PALANG['pMenu_create_alias'] = 'Afegir àlies';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Afegir bústia';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Ves';
$PALANG['pOverview_welcome'] = 'Resum de ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Àlies';
$PALANG['pOverview_alias_mailbox_count'] = 'Bústies';
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destí';
$PALANG['pOverview_alias_modified'] = 'Última modificació';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail'; # XXX
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Domini';
$PALANG['pOverview_get_aliases'] = 'Àlies';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Bústies';
$PALANG['pOverview_get_quota'] = 'Quota de bústia (MB)';
$PALANG['pOverview_get_modified'] = 'Última Modificació';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Aquest domini no et pertany ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nou àlies pel domini.';
$PALANG['pCreate_alias_address'] = 'Àlies';
@@ -104,6 +123,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No has introduït res al destí</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">L\'adreça d\'e-mail introduida no és vàlida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Aquest domini no et pertany: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Editar àlies';
@@ -173,9 +193,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ves';
@@ -252,6 +275,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Imposible afegir el domini!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
$PALANG['pAdminEdit_domain_domain'] = 'Domini';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/cn.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = '概览';
$PALANG['pMenu_create_alias'] = '新建别名';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = '新建邮箱';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = '发送邮件';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = '返回顶端';
$PALANG['pOverview_right_arrow'] = '下一页';
$PALANG['pOverview_left_arrow'] = '上一页';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: 别名';
$PALANG['pOverview_mailbox_title'] = ':: 邮箱';
$PALANG['pOverview_button'] = '执行';
$PALANG['pOverview_welcome'] = '浏览 ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = '别名';
$PALANG['pOverview_alias_mailbox_count'] = '邮箱';
$PALANG['pOverview_alias_address'] = '前往';
$PALANG['pOverview_alias_goto'] = '转到';
$PALANG['pOverview_alias_modified'] = '最后修改日期';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = '邮件地址';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = '域';
$PALANG['pOverview_get_aliases'] = '别名';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = '邮箱';
$PALANG['pOverview_get_quota'] = '邮箱限制 (MB)';
$PALANG['pOverview_get_modified'] = '最后修改日期';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">你没有该域的管理权限';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = '在你的域中新建一个别名.';
$PALANG['pCreate_alias_address'] = '别名';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">你没有填写收信人</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">邮件地址非法: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">你没有该域的管理权限: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = '编辑别名';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = '执行';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">新增域失败!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '新增域成功!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改域';
$PALANG['pAdminEdit_domain_domain'] = '域名';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/cs.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -34,6 +34,7 @@
$PALANG['pMenu_main'] = 'Hlavní';
$PALANG['pMenu_overview'] = 'Přehled';
$PALANG['pMenu_create_alias'] = 'Přidat přesměrování';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Přidat schránku';
$PALANG['pMenu_fetchmail'] = 'Stahování pošty';
$PALANG['pMenu_sendmail'] = 'Poslat email';
@@ -56,16 +57,21 @@
$PALANG['pOverview_up_arrow'] = 'Na Začátek';
$PALANG['pOverview_right_arrow'] = 'Další Stránka';
$PALANG['pOverview_left_arrow'] = 'Předchozí Stránka';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Přesměrování';
$PALANG['pOverview_mailbox_title'] = ':: Schránky';
$PALANG['pOverview_button'] = 'Přejít';
$PALANG['pOverview_welcome'] = 'Přehled domény ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Přesměrování';
$PALANG['pOverview_alias_mailbox_count'] = 'Schránek';
$PALANG['pOverview_alias_address'] = 'Od';
$PALANG['pOverview_alias_goto'] = 'Pro';
$PALANG['pOverview_alias_modified'] = 'Naposledy změněno';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktivní';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Přesměrování';
$PALANG['and_x_more'] = '[a %s dalších...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -78,6 +84,7 @@
$PALANG['pOverview_get_domain'] = 'Doména';
$PALANG['pOverview_get_aliases'] = 'Přesměrování';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Schránky';
$PALANG['pOverview_get_quota'] = 'Místo pro schránku (MB)';
$PALANG['pOverview_get_modified'] = 'Naposledy změněno';
@@ -86,7 +93,19 @@
$PALANG['pDelete_delete_success'] = '%s odstraněn.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Nelze odstranit schránku ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tato doména není vaše ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Nelze odstranit přesměrování ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Vytvořit nové přesměrování ve Vaší doméně.';
$PALANG['pCreate_alias_address'] = 'Přesměrování';
@@ -110,6 +129,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Nezadali jste cíl</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Emailová adresa kterou jste zadali není platná: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Tato doména není vaše: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Doručovat i do schránky.';
$PALANG['pEdit_alias_forward_only'] = 'Přesměrovat pouze na dané adresy.';
$PALANG['pEdit_alias_button'] = 'Upravit';
@@ -182,9 +202,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'úprava schránky';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'změna stavu schránky';
$PALANG['pViewlog_action_create_alias'] = 'vytvořeno přesměrování';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'smazáno přesměrování';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'úprava přesměrování';
$PALANG['pViewlog_action_edit_alias_state'] = 'změna stavu přesměrování';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'změna hesla';
$PALANG['pViewlog_button'] = 'Jít';
@@ -262,6 +285,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Nepodařilo se odstranit doménu!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
$PALANG['pAdminEdit_domain_domain'] = 'Doména';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/da.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -31,6 +31,7 @@
$PALANG['pMenu_main'] = 'Start';
$PALANG['pMenu_overview'] = 'Oversigt';
$PALANG['pMenu_create_alias'] = 'Tilføj alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Tilføj postboks';
$PALANG['pMenu_fetchmail'] = 'Hent email';
$PALANG['pMenu_sendmail'] = 'Send email';
@@ -53,16 +54,21 @@
$PALANG['pOverview_up_arrow'] = 'Gå til top';
$PALANG['pOverview_right_arrow'] = 'Næste side';
$PALANG['pOverview_left_arrow'] = 'Foregående side';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Postbokse';
$PALANG['pOverview_button'] = 'Vis';
$PALANG['pOverview_welcome'] = 'Oversigt for ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias';
$PALANG['pOverview_alias_mailbox_count'] = 'Postbokse';
$PALANG['pOverview_alias_address'] = 'Alias';
$PALANG['pOverview_alias_goto'] = 'Modtager';
$PALANG['pOverview_alias_modified'] = 'Senest ændret';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktiveret';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[og %s til...]';
$PALANG['pOverview_mailbox_username'] = 'Emailadresse';
@@ -76,6 +82,7 @@
$PALANG['pOverview_get_domain'] = 'Domæne';
$PALANG['pOverview_get_aliases'] = 'Alias';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postbokse';
$PALANG['pOverview_get_quota'] = 'Postboks Kvota (MB)';
$PALANG['pOverview_get_modified'] = 'Senest ændret';
@@ -84,7 +91,19 @@
$PALANG['pDelete_delete_success'] = '%s er slettet.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kunne ikke fjerne postkassen ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domæne er ikke dit ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kunne ikke slette aliaset ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Tilføj nyt alias til dit domæne.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -108,6 +127,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du udfyldte ikke noget i Modtager(e)</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Den tilføjede emailadresse er ikke gyldig: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domæne tilhører ikke dig: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Lever email til den lokale postboks.';
$PALANG['pEdit_alias_forward_only'] = 'Videresend til angiven emailadresse uden lokal kopi.';
$PALANG['pEdit_alias_button'] = 'Ret alias';
@@ -180,9 +200,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'rediger postboks';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'ændre postboks aktiv';
$PALANG['pViewlog_action_create_alias'] = 'tilføj alias';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'slet alias';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
$PALANG['pViewlog_action_edit_alias_state'] = 'ændre alias aktiv';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'ændre adgangskode';
$PALANG['pViewlog_button'] = 'Vis';
@@ -260,6 +283,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domænet kunne ikke slettes!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Rediger et domæne';
$PALANG['pAdminEdit_domain_domain'] = 'Domæne';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/de.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -31,6 +31,7 @@
$PALANG['pMenu_main'] = 'Startseite';
$PALANG['pMenu_overview'] = 'Überblick';
$PALANG['pMenu_create_alias'] = 'Alias hinzufügen';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Mailbox hinzufügen';
$PALANG['pMenu_fetchmail'] = 'E-Mail Abruf';
$PALANG['pMenu_sendmail'] = 'Email versenden';
@@ -53,16 +54,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top';
$PALANG['pOverview_right_arrow'] = 'Nächste Seite';
$PALANG['pOverview_left_arrow'] = 'Vorherige Seite';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxen';
$PALANG['pOverview_button'] = 'Los';
$PALANG['pOverview_welcome'] = 'Überblick über ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliase';
$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxen';
$PALANG['pOverview_alias_address'] = 'Von';
$PALANG['pOverview_alias_goto'] = 'An';
$PALANG['pOverview_alias_modified'] = 'Zuletzt verändert';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Aktiv';
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[und %s weitere...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -75,6 +81,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliases';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Mailboxen';
$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
$PALANG['pOverview_get_modified'] = 'Zuletzt verändert';
@@ -83,7 +90,19 @@
$PALANG['pDelete_delete_success'] = '%s gelöscht.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Mailbox konnte nicht gelöscht werden ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Alias konnte nicht gelöscht werden ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Neuen Alias für Ihre Domain anlegen';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -107,6 +126,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Sie haben im "To"-Feld nichts angegeben!</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Die angegebene eMail-Adresse ist nicht korrekt: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Diese Domain gehört nicht Ihnen: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Mail in der lokalen Mailbox ablegen.';
$PALANG['pEdit_alias_forward_only'] = 'Nur zur angegebenen Adresse weiterleiten.';
$PALANG['pEdit_alias_button'] = 'Alias ändern';
@@ -179,9 +199,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'Mailbox bearbeiten';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'Mailbox Aktiv bearbeiten';
$PALANG['pViewlog_action_create_alias'] = 'Alias erstellen';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'Alias löschen';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'Alias bearbeiten';
$PALANG['pViewlog_action_edit_alias_state'] = 'Alias Aktiv bearbeiten';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'Passwort ändern';
$PALANG['pViewlog_button'] = 'Los';
@@ -259,6 +282,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domain wurde angelegt!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Domain konnte nicht gelöscht werden!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/es.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Resumen';
$PALANG['pMenu_create_alias'] = 'Añadir alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Añadir buzón';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Ir';
$PALANG['pOverview_welcome'] = 'Resumen de ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Alias'; # XXX
$PALANG['pOverview_alias_mailbox_count'] = 'Buzones';
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Destino';
$PALANG['pOverview_alias_modified'] = 'Última modificación';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Dominio';
$PALANG['pOverview_get_aliases'] = 'Alias';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Buzones';
$PALANG['pOverview_get_quota'] = 'Cuota de buzón (MB)';
$PALANG['pOverview_get_modified'] = 'Última Modificación';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Este dominio no le pertenece ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Crear un nuevo alias para el dominio.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -104,6 +123,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">No ha introducido nada en el destino</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">La dirección de e-mail introducida no es válida: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Este dominio no le pertenece: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Editar alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Ir';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">¡Imposible añadir el dominio!</span>';
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
$PALANG['pAdminEdit_domain_domain'] = 'Dominio';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/et.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Ülevaade';
$PALANG['pMenu_create_alias'] = 'Lisa alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Lisa postkast';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Saada kiri';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = 'Mine üles';
$PALANG['pOverview_right_arrow'] = 'Järgmine leht';
$PALANG['pOverview_left_arrow'] = 'Eelmine leht';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias';
$PALANG['pOverview_mailbox_title'] = ':: Postkastid';
$PALANG['pOverview_button'] = 'Mine';
$PALANG['pOverview_welcome'] = 'Ülevaade domeenist: ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliasi';
$PALANG['pOverview_alias_mailbox_count'] = 'Postkaste';
$PALANG['pOverview_alias_address'] = 'Kellelt';
$PALANG['pOverview_alias_goto'] = 'Kellele';
$PALANG['pOverview_alias_modified'] = 'Viimati muudetud';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-posti aadress';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = 'Domeen';
$PALANG['pOverview_get_aliases'] = 'Aliased';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postkastid';
$PALANG['pOverview_get_quota'] = 'Postkasti kettaruumi piirang (MB)';
$PALANG['pOverview_get_modified'] = 'Viimati muudetud';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Puuduvad õigused. Domeen: ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Loo uus alias domeenis.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -105,6 +124,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Kellele väli on tühi.</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Sisestatud e/posti aadress pole kehtiv: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Puuduvad õigused. Domeen: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Muuda alias';
@@ -174,9 +194,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Mine';
@@ -253,6 +276,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domeeni lisamine ebaõnnestus!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni';
$PALANG['pAdminEdit_domain_domain'] = 'Domeen';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/eu.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -28,6 +28,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Laburpena';
$PALANG['pMenu_create_alias'] = 'Aliasa gehitu';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Postontzia gehitu';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'e-maila bidali';
@@ -50,16 +51,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Joan';
$PALANG['pOverview_welcome'] = 'Laburpena ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliasa';
$PALANG['pOverview_alias_mailbox_count'] = 'Postontziak';
$PALANG['pOverview_alias_address'] = 'Igorlea';
$PALANG['pOverview_alias_goto'] = 'Norakoa';
$PALANG['pOverview_alias_modified'] = 'Azken aldaketa';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-mail';
@@ -72,6 +78,7 @@
$PALANG['pOverview_get_domain'] = 'Domeinua';
$PALANG['pOverview_get_aliases'] = 'Aliasa';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postontziak';
$PALANG['pOverview_get_quota'] = 'Postontzi kuota (MB)';
$PALANG['pOverview_get_modified'] = 'Azken aldaketa';
@@ -80,7 +87,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Ez zara domeinu honen jabe';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Domeinuarentzat alias berri bat sortu.';
$PALANG['pCreate_alias_address'] = 'Aliasa';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">ALIASa okerra da!</span>';
@@ -103,6 +122,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Norakoan ez duzu ezer jarri</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Sartutako e-mail helbidea baliiogabekoa da: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Ez zara domeinu honen jabe: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Aliasa aldatu';
@@ -172,9 +192,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Joan';
@@ -251,6 +274,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Ezinezkoa domeinua gehitzea!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu';
$PALANG['pAdminEdit_domain_domain'] = 'Domeinua';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/fi.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -32,6 +32,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Yleisnäkymä';
$PALANG['pMenu_create_alias'] = 'Lisää alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Lisää postilaatikko';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Lähetä postia';
@@ -54,16 +55,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Siirry';
$PALANG['pOverview_welcome'] = 'Yleisnäkymä ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Aliakset';
$PALANG['pOverview_alias_mailbox_count'] = 'Postilaatikot';
$PALANG['pOverview_alias_address'] = 'Keneltä';
$PALANG['pOverview_alias_goto'] = 'Kenelle';
$PALANG['pOverview_alias_modified'] = 'Viimeksi muokattu';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'Sähköposti';
@@ -76,6 +82,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliakset';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postilaatikot';
$PALANG['pOverview_get_quota'] = 'Postilaatikon kiintiö (MB)';
$PALANG['pOverview_get_modified'] = 'Viimeksi muokattu';
@@ -84,7 +91,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.'; # XXX
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
$PALANG['pCreate_alias_welcome'] = 'Luo uusi alias.';
$PALANG['pCreate_alias_address'] = 'Alias';
@@ -107,6 +126,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Et kirjoitanut mitään Kenelle: -riville</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">Antamasi sähköpostiosoite ei ole oikean muotoinen: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Tämä ei ole sinun domainisi: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>'; # XXX
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.'; # XXX
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.'; # XXX
$PALANG['pEdit_alias_button'] = 'Muokkaa aliasta';
@@ -176,9 +196,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox'; # XXX
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active'; # XXX
$PALANG['pViewlog_action_create_alias'] = 'create alias'; # XXX
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain'; # XXX
$PALANG['pViewlog_action_delete_alias'] = 'delete alias'; # XXX
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain'; # XXX
$PALANG['pViewlog_action_edit_alias'] = 'edit alias'; # XXX
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active'; # XXX
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active'; # XXX
$PALANG['pViewlog_action_edit_password'] = 'change password'; # XXX
$PALANG['pViewlog_button'] = 'Siirry';
@@ -255,6 +278,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Domainin lisäys ei onnistunut!</span>';
$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>'; # XXX
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2008-05-21 22:06:08 UTC (rev 364)
+++ trunk/languages/fo.lang 2008-05-21 23:25:39 UTC (rev 365)
@@ -29,6 +29,7 @@
$PALANG['pMenu_main'] = 'Main'; # XXX
$PALANG['pMenu_overview'] = 'Yvirlit';
$PALANG['pMenu_create_alias'] = 'Stovna Dulnevni';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
$PALANG['pMenu_create_mailbox'] = 'Stovna Postkassa';
$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
$PALANG['pMenu_sendmail'] = 'Send E-post';
@@ -51,16 +52,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top'; # XXX
$PALANG['pOverview_right_arrow'] = 'Next Page'; # XXX
$PALANG['pOverview_left_arrow'] = 'Previous Page'; # XXX
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases'; # XXX
$PALANG['pOverview_alias_title'] = ':: Alias'; # XXX
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes'; # XXX
$PALANG['pOverview_button'] = 'Vel';
$PALANG['pOverview_welcome'] = 'Yvirlit yvir ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
$PALANG['pOverview_alias_alias_count'] = 'Dulnevni';
$PALANG['pOverview_alias_mailbox_count'] = 'Postkassar';
$PALANG['pOverview_alias_address'] = 'Frá';
$PALANG['pOverview_alias_goto'] = 'Til';
$PALANG['pOverview_alias_modified'] = 'Síðst broytt';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified'; # XXX
$PALANG['pOverview_alias_active'] = 'Active'; # XXX
+$PALANG['pOverview_alias_domain_active'] = 'Active'; # XXX
$PALANG['pOverview_alias_edit'] = 'Alias'; # XXX
$PALANG['and_x_more'] = '[and %s more...]'; # XXX
$PALANG['pOverview_mailbox_username'] = 'E-post';
@@ -73,6 +79,7 @@
$PALANG['pOverview_get_domain'] = 'Navnaøki';
$PALANG['pOverview_get_aliases'] = 'Dulnevni';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
$PALANG['pOverview_get_mailboxes'] = 'Postkassar';
$PALANG['pOverview_get_quota'] = 'Postkassa kvota (MB)';
$PALANG['pOverview_get_modified'] = 'Síðst broytt';
@@ -81,7 +88,19 @@
$PALANG['pDelete_delete_success'] = '%s deleted.'; # XXX
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox '; # XXX
$PALANG['pDelete_domain_error'] = '<span class="error_msg">Hetta er ikki títt navnaøki ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours '; # XXX
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias '; # XXX
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.'; # XXX
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.'; # XXX
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain'; # XXX
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.'; # XXX
+$PALANG['pCreate_alias_domain_active'] = 'Active'; # XXX
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain'; # XXX
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX
+$PALANG['pCreate_alias_domain_error...
[truncated message content] |
|
From: <chr...@us...> - 2008-05-21 22:06:01
|
Revision: 364
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=364&view=rev
Author: christian_boltz
Date: 2008-05-21 15:06:08 -0700 (Wed, 21 May 2008)
Log Message:
-----------
backup.php, config.inc.php:
- added alias_domain table at various places
- also opened https://sourceforge.net/tracker/index.php?func=detail&aid=1969168&group_id=191583&atid=937967
("backup.php should use table list from config")
Modified Paths:
--------------
trunk/backup.php
trunk/config.inc.php
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2008-05-21 21:05:48 UTC (rev 363)
+++ trunk/backup.php 2008-05-21 22:06:08 UTC (rev 364)
@@ -75,6 +75,7 @@
$tables = array(
'admin',
'alias',
+ 'alias_domain',
'config',
'domain',
'domain_admins',
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-05-21 21:05:48 UTC (rev 363)
+++ trunk/config.inc.php 2008-05-21 22:06:08 UTC (rev 364)
@@ -59,6 +59,7 @@
$CONF['database_tables'] = array (
'admin' => 'admin',
'alias' => 'alias',
+ 'alias_domain' => 'alias_domain',
'config' => 'config',
'domain' => 'domain',
'domain_admins' => 'domain_admins',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-05-21 21:05:44
|
Revision: 363
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=363&view=rev
Author: GingerDog
Date: 2008-05-21 14:05:48 -0700 (Wed, 21 May 2008)
Log Message:
-----------
inital merge of lenix's patch for domain aliasing; I think list-virtual.php needs some attention, but I've run out of time right now; upgrade.php has been updated to create the tables correctly (tested on pgsql and mysql); functionality or php scripts not tested yet
Modified Paths:
--------------
trunk/DOCUMENTS/POSTFIX_CONF.txt
trunk/css/default.css
trunk/delete.php
trunk/edit-active.php
trunk/functions.inc.php
trunk/languages/en.lang
trunk/list-virtual.php
trunk/templates/list-virtual.php
trunk/upgrade.php
Added Paths:
-----------
trunk/templates/create-alias-domain.php
Modified: trunk/DOCUMENTS/POSTFIX_CONF.txt
===================================================================
--- trunk/DOCUMENTS/POSTFIX_CONF.txt 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/DOCUMENTS/POSTFIX_CONF.txt 2008-05-21 21:05:48 UTC (rev 363)
@@ -9,9 +9,14 @@
Its generally recommended to use proxy as well (which should also appear in
postconf -m) Three main.cf variables are involved:
-virtual_alias_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_maps.cf
virtual_mailbox_domains = proxy:mysql:/etc/postfix/sql/mysql_virtual_domains_maps.cf
-virtual_mailbox_maps = proxy:mysql:/etc/postfix/sql/mysql_virtual_mailbox_maps.cf
+virtual_alias_maps =
+ proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_maps.cf,
+ proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_maps.cf,
+ proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_catchall_maps.cf
+virtual_mailbox_maps =
+ proxy:mysql:/etc/postfix/sql/mysql_virtual_mailbox_maps.cf,
+ proxy:mysql:/etc/postfix/sql/mysql_virtual_alias_domain_mailbox_maps.cf
Where you chose to store the .cf files doesn't really matter, but they will
have database passwords stored in plain text so they should be readable only
@@ -35,22 +40,35 @@
password = password
hosts = localhost
dbname = postfix
-query = SELECT goto FROM alias WHERE address='%s' AND active = '1'
+query = SELECT goto FROM alias WHERE address='%s' AND active = '1'
#expansion_limit = 100
+mysql_virtual_alias_domain_maps.cf:
+user = postfix
+password = password
+hosts = localhost
+dbname = postfix
+query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('%u', '@', alias_domain.target_domain) AND alias.active = 1
+mysql_virtual_alias_domain_catchall_maps.cf:
+# handles catch-all settings of target-domain
+user = postfix
+password = password
+hosts = localhost
+dbname = postfix
+query = SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' and alias.address = CONCAT('@', alias_domain.target_domain) AND alias.active = 1
+
mysql_virtual_domains_maps.cf:
user = postfix
password = password
hosts = localhost
dbname = postfix
-query = SELECT domain FROM domain WHERE domain='%u'
+query = SELECT domain FROM domain WHERE domain='%s' AND active = '1'
#query = SELECT domain FROM domain WHERE domain='%s'
#optional query to use when relaying for backup MX
#query = SELECT domain FROM domain WHERE domain='%s' AND backupmx = '0' AND active = '1'
#expansion_limit = 100
-
mysql_virtual_mailbox_maps.cf:
user = postfix
password = password
@@ -59,6 +77,13 @@
query = SELECT CONCAT(domain,'/',maildir) FROM mailbox WHERE username='%s' AND active = '1'
#expansion_limit = 100
+mysql_virtual_alias_domain_mailbox_maps.cf:
+user = postfix
+password = password
+hosts = localhost
+dbname = postfix
+query = SELECT CONCAT(domain,'/',maildir) FROM mailbox,alias_domain WHERE alias_domain.alias_domain = '%d' and mailbox.username = CONCAT('%u', '@', alias_domain.target_domain) AND mailbox.active = 1
+
-------------------------
More information - HowTo docs that use PostfixAdmin
Modified: trunk/css/default.css
===================================================================
--- trunk/css/default.css 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/css/default.css 2008-05-21 21:05:48 UTC (rev 363)
@@ -110,6 +110,7 @@
position: absolute;
width: auto;
left: -999em;
+ background: #FFFFFF;
border:2px solid white;
border-top:none;
}
@@ -227,32 +228,32 @@
margin: 0 auto;
}
-#alias_table, #mailbox_table, #overview_table, #log_table, #admin_table {
+#alias_domain_table, #alias_table, #mailbox_table, #overview_table, #log_table, #admin_table {
width: 750px;
margin: 0px auto;
border: 1px solid #efefef;
}
-#alias_table .header, #mailbox_table .header, #overview_table .header, #log_table .header, #admin_table .header {
+#alias_domain_table .header, #alias_table .header, #mailbox_table .header, #overview_table .header, #log_table .header, #admin_table .header {
line-height: 20px;
background: #efefef;
color: black;
}
-#alias_table .hilightoff, #mailbox_table .hilightoff, #overview_table .hilightoff, #log_table .hilightoff, #admin_table .hilighoff {
+#alias_domain_table .hilightoff, #alias_table .hilightoff, #mailbox_table .hilightoff, #overview_table .hilightoff, #log_table .hilightoff, #admin_table .hilighoff {
background: white;
}
-#alias_table .hilighton, #mailbox_table .hilighton, #overview_table .hilighton, #log_table .hilighton, #admin_table .hilighton {
+#alias_domain_table .hilighton, #alias_table .hilighton, #mailbox_table .hilighton, #overview_table .hilighton, #log_table .hilighton, #admin_table .hilighton {
background: #D9FF43; /*#D6FF85;*/ /*#ffdddd;*/
}
-#alias_table tr:hover, #mailbox_table tr:hover, #overview_table tr:hover, #log_table tr:hover, #admin_table tr:hover {
+#alias_domain_table tr:hover, #alias_table tr:hover, #mailbox_table tr:hover, #overview_table tr:hover, #log_table tr:hover, #admin_table tr:hover {
background: #D9FF43; /*#D6FF85;*/ /*#ffdddd;*/
}
-#alias_table h3, #mailbox_table h3, #overview_table h3, #log_table h3, #admin_table h3 {
+#alias_domain_table h3, #alias_table h3, #mailbox_table h3, #overview_table h3, #log_table h3, #admin_table h3 {
background: silver;
text-align: left;
font-size: 12px;
Modified: trunk/delete.php
===================================================================
--- trunk/delete.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/delete.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -70,6 +70,8 @@
$result_alias = db_delete ($table_alias,$fWhere,$fDelete);
$result_mailbox = db_delete ($table_mailbox,$fWhere,$fDelete);
$result_log = db_delete ($table_log,$fWhere,$fDelete);
+ $result_alias_domain = db_delete ($table_alias_domain,'alias_domain',$fDelete);
+ $result_target_domain = db_delete ($table_alias_domain,'target_domain',$fDelete);
if ($CONF['vacation'] == "YES")
{
$result_vacation = db_delete ($table_vacation,$fWhere,$fDelete);
@@ -88,6 +90,28 @@
}
} # ($fTable == "domain")
+elseif ($fTable == "alias_domain")
+{
+ if (!check_owner ($SESSID_USERNAME, $fDelete))
+ {
+ $error = 1;
+ $tMessage = $PALANG['pDelete_domain_alias_error'] . "<b>$fDelete</b>!</span>";
+ }
+
+ $result = db_delete ($table_alias_domain,'alias_domain',$fDelete);
+ if (!$result || !alias_domain_postdeletion($fDelete))
+ {
+ $error = 1;
+ $tMessage = $PALANG['pAdminDelete_alias_domain_error'];
+ }
+ else
+ {
+ db_log ($SESSID_USERNAME, $fDelete, 'delete_alias_domain', $fDelete);
+ $url = "list-virtual.php?domain=" . urlencode($_REQUEST['domain']);
+ header ("Location: $url");
+ }
+} # ($fTable == "alias_domain")
+
elseif ($fTable == "alias" or $fTable == "mailbox")
{
Modified: trunk/edit-active.php
===================================================================
--- trunk/edit-active.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/edit-active.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -34,6 +34,7 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
+ if (isset ($_GET['alias_domain'])) $fAliasDomain = escape_string ($_GET['alias_domain']);
if (isset ($_GET['username'])) $fUsername = escape_string ($_GET['username']);
if (isset ($_GET['alias'])) $fAlias = escape_string ($_GET['alias']); else $fAlias = escape_string ($_GET['username']);
if (isset ($_GET['domain'])) $fDomain = escape_string ($_GET['domain']);
@@ -47,6 +48,7 @@
else
{
$setSql=('pgsql'==$CONF['database_type']) ? 'active=NOT active' : 'active=1-active';
+ $setSql.=', modified=NOW()';
if ($fUsername != '')
{
$result = db_query ("UPDATE $table_mailbox SET $setSql WHERE username='$fUsername' AND domain='$fDomain'");
@@ -73,6 +75,19 @@
db_log ($SESSID_USERNAME, $fDomain, 'edit_alias_state', $fAlias);
}
}
+ if ($fAliasDomain != '')
+ {
+ $result = db_query ("UPDATE $table_alias_domain SET $setSql WHERE alias_domain='$fDomain'");
+ if ($result['rows'] != 1)
+ {
+ $error = 1;
+ $tMessage = $PALANG['pEdit_alias_domain_result_error'];
+ }
+ else
+ {
+ db_log ($SESSID_USERNAME, $fDomain, 'edit_alias_domain_state', $fDomain);
+ }
+ }
}
if ($error != 1)
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/functions.inc.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -1636,10 +1636,14 @@
* Call: db_log (string username, string domain, string action, string data)
* Possible actions are:
* 'create_alias'
+ * 'create_alias_domain'
+ * 'create_mailbox'
* 'delete_alias'
+ * 'delete_alias_domain'
* 'delete_mailbox'
* 'edit_alias'
* 'edit_alias_state'
+ * 'edit_alias_domain_state'
* 'edit_mailbox'
* 'edit_mailbox_state'
* 'edit_password'
@@ -1650,7 +1654,7 @@
global $table_log;
$REMOTE_ADDR = $_SERVER['REMOTE_ADDR'];
- $action_list = array('create_alias', 'delete_alias', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_mailbox', 'edit_alias_state', 'edit_mailbox_state', 'edit_password');
+ $action_list = array('create_alias', 'create_alias_domain', 'delete_alias', 'delete_alias_domain', 'edit_alias', 'create_mailbox', 'delete_mailbox', 'edit_mailbox', 'edit_alias_state', 'edit_alias_domain_state', 'edit_mailbox_state', 'edit_password');
if(!in_array($action, $action_list)) {
die("Invalid log action : $action"); // could do with something better?
@@ -1814,6 +1818,42 @@
}
/*
+ Called after an alias_domain has been deleted in the DBMS.
+ Returns: boolean.
+ */
+function alias_domain_postdeletion($alias_domain)
+{
+ global $CONF;
+ $confpar='alias_domain_postdeletion_script';
+
+ if (!isset($CONF[$confpar]) || empty($CONF[$confpar]))
+ {
+ return true;
+ }
+
+ if (empty($alias_domain))
+ {
+ print '<p>Warning: empty alias_domain parameter.</p>';
+ return false;
+ }
+
+ $cmdarg1=escapeshellarg($alias_domain);
+ $command=$CONF[$confpar]." $cmdarg1";
+ $retval=0;
+ $output=array();
+ $firstline='';
+ $firstline=exec($command,$output,$retval);
+ if (0!=$retval)
+ {
+ error_log("Running $command yielded return value=$retval, first line of output=$firstline");
+ print '<p>WARNING: Problems running alias_domain postdeletion script!</p>';
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+/*
Called by mailbox_postcreation() after a mailbox has been
created. Immediately returns, unless configuration indicates
that one or more sub-folders should be created.
@@ -2124,6 +2164,7 @@
$table_admin = table_by_key ('admin');
$table_alias = table_by_key ('alias');
+$table_alias_domain = table_by_key ('alias_domain');
$table_domain = table_by_key ('domain');
$table_domain_admins = table_by_key ('domain_admins');
$table_log = table_by_key ('log');
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/languages/en.lang 2008-05-21 21:05:48 UTC (rev 363)
@@ -31,6 +31,7 @@
$PALANG['pMenu_main'] = 'Main';
$PALANG['pMenu_overview'] = 'Overview';
$PALANG['pMenu_create_alias'] = 'Add Alias';
+$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain';
$PALANG['pMenu_create_mailbox'] = 'Add Mailbox';
$PALANG['pMenu_fetchmail'] = 'Fetch Email';
$PALANG['pMenu_sendmail'] = 'Send Email';
@@ -53,16 +54,21 @@
$PALANG['pOverview_up_arrow'] = 'Go Top';
$PALANG['pOverview_right_arrow'] = 'Next Page';
$PALANG['pOverview_left_arrow'] = 'Previous Page';
-$PALANG['pOverview_alias_title'] = ':: Alias';
+$PALANG['pOverview_alias_domain_title'] = ':: Domain Aliases';
+$PALANG['pOverview_alias_title'] = ':: Aliases';
$PALANG['pOverview_mailbox_title'] = ':: Mailboxes';
$PALANG['pOverview_button'] = 'Go';
$PALANG['pOverview_welcome'] = 'Overview for ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains';
+$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:';
$PALANG['pOverview_alias_alias_count'] = 'Aliases';
$PALANG['pOverview_alias_mailbox_count'] = 'Mailboxes';
$PALANG['pOverview_alias_address'] = 'From';
$PALANG['pOverview_alias_goto'] = 'To';
$PALANG['pOverview_alias_modified'] = 'Last Modified';
+$PALANG['pOverview_alias_domain_modified'] = 'Last Modified';
$PALANG['pOverview_alias_active'] = 'Active';
+$PALANG['pOverview_alias_domain_active'] = 'Active';
$PALANG['pOverview_alias_edit'] = 'Alias';
$PALANG['and_x_more'] = '[and %s more...]';
$PALANG['pOverview_mailbox_username'] = 'Email';
@@ -76,6 +82,7 @@
$PALANG['pOverview_get_domain'] = 'Domain';
$PALANG['pOverview_get_aliases'] = 'Aliases';
+$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases';
$PALANG['pOverview_get_mailboxes'] = 'Mailboxes';
$PALANG['pOverview_get_quota'] = 'Mailbox Quota (MB)';
$PALANG['pOverview_get_modified'] = 'Last Modified';
@@ -84,8 +91,21 @@
$PALANG['pDelete_delete_success'] = '%s deleted.';
$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Unable to remove mailbox ';
$PALANG['pDelete_domain_error'] = '<span class="error_msg">This domain is not yours ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">This domain is not yours ';
$PALANG['pDelete_alias_error'] = '<span class="error_msg">Unable to delete alias ';
+$PALANG['pCreate_alias_domain_welcome'] = 'Mirror addresses of one of your domains to another.';
+$PALANG['pCreate_alias_domain_alias'] = 'Alias Domain';
+$PALANG['pCreate_alias_domain_alias_text'] = 'The domain that mails come in for.';
+$PALANG['pCreate_alias_domain_target'] = 'Target Domain';
+$PALANG['pCreate_alias_domain_target_text'] = 'The domain where mails should go to.';
+$PALANG['pCreate_alias_domain_active'] = 'Active';
+$PALANG['pCreate_alias_domain_button'] = 'Add Alias Domain';
+$PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.';
+$PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!';
+$PALANG['pCreate_alias_domain_error3'] = 'Database insert failed.';
+$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!';
+
$PALANG['pCreate_alias_welcome'] = 'Create a new alias for your domain.';
$PALANG['pCreate_alias_address'] = 'Alias';
$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">The ALIAS is not valid!</span>';
@@ -98,7 +118,7 @@
$PALANG['pCreate_alias_goto_text_error'] = 'Where the email needs to go.<br /><span class="error_msg">The TO is not valid!</span>';
$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Unable to add the alias to the alias table!</span>';
$PALANG['pCreate_alias_result_success'] = 'The alias has been added to the alias table!';
-$PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.<br />For domain to domain forwarding use "*@domain.tld" as to.';
+$PALANG['pCreate_alias_catchall_text'] = 'To create a catch-all use an "*" as alias.'; # XXX don't propagate usage of *@target-domain.com for domain-aliasing any longer
$PALANG['pEdit_alias_welcome'] = 'Edit an alias for your domain.<br />One entry per line.';
$PALANG['pEdit_alias_address'] = 'Alias';
@@ -108,6 +128,7 @@
$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">You didn\'t enter anything at To</span>';
$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">The email address that you have entered is not valid: ';
$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">This domain is not yours: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Unable to modify the alias domain!</span>';
$PALANG['pEdit_alias_forward_and_store'] = 'Deliver to the local mailbox.';
$PALANG['pEdit_alias_forward_only'] = 'Forward to given email addresses only.';
$PALANG['pEdit_alias_button'] = 'Edit Alias';
@@ -180,9 +201,12 @@
$PALANG['pViewlog_action_edit_mailbox'] = 'edit mailbox';
$PALANG['pViewlog_action_edit_mailbox_state'] = 'edit mailbox active';
$PALANG['pViewlog_action_create_alias'] = 'create alias';
+$PALANG['pViewlog_action_create_alias_domain'] = 'create alias domain';
$PALANG['pViewlog_action_delete_alias'] = 'delete alias';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'delete alias domain';
$PALANG['pViewlog_action_edit_alias'] = 'edit alias';
$PALANG['pViewlog_action_edit_alias_state'] = 'edit alias active';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'edit alias domain active';
$PALANG['pViewlog_action_edit_password'] = 'change password';
$PALANG['pViewlog_button'] = 'Go';
@@ -260,6 +284,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domain has been added!';
$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Unable to remove domain!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Unable to remove domain alias!</span>';
$PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain';
$PALANG['pAdminEdit_domain_domain'] = 'Domain';
Modified: trunk/list-virtual.php
===================================================================
--- trunk/list-virtual.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/list-virtual.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -72,12 +72,54 @@
exit(0);
}
+
+# Alias-Domains
+# first try to get a list of other domains pointing
+# to this currently chosen one (aka. alias domains)
+$query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY $table_alias_domain.alias_domain LIMIT $fDisplay, $page_size";
+if ('pgsql'==$CONF['database_type'])
+{
+ $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE target_domain='$fDomain' ORDER BY alias_domain LIMIT $page_size OFFSET $fDisplay";
+}
+$result = db_query ($query);
+if ($result['rows'] > 0)
+{
+ while ($row = db_array ($result['result']))
+ {
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $row['modified']=gmstrftime('%c %Z',$row['modified']);
+ $row['active']=('t'==$row['active']) ? 1 : 0;
+ }
+ $tAliasDomains[] = $row;
+ }
+}
+# now let's see if the current domain itself is an alias for another domain
+$query = "SELECT $table_alias_domain.alias_domain,$table_alias_domain.target_domain,$table_alias_domain.modified,$table_alias_domain.active FROM $table_alias_domain WHERE alias_domain='$fDomain'";
+if ('pgsql'==$CONF['database_type'])
+{
+ $query = "SELECT alias_domain,target_domain,extract(epoch from modified) as modified,active FROM $table_alias_domain WHERE alias_domain='$fDomain'";
+}
+$result = db_query ($query);
+if ($result['rows'] > 0)
+{
+ if($row = db_array ($result['result']))
+ {
+ if ('pgsql'==$CONF['database_type'])
+ {
+ $row['modified']=gmstrftime('%c %Z',$row['modified']);
+ $row['active']=('t'==$row['active']) ? 1 : 0;
+ }
+ $tTargetDomain = $row;
+ }
+}
+
+
$query = "SELECT $table_alias.address,$table_alias.goto,$table_alias.modified,$table_alias.active FROM $table_alias LEFT JOIN $table_mailbox ON $table_alias.address=$table_mailbox.username WHERE $table_alias.domain='$fDomain' AND $table_mailbox.maildir IS NULL ORDER BY $table_alias.address LIMIT $fDisplay, $page_size";
if ('pgsql'==$CONF['database_type'])
{
$query = "SELECT address,goto,extract(epoch from modified) as modified,active FROM $table_alias WHERE domain='$fDomain' AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address) ORDER BY address LIMIT $page_size OFFSET $fDisplay";
}
-
$result = db_query ($query);
if ($result['rows'] > 0)
{
Added: trunk/templates/create-alias-domain.php
===================================================================
--- trunk/templates/create-alias-domain.php (rev 0)
+++ trunk/templates/create-alias-domain.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -0,0 +1,49 @@
+<?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?>
+<div id="edit_form">
+<form name="alias_domain" method="post">
+<table>
+ <tr>
+ <td colspan="3"><h3><?php print $PALANG['pCreate_alias_domain_welcome']; ?></h3></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pCreate_alias_domain_alias'] . ":"; ?></td>
+ <td>
+ <select class="flat" name="alias_domain">
+ <?php
+ foreach ($list_domains as $dom)
+ {
+ if (isset($list_aliases[$dom]) || in_array($dom,$list_aliases)) continue;
+ print "<option value=\"$dom\"".(($fAliasDomain == $dom) ? ' selected' : '').">$dom</option>\n";
+ }
+ ?>
+ </select>
+ <td><?php print $PALANG['pCreate_alias_domain_alias_text']; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pCreate_alias_domain_target'] . ":"; ?></td>
+ <td>
+ <select class="flat" name="target_domain">
+ <?php
+ foreach ($list_domains as $dom)
+ {
+ if (isset($list_aliases[$dom])) continue;
+ print "<option value=\"$dom\"".(($fTargetDomain == $dom) ? ' selected' : '').">$dom</option>\n";
+ }
+ ?>
+ </select>
+ <td><?php print $PALANG['pCreate_alias_domain_target_text']; ?></td>
+ </tr>
+ <tr>
+ <td><?php print $PALANG['pCreate_alias_domain_active'] . ":"; ?></td>
+ <td><input class="flat" type="checkbox" name="active" value="1"<?php if ($fActive) { print ' checked'; } ?> /></td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td colspan="3" class="standout"><?php if ($error) { print '<span class="error_msg">'; } print $tMessage; if ($error) { print '</span>'; } ?></td>
+ </tr>
+ <tr>
+ <td colspan="3" class="hlp_center"><input class="button" type="submit" name="submit" value="<?php print $PALANG['pCreate_alias_domain_button']; ?>" /></td>
+ </tr>
+</table>
+</form>
+</div>
Modified: trunk/templates/list-virtual.php
===================================================================
--- trunk/templates/list-virtual.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/templates/list-virtual.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -1,7 +1,7 @@
<?php if( !defined('POSTFIXADMIN') ) die( "This file cannot be used standalone." ); ?>
<div id="overview">
-<form name="overview" method="post">
-<select name="fDomain" onChange="this.form.submit();">
+<form name="overview" method="get">
+<select name="domain" onChange="this.form.submit();">
<?php
$file = 'list-virtual.php';
@@ -71,6 +71,57 @@
}
print "</td></tr></table></div>\n";
+
+if ((sizeof ($tAliasDomains) > 0) || is_array ($tTargetDomain))
+{
+ print "<table id=\"alias_domain_table\">\n";
+ print " <tr>\n";
+ print " <td colspan=\"4\"><h3>" . $PALANG['pOverview_alias_domain_title'] . "</h3></td>";
+ print " </tr>";
+ if(sizeof ($tAliasDomains) > 0)
+ {
+ print " <tr class=\"header\">\n";
+ print " <td>" . sprintf($PALANG['pOverview_alias_domain_aliases'], $fDomain) . "</td>\n";
+ print " <td>" . $PALANG['pOverview_alias_domain_modified'] . "</td>\n";
+ print " <td>" . $PALANG['pOverview_alias_domain_active'] . "</td>\n";
+ print " <td> </td>\n";
+ print " </tr>\n";
+ for ($i = 0; $i < sizeof ($tAliasDomains); $i++)
+ {
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ print " <td><a href=\"$file?domain=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&limit=" . $current_limit . "\">" . $tAliasDomains[$i]['alias_domain'] . "</a></td>\n";
+ print " <td>" . $tAliasDomains[$i]['modified'] . "</td>\n";
+ $active = ($tAliasDomains[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+ print " <td><a href=\"edit-active.php?alias_domain=true&domain=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&return=$file" . urlencode ( "?domain=" . $fDomain . "&limit=" . $current_limit) . "\">" . $active . "</a></td>\n";
+ print " <td><a href=\"delete.php?table=alias_domain&delete=" . urlencode ($tAliasDomains[$i]['alias_domain']) . "&domain=$fDomain" . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_alias_domains'] . ": ". $tAliasDomains[$i]['alias_domain'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+ print " </tr>\n";
+ }
+ }
+
+ if(is_array($tTargetDomain))
+ {
+ print " <tr class=\"header\">\n";
+ print " <td>" . sprintf($PALANG['pOverview_alias_domain_target'], $fDomain) . "</td>\n";
+ print " <td>" . $PALANG['pOverview_alias_domain_modified'] . "</td>\n";
+ print " <td>" . $PALANG['pOverview_alias_domain_active'] . "</td>\n";
+ print " <td> </td>\n";
+ print " </tr>\n";
+ print " <tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+ print " <td><a href=\"$file?domain=" . urlencode ($tTargetDomain['target_domain']) . "&limit=" . $current_limit . "\">" . $tTargetDomain['target_domain'] . "</a></td>\n";
+ print " <td>" . $tTargetDomain['modified'] . "</td>\n";
+ $active = ($tTargetDomain['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
+ print " <td><a href=\"edit-active.php?alias_domain=true&domain=" . urlencode ($fDomain) . "&return=$file" . urlencode ( "?domain=" . $fDomain . "&limit=" . $current_limit) . "\">" . $active . "</a></td>\n";
+ print " <td><a href=\"delete.php?table=alias_domain&delete=" . urlencode ($fDomain) . "&domain=" . urlencode ($fDomain) . "\" onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_alias_domains'] . ": " . htmlentities ($fDomain) . "')\">" . $PALANG['del'] . "</a></td>\n";
+ print " </tr>\n";
+
+ }
+ print "</table>\n";
+ if (!is_array($tTargetDomain))
+ {
+ print "<p><a href=\"create-alias-domain.php?target_domain=$fDomain\">" . $PALANG['pMenu_create_alias_domain'] . "</a>\n";
+ }
+}
+
if (sizeof ($tAlias) > 0)
{
print "<table id=\"alias_table\">\n";
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-05-21 11:22:09 UTC (rev 362)
+++ trunk/upgrade.php 2008-05-21 21:05:48 UTC (rev 363)
@@ -534,6 +534,52 @@
$result = db_query_parsed("CREATE INDEX alias_address_active ON alias(address,active)");
}
+/**
+ * MySQL only alias_domain table
+ */
+function upgrade_300_mysql() {
+ $table_alias_domain = table_by_key('alias_domain');
+ // i just duplicate stuff from DATABASE_*.TXT over here?
+ if( $CONF['database_type'] == 'pgsql' ) {
+ // check if table already exists, if so, don't recreate it
+ $sql_table_exists =
+ "SELECT relname ".
+ " FROM pg_class ".
+ " WHERE relname = '$table_alias_domain'";
+ $res = db_query( $sql_table_exists );
+ if( $res['rows'] == 0 ) {
+ $sql_table_create =
+ "CREATE TABLE $table_alias_domain ( ".
+ " alias_domain character varying(255) NOT NULL REFERENCES domain(domain) ON DELETE CASCADE, ".
+ " target_domain character varying(255) NOT NULL REFERENCES domain(domain) ON DELETE CASCADE, ".
+ " created timestamp with time zone default now(), ".
+ " modified timestamp with time zone default now(), ".
+ " active boolean NOT NULL default true, ".
+ " Constraint \"alias_domain_pkey\" Primary Key (\"alias_domain\") ".
+ ")";
+ db_query( $sql_table_create );
+ $sql_table_index =
+ "CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)";
+ db_query( $sql_table_index );
+ $sql_table_comment =
+ "COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'";
+ db_query( $sql_table_comment );
+ }
+ } else { // database-type mysql assumed
+ $sql_table_create =
+ "CREATE TABLE IF NOT EXISTS `$table_alias_domain` ( ".
+ " `alias_domain` varchar(255) NOT NULL default '', ".
+ " `target_domain` varchar(255) NOT NULL default '', ".
+ " `created` datetime NOT NULL default '0000-00-00 00:00:00', ".
+ " `modified` datetime NOT NULL default '0000-00-00 00:00:00', ".
+ " `active` tinyint(1) NOT NULL default '1', ".
+ " PRIMARY KEY (`alias_domain`), ".
+ " KEY `active` (`active`), ".
+ " KEY `target_domain` (`target_domain`) ".
+ ") TYPE=MyISAM COMMENT='Postfix Admin - Domain Aliases'";
+ db_query( $sql_table_create );
+ }
+}
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN username DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
@@ -864,3 +910,46 @@
}
}
+/**
+ * Support alias_domain table
+ */
+function upgrade_362_mysql() {
+ # Table structure for table alias_domain
+ #
+ $table_alias_domain = table_by_key('alias_domain');
+ db_query_parsed("
+ CREATE TABLE IF NOT EXISTS $table_alias_domain (
+ `alias_domain` varchar(255) NOT NULL default '',
+ `target_domain` varchar(255) NOT NULL default '',
+ `created` datetime NOT NULL default '0000-00-00 00:00:00',
+ `modified` datetime NOT NULL default '0000-00-00 00:00:00',
+ `active` tinyint(1) NOT NULL default '1',
+ PRIMARY KEY (`alias_domain`),
+ KEY `active` (`active`),
+ KEY `target_domain` (`target_domain`)
+) TYPE=MyISAM COMMENT='Postfix Admin - Domain Aliases'");
+
+
+}
+
+/**
+ * Support alias_domain table
+ */
+function upgrade_362_pgsql() {
+ # Table structure for table alias_domain
+ $table_alias_domain = table_by_key('alias_domain');
+ $table_domain = table_by_key('domain');
+ if(_pgsql_object_exists($table_alias_domain)) {
+ return;
+ }
+ db_query_parsed(
+ "CREATE TABLE $table_alias_domain (
+ alias_domain character varying(255) NOT NULL REFERENCES $table_domain(domain) ON DELETE CASCADE,
+ target_domain character varying(255) NOT NULL REFERENCES $table_domain(domain) ON DELETE CASCADE,
+ created timestamp with time zone default now(),
+ modified timestamp with time zone default now(),
+ active boolean NOT NULL default true,
+ PRIMARY KEY(alias_domain))");
+ db_query_parsed("CREATE INDEX alias_domain_active ON $table_alias_domain(alias_domain,active)");
+ db_query_parsed("COMMENT ON TABLE $table_alias_domain IS 'Postfix Admin - Domain Aliases'");
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-05-21 11:22:04
|
Revision: 362
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=362&view=rev
Author: christian_boltz
Date: 2008-05-21 04:22:09 -0700 (Wed, 21 May 2008)
Log Message:
-----------
backup.php:
- also backup fetchmail table
Modified Paths:
--------------
trunk/backup.php
Modified: trunk/backup.php
===================================================================
--- trunk/backup.php 2008-05-15 06:10:54 UTC (rev 361)
+++ trunk/backup.php 2008-05-21 11:22:09 UTC (rev 362)
@@ -72,8 +72,18 @@
{
fwrite ($fh, $header);
- $tables = array('admin','alias','config','domain','domain_admins','log','mailbox','vacation','vacation_notification');
- # TODO: also backup fetchmail table
+ $tables = array(
+ 'admin',
+ 'alias',
+ 'config',
+ 'domain',
+ 'domain_admins',
+ 'fetchmail',
+ 'log',
+ 'mailbox',
+ 'vacation',
+ 'vacation_notification'
+ );
for ($i = 0 ; $i < sizeof ($tables) ; ++$i)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-05-15 06:10:54
|
Revision: 361
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=361&view=rev
Author: GingerDog
Date: 2008-05-14 23:10:54 -0700 (Wed, 14 May 2008)
Log Message:
-----------
config.inc.php: see https://sourceforge.net/forum/forum.php?thread_id=2038918&forum_id=676076
Modified Paths:
--------------
trunk/config.inc.php
Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php 2008-05-07 05:29:09 UTC (rev 360)
+++ trunk/config.inc.php 2008-05-15 06:10:54 UTC (rev 361)
@@ -49,7 +49,7 @@
// pgsql = PostgreSQL
$CONF['database_type'] = 'mysql';
$CONF['database_host'] = 'localhost';
-$CONF['database_user'] = 'postfixadmin';
+$CONF['database_user'] = 'postfix';
$CONF['database_password'] = 'postfixadmin';
$CONF['database_name'] = 'postfix';
$CONF['database_prefix'] = '';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-05-07 05:29:03
|
Revision: 360
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=360&view=rev
Author: GingerDog
Date: 2008-05-06 22:29:09 -0700 (Tue, 06 May 2008)
Log Message:
-----------
Norwegian (bokmal) translation - provided by oddhenriksen
Thanks!
Modified Paths:
--------------
trunk/languages/language.php
Added Paths:
-----------
trunk/languages/nb.lang
Modified: trunk/languages/language.php
===================================================================
--- trunk/languages/language.php 2008-05-07 05:23:47 UTC (rev 359)
+++ trunk/languages/language.php 2008-05-07 05:29:09 UTC (rev 360)
@@ -26,7 +26,8 @@
'lt' => 'Lietuvių - Lithuanian',
'mk' => 'Macedonian - Macedonian',
'nl' => 'Nederlands - Dutch',
- 'nn' => 'Norsk - Norwegian',
+ 'nb' => 'Norsk (bokmål) - Norwegian (bokmål)',
+ 'nn' => 'Norsk (nynorsk) - Norwegian (nynorsk)',
'pl' => 'Polski - Polish',
'pt-br' => 'Português - Brazilian portuguese',
'ru' => 'Русский - Russian',
Added: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang (rev 0)
+++ trunk/languages/nb.lang 2008-05-07 05:29:09 UTC (rev 360)
@@ -0,0 +1,393 @@
+<?php
+# $Id$
+//
+// Language file Norwegian (bokmål)
+// by Odd Henriksen
+//
+
+$PALANG['YES'] = 'JA';
+$PALANG['NO'] = 'NEI';
+$PALANG['edit'] = 'endre';
+$PALANG['del'] = 'slett';
+$PALANG['exit'] = 'Lukk';
+$PALANG['cancel'] = 'Avbryt';
+$PALANG['save'] = 'Lagre';
+$PALANG['confirm'] = 'Er du sikker på at du ønsker å slette dette?\n';
+$PALANG['confirm_domain'] = 'Ønsker du virkelig å slette alle oppføringer for dette domenet? Dette kan ikke angres!\n';
+$PALANG['check_update'] = 'Se etter oppdatering';
+$PALANG['invalid_parameter'] = 'Ugyldig parameter!';
+$PALANG['pFooter_logged_as'] = 'Logget inn som %s';
+
+$PALANG['pLogin_welcome'] = 'E-postadministratorer kan logge inn her for å administrere sine domener';
+$PALANG['pLogin_username'] = 'Brukernavn (e-postadresse)';
+$PALANG['pLogin_password'] = 'Passord';
+$PALANG['pLogin_button'] = 'Logg inn';
+$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.</span>';
+$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Feil passord!</span>';
+$PALANG['pLogin_login_users'] = 'Vanlige brukere kan klikke her for å gå til brukerseksjonen.';
+
+$PALANG['pMenu_main'] = 'Hoved';
+$PALANG['pMenu_overview'] = 'Oversikt';
+$PALANG['pMenu_create_alias'] = 'Legg til alias';
+$PALANG['pMenu_create_mailbox'] = 'Legg til e-postkonto';
+$PALANG['pMenu_fetchmail'] = 'Hent e-post';
+$PALANG['pMenu_sendmail'] = 'Send e-post';
+$PALANG['pMenu_password'] = 'Passord';
+$PALANG['pMenu_viewlog'] = 'Vis logg';
+$PALANG['pMenu_logout'] = 'Logg ut';
+
+$PALANG['pMain_welcome'] = 'Velkommen til Postfix Admin!';
+$PALANG['pMain_overview'] = 'Viser alle alias og epostkontoer. Du kan endre dem herfra.';
+$PALANG['pMain_create_alias'] = 'Opprett et nytt alias.';
+$PALANG['pMain_create_mailbox'] = 'Opprett en ny e-postkonto.';
+$PALANG['pMain_sendmail'] = 'Send en e-postmelding til en av dine nylig opprettede e-postkontoer.';
+$PALANG['pMain_password'] = 'Forandre passordet til din administratorkonto.';
+$PALANG['pMain_viewlog'] = 'Vis logg.';
+$PALANG['pMain_logout'] = 'Logg ut fra systemet';
+
+$PALANG['pOverview_disabled'] = 'Deaktivert';
+$PALANG['pOverview_unlimited'] = 'Ubegrenset';
+$PALANG['pOverview_title'] = ':: Definerte domener';
+$PALANG['pOverview_up_arrow'] = 'Gå til toppen';
+$PALANG['pOverview_right_arrow'] = 'Neste side';
+$PALANG['pOverview_left_arrow'] = 'Forrige side';
+$PALANG['pOverview_alias_title'] = ':: Alias';
+$PALANG['pOverview_mailbox_title'] = ':: Epostkontoer';
+$PALANG['pOverview_button'] = 'Vis';
+$PALANG['pOverview_welcome'] = 'Oversikt for ';
+$PALANG['pOverview_alias_alias_count'] = 'Alias';
+$PALANG['pOverview_alias_mailbox_count'] = 'Epostkontoer';
+$PALANG['pOverview_alias_address'] = 'Fra';
+$PALANG['pOverview_alias_goto'] = 'Til';
+$PALANG['pOverview_alias_modified'] = 'Sist endret';
+$PALANG['pOverview_alias_active'] = 'Aktiv';
+$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[og %s flere...]';
+$PALANG['pOverview_mailbox_username'] = 'E-post';
+$PALANG['pOverview_mailbox_name'] = 'Navn';
+$PALANG['pOverview_mailbox_quota'] = 'Kvote (MB)';
+$PALANG['pOverview_mailbox_modified'] = 'Sist endret';
+$PALANG['pOverview_mailbox_active'] = 'Aktiv';
+$PALANG['pOverview_vacation_edit'] = 'FRAVÆRSMELDING ER PÅ';
+$PALANG['pOverview_vacation_option'] = 'Sett fraværsmelding';
+
+$PALANG['pOverview_get_domain'] = 'Domene';
+$PALANG['pOverview_get_aliases'] = 'Alias';
+$PALANG['pOverview_get_mailboxes'] = 'Epostkontoer';
+$PALANG['pOverview_get_quota'] = 'Kvote for e-postkonto (MB)';
+$PALANG['pOverview_get_modified'] = 'Sist endret';
+
+$PALANG['pDelete_delete_error'] = '<span class="error_msg">Kan ikke slette oppføringen ';
+$PALANG['pDelete_delete_success'] = '%s slettet.';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Kan ikke slette e-postkontoen ';
+$PALANG['pDelete_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Kan ikke slette alias ';
+
+$PALANG['pCreate_alias_welcome'] = 'Opprett et nytt alias.';
+$PALANG['pCreate_alias_address'] = 'Alias';
+$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Aliaset er ikke gyldig!</span>';
+$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Denne e-postadressen eksisterer allerede, vennligst velg en annen!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Du har nådd grensen for antall aliaser under dette domenet!</span>';
+$PALANG['pCreate_alias_goto'] = 'Til';
+$PALANG['pCreate_alias_active'] = 'Aktiv';
+$PALANG['pCreate_alias_button'] = 'Legg til alias';
+$PALANG['pCreate_alias_goto_text'] = 'Hvor e-postmeldingen skal videresendes til.';
+$PALANG['pCreate_alias_goto_text_error'] = 'Hvor e-postmeldingen skal videresendes til.<br /><span class="error_msg">Til-adressen er ikke gyldig!</span>';
+$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Kunne ikke legge til aliaset i alias-tabellen!</span>';
+$PALANG['pCreate_alias_result_success'] = 'Aliaset er blitt lagt til i alias-tabellen!';
+$PALANG['pCreate_alias_catchall_text'] = 'For å opprette et "catch-all"-alias, bruk "*" som alias.<br />For domene-til-domene-videresending, bruk "*@domene.tld" i Til-feltet.';
+$PALANG['pEdit_alias_welcome'] = 'Endre et alias.<br />Én e-postadresse per linje.';
+$PALANG['pEdit_alias_address'] = 'Alias';
+$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Finner ikke aliaset!</span>';
+$PALANG['pEdit_alias_goto'] = 'Til';
+$PALANG['pEdit_alias_active'] = 'Aktiv';
+$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Du skrev ingenting i Til-feltet</span>';
+$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">E-postadressen er ikke gyldig: ';
+$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke: ';
+$PALANG['pEdit_alias_forward_and_store'] = 'Lever til den lokale e-postkontoen i tillegg.';
+$PALANG['pEdit_alias_forward_only'] = 'Bare videresend til de angitte e-postadressene.';
+$PALANG['pEdit_alias_button'] = 'Endre alias';
+$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Kan ikke endre aliaset!</span>';
+
+$PALANG['pCreate_mailbox_welcome'] = 'Opprett en ny e-postkonto.';
+$PALANG['pCreate_mailbox_username'] = 'Brukernavn';
+$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">E-postadressen er ikke gyldig!</span>';
+$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">E-postadressen eksisterer allerede, vennligst velg en annen!</span>';
+$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Du har nådd grensen for antall e-postkontoer under dette domenet!</span>';
+$PALANG['pCreate_mailbox_password'] = 'Passord';
+$PALANG['pCreate_mailbox_password2'] = 'Passord (bekreft)';
+$PALANG['pCreate_mailbox_password_text'] = 'Passord for POP3/IMAP';
+$PALANG['pCreate_mailbox_password_text_error'] = 'Passord for POP3/IMAP<br /><span class="error_msg">Passordene du oppga stemmer ikke overens!<br />Eller du har ikke fylt ut feltene!</span>';
+$PALANG['pCreate_mailbox_name'] = 'Navn';
+$PALANG['pCreate_mailbox_name_text'] = 'Fullt navn';
+$PALANG['pCreate_mailbox_quota'] = 'Kvote';
+$PALANG['pCreate_mailbox_quota_text'] = 'MB';
+$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Kvoten du har angitt er for høy!</span>';
+$PALANG['pCreate_mailbox_active'] = 'Aktiv';
+$PALANG['pCreate_mailbox_mail'] = 'Send velkomstmelding';
+$PALANG['pCreate_mailbox_button'] = 'Opprett e-postkonto';
+$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Kunne ikke legge til e-postkontoen i mailbox-tabellen!</span>';
+$PALANG['pCreate_mailbox_result_success'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'E-postkontoen er blitt opprettet i mailbox-tabellen, men ingen (eller kun noen) av de forhåndsdefinerte undermappene kunne opprettes.';
+
+$PALANG['pEdit_mailbox_welcome'] = 'Endre en e-postkonto.';
+$PALANG['pEdit_mailbox_username'] = 'Brukernavn';
+$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Fant ikke e-postkontoen!</span>';
+$PALANG['pEdit_mailbox_password'] = 'Nytt passord';
+$PALANG['pEdit_mailbox_password2'] = 'Nytt passord (bekreft)';
+$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">Passordene du oppga stemmer ikke overens!</span>';
+$PALANG['pEdit_mailbox_name'] = 'Navn';
+$PALANG['pEdit_mailbox_name_text'] = 'Fullt navn';
+$PALANG['pEdit_mailbox_quota'] = 'Kvote';
+$PALANG['pEdit_mailbox_quota_text'] = 'MB';
+$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">Kvoten du har angitt er for høy!</span>';
+$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Dette domenet tilhører deg ikke: ';
+$PALANG['pEdit_mailbox_button'] = 'Endre e-postkonto';
+$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Kunne ikke endre e-postkontoen!</span>';
+
+$PALANG['pPassword_welcome'] = 'Endring av passord.';
+$PALANG['pPassword_admin'] = 'Brukernavn';
+$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">Ingen e-postkonto stemmer overens med brukernavnet du oppga!</span>';
+$PALANG['pPassword_password_current'] = 'Nåværende passord';
+$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Du oppga ikke ditt nåværende passord!</span>';
+$PALANG['pPassword_password'] = 'Nytt passord';
+$PALANG['pPassword_password2'] = 'Nytt passord (bekreft)';
+$PALANG['pPassword_password_text_error'] = '<span class="error_msg">Passordene du oppga stemmer ikke overens!<br />Eller du har ikke fylt ut feltene!</span>';
+$PALANG['pPassword_button'] = 'Endre passord';
+$PALANG['pPassword_result_error'] = '<span class="error_msg">Kunne ikke endre passordet ditt!</span>';
+$PALANG['pPassword_result_success'] = 'Ditt passord er nå endret!';
+$PALANG['pEdit_vacation_set'] = 'Endre / angi fraværsmelding';
+$PALANG['pEdit_vacation_remove'] = 'Fjern fraværsmelding';
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Kunne ikke oppdatere innstillinger for automatisk svar!</span>';
+$PALANG['pVacation_result_removed'] = 'Automatisk svar har blitt fjernet!';
+$PALANG['pVacation_result_added'] = 'Automatisk svar har blitt aktivert!';
+
+$PALANG['pViewlog_welcome'] = 'Vis de 10 siste handlingene for ';
+$PALANG['pViewlog_timestamp'] = 'Klokkeslett';
+$PALANG['pViewlog_username'] = 'Administrator';
+$PALANG['pViewlog_domain'] = 'Domene';
+$PALANG['pViewlog_action'] = 'Handling';
+$PALANG['pViewlog_data'] = 'Data';
+$PALANG['pViewlog_action_create_mailbox'] = 'opprett e-postkonto';
+$PALANG['pViewlog_action_delete_mailbox'] = 'slett e-postkonto';
+$PALANG['pViewlog_action_edit_mailbox'] = 'rediger e-postkonto';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'rediger e-postkontostatus';
+$PALANG['pViewlog_action_create_alias'] = 'opprett alias';
+$PALANG['pViewlog_action_delete_alias'] = 'slett alias';
+$PALANG['pViewlog_action_edit_alias'] = 'rediger alias';
+$PALANG['pViewlog_action_edit_alias_state'] = 'rediger aliasstatus';
+$PALANG['pViewlog_action_edit_password'] = 'endre passord';
+
+$PALANG['pViewlog_button'] = 'Vis';
+$PALANG['pViewlog_result_error'] = '<span class="error_msg">Finner ikke den aktuelle loggen!</span>';
+
+$PALANG['pSendmail_welcome'] = 'Send en e-postmelding.';
+$PALANG['pSendmail_admin'] = 'Fra';
+$PALANG['pSendmail_to'] = 'Til';
+$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Til-feltet er ikke fylt ut eller inneholder en ugyldig e-postadresse!</span>';
+$PALANG['pSendmail_subject'] = 'Emne';
+$PALANG['pSendmail_subject_text'] = 'Velkommen';
+$PALANG['pSendmail_body'] = 'Meldingstekst';
+$PALANG['pSendmail_button'] = 'Send melding';
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Kunne ikke sende e-postmeldingen!</span>';
+$PALANG['pSendmail_result_success'] = 'E-postmeldingen er sendt!';
+
+$PALANG['pAdminMenu_list_admin'] = 'Administratorer';
+$PALANG['pAdminMenu_list_domain'] = 'Domener';
+$PALANG['pAdminMenu_list_virtual'] = 'Virtuell oversikt';
+$PALANG['pAdminMenu_viewlog'] = 'Vis logg';
+$PALANG['pAdminMenu_backup'] = 'Sikkerhetskopi';
+$PALANG['pAdminMenu_create_domain_admins'] = 'Domeneadministratorer';
+$PALANG['pAdminMenu_create_admin'] = 'Ny administrator';
+$PALANG['pAdminMenu_create_domain'] = 'Nytt domene';
+$PALANG['pAdminMenu_create_alias'] = 'Legg til alias';
+$PALANG['pAdminMenu_create_mailbox'] = 'Legg til e-postkonto';
+
+$PALANG['pAdminList_admin_domain'] = 'Domene';
+$PALANG['pAdminList_admin_username'] = 'Administrator';
+$PALANG['pAdminList_admin_count'] = 'Domener';
+$PALANG['pAdminList_admin_modified'] = 'Sist endret';
+$PALANG['pAdminList_admin_active'] = 'Aktiv';
+
+$PALANG['pAdminList_domain_domain'] = 'Domene';
+$PALANG['pAdminList_domain_description'] = 'Beskrivelse';
+$PALANG['pAdminList_domain_aliases'] = 'Alias';
+$PALANG['pAdminList_domain_mailboxes'] = 'Epostkontoer';
+$PALANG['pAdminList_domain_maxquota'] = 'Makskvote (MB)';
+$PALANG['pAdminList_domain_transport'] = 'Transport';
+$PALANG['pAdminList_domain_backupmx'] = 'Backup-MX';
+$PALANG['pAdminList_domain_modified'] = 'Sist endret';
+$PALANG['pAdminList_domain_active'] = 'Aktiv';
+
+$PALANG['pAdminList_virtual_button'] = 'Vis';
+$PALANG['pAdminList_virtual_welcome'] = 'Oversikt for ';
+$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
+$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'E-postkontoer';
+$PALANG['pAdminList_virtual_alias_address'] = 'Fra';
+$PALANG['pAdminList_virtual_alias_goto'] = 'Til';
+$PALANG['pAdminList_virtual_alias_modified'] = 'Sist endret';
+$PALANG['pAdminList_virtual_mailbox_username'] = 'E-post';
+$PALANG['pAdminList_virtual_mailbox_name'] = 'Navn';
+$PALANG['pAdminList_virtual_mailbox_quota'] = 'Kvote (MB)';
+$PALANG['pAdminList_virtual_mailbox_modified'] = 'Sist endret';
+$PALANG['pAdminList_virtual_mailbox_active'] = 'Aktiv';
+
+$PALANG['pAdminCreate_domain_welcome'] = 'Legg til et nytt domene';
+$PALANG['pAdminCreate_domain_domain'] = 'Domene';
+$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">Domenet finnes allerede!</span>';
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domenet er ugyldig!</span>';
+$PALANG['pAdminCreate_domain_description'] = 'Beskrivelse';
+$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
+$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminCreate_domain_mailboxes'] = 'E-postkontoer';
+$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminCreate_domain_maxquota'] = 'Makskvote';
+$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminCreate_domain_transport'] = 'Transport';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Definer transport';
+$PALANG['pAdminCreate_domain_defaultaliases'] = 'Legg til standard-aliasadresser';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'E-postserveren er backup-MX';
+$PALANG['pAdminCreate_domain_button'] = 'Legg til domene';
+$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Kunne ikke opprette domenet!</span>';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet!';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Kunne ikke fjerne domenet!</span>';
+
+$PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene';
+$PALANG['pAdminEdit_domain_domain'] = 'Domene';
+$PALANG['pAdminEdit_domain_description'] = 'Beskrivelse';
+$PALANG['pAdminEdit_domain_aliases'] = 'Alias';
+$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminEdit_domain_mailboxes'] = 'E-postkontoer';
+$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminEdit_domain_maxquota'] = 'Makskvote';
+$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = deaktiver | 0 = ubegrenset';
+$PALANG['pAdminEdit_domain_transport'] = 'Transport';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Definer transport';
+$PALANG['pAdminEdit_domain_backupmx'] = 'E-postserveren er backup-MX';
+$PALANG['pAdminEdit_domain_active'] = 'Aktiv';
+$PALANG['pAdminEdit_domain_button'] = 'Endre domene';
+$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Kunne ikke endre domenet!</span>';
+
+$PALANG['pAdminCreate_admin_welcome'] = 'Legg til en ny domeneadministrator';
+$PALANG['pAdminCreate_admin_username'] = 'Administrator';
+$PALANG['pAdminCreate_admin_username_text'] = 'E-postadresse';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'E-postadresse<br /><span class="error_msg">Du har ikke skrevet inn en gyldig e-postadresse!</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'E-postadresse<br /><span class="error_msg">Administratoren er allerede definert, eller du har skrevet inn en ugyldig adresse</span>';
+$PALANG['pAdminCreate_admin_password'] = 'Passord';
+$PALANG['pAdminCreate_admin_password2'] = 'Passord (bekreft)';
+$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">Passordene du oppga stemmer ikke overens!<br />Eller du har ikke fylt ut feltene!</span>';
+$PALANG['pAdminCreate_admin_button'] = 'Legg til en administrator';
+$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Kunne ikke legge til administratoren!</span>';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administratoren er lagt til!';
+$PALANG['pAdminCreate_admin_address'] = 'Domene';
+
+$PALANG['pAdminEdit_admin_welcome'] = 'Endre domeneadministrator';
+$PALANG['pAdminEdit_admin_username'] = 'Administrator';
+$PALANG['pAdminEdit_admin_password'] = 'Passord';
+$PALANG['pAdminEdit_admin_password2'] = 'Passord (bekreft)';
+$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">Passordene du oppga stemmer ikke overens!<br />Eller du har ikke fylt ut feltene!</span>';
+$PALANG['pAdminEdit_admin_active'] = 'Aktiv';
+$PALANG['pAdminEdit_admin_super_admin'] = 'Super-administrator';
+$PALANG['pAdminEdit_admin_button'] = 'Endre administrator';
+$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Klarte ikke å endre administratoren!</span>';
+$PALANG['pAdminEdit_admin_result_success'] = 'Administratoren er blitt endret!';
+
+$PALANG['pUsersLogin_welcome'] = 'Brukere kan logge inn her for å endre passord og videresending.';
+$PALANG['pUsersLogin_username'] = 'Brukernavn (e-postadresse)';
+$PALANG['pUsersLogin_password'] = 'Passord';
+$PALANG['pUsersLogin_button'] = 'Logg inn';
+$PALANG['pUsersLogin_username_incorrect'] = 'Påloggingsinformasjonen er ikke korrekt. Husk å bruke e-postadressen som brukernavn.';
+$PALANG['pUsersLogin_password_incorrect'] = 'Feil passord!';
+
+$PALANG['pUsersMenu_vacation'] = 'Automatisk svar';
+$PALANG['pUsersMenu_edit_alias'] = 'Endre videresending';
+$PALANG['pUsersMenu_password'] = 'Endre passord';
+
+$PALANG['pUsersMain_vacation'] = 'Angi en fraværsmelding eller annet automatisk svar.';
+$PALANG['pUsersMain_vacationSet'] = 'Automatisk svar er PÅ, klikk \'Automatisk svar\' for å endre/fjerne';
+$PALANG['pUsersMain_edit_alias'] = 'Endre videresending.';
+$PALANG['pUsersMain_password'] = 'Endre passordet ditt.';
+
+$PALANG['pUsersVacation_welcome'] = 'Automatisk svar.';
+$PALANG['pUsersVacation_welcome_text'] = 'Du har allerede et autosvar aktivert!';
+$PALANG['pUsersVacation_subject'] = 'Emne';
+$PALANG['pUsersVacation_subject_text'] = 'Fraværsmelding';
+$PALANG['pUsersVacation_body'] = 'Meldingstekst';
+$PALANG['pUsersVacation_body_text'] = <<<EOM
+Jeg er utilgjengelig fra <date> til <date>.
+Dersom det gjelder noe viktig kan du kontakte <contact person>.
+EOM;
+$PALANG['pUsersVacation_button_away'] = 'Merk meg som fraværende';
+$PALANG['pUsersVacation_button_back'] = 'Merk meg som tilstede';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Kunne ikke oppdatere dine autosvar-innstillinger!</span>';
+$PALANG['pUsersVacation_result_success'] = 'Ditt automatiske svar er blitt fjernet!';
+
+$PALANG['pCreate_dbLog_createmailbox'] = 'opprett e-postkonto';
+$PALANG['pCreate_dbLog_createalias'] = 'opprett alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'slett alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'slett e-postkonto';
+$PALANG['pEdit_dbLog_editactive'] = 'endre status';
+$PALANG['pEdit_dbLog_editalias'] = 'endre alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'endre e-postkonto';
+
+$PALANG['pSearch'] = 'søk';
+$PALANG['pSearch_welcome'] = 'Søker etter: ';
+$PALANG['pReturn_to'] = 'Returner til';
+$PALANG['pBroadcast_title'] = 'Send masseutsendelse';
+$PALANG['pBroadcast_from'] = 'Fra';
+$PALANG['pBroadcast_name'] = 'Ditt navn';
+$PALANG['pBroadcast_subject'] = 'Emne';
+$PALANG['pBroadcast_message'] = 'Melding';
+$PALANG['pBroadcast_send'] = 'Send melding';
+$PALANG['pBroadcast_success'] = 'Masseutsendelsesmeldingen ble sendt.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Send masseutsendelse';
+$PALANG['pBroadcast_error_empty'] = 'Feltene Ditt navn, Emne og Melding kan ikke være tomme!';
+$PALANG['pStatus_undeliverable'] = 'kan kanskje IKKE LEVERES ';
+$PALANG['pStatus_custom'] = 'Leverer til ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+$PALANG['pPasswordTooShort'] = "Passordet er for kort - det må inneholde minst %s tegn";
+$PALANG['pFetchmail_welcome'] = 'Hent e-post for:';
+$PALANG['pFetchmail_new_entry'] = 'Ny oppføring';
+$PALANG['pFetchmail_database_save_error'] = 'Kunne ikke lagre denne oppføringen i databasen!';
+$PALANG['pFetchmail_database_save_success'] = 'Oppføringen ble lagret i databasen.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Ingen oppføring med ID %s ble funnet!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Ugyldig e-postkonto!';
+$PALANG['pFetchmail_server_missing'] = 'Vennligst skriv inn navnet på den eksterne serveren!';
+$PALANG['pFetchmail_user_missing'] = 'Vennligst skriv inn det eksterne brukernavnet!';
+$PALANG['pFetchmail_password_missing'] = 'Vennligst skriv inn det eksterne passordet!';
+
+$PALANG['pFetchmail_field_id'] = 'ID';
+$PALANG['pFetchmail_field_mailbox'] = 'E-postkonto';
+$PALANG['pFetchmail_field_src_server'] = 'Server';
+$PALANG['pFetchmail_field_src_auth'] = 'Autentiseringstype';
+$PALANG['pFetchmail_field_src_user'] = 'Bruker';
+$PALANG['pFetchmail_field_src_password'] = 'Passord';
+$PALANG['pFetchmail_field_src_folder'] = 'Mappe';
+$PALANG['pFetchmail_field_poll_time'] = 'Spørringsintervall';
+$PALANG['pFetchmail_field_fetchall'] = 'Hent alt';
+$PALANG['pFetchmail_field_keep'] = 'Behold';
+$PALANG['pFetchmail_field_protocol'] = 'Protokoll';
+$PALANG['pFetchmail_field_extra_options'] = 'Ekstra alternativer';
+$PALANG['pFetchmail_field_mda'] = 'MDA';
+$PALANG['pFetchmail_field_date'] = 'Dato';
+$PALANG['pFetchmail_field_returned_text'] = 'Returnert tekst';
+$PALANG['pFetchmail_desc_id'] = 'Oppførings-ID';
+$PALANG['pFetchmail_desc_mailbox'] = 'Lokal e-postkonto';
+$PALANG['pFetchmail_desc_src_server'] = 'Ekstern server';
+$PALANG['pFetchmail_desc_src_auth'] = 'Vanligvis \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Eksternt brukernavn';
+$PALANG['pFetchmail_desc_src_password'] = 'Eksternt passord';
+$PALANG['pFetchmail_desc_src_folder'] = 'Ekstern mappe';
+$PALANG['pFetchmail_desc_poll_time'] = 'Se etter meldinger hvert ... minutt';
+$PALANG['pFetchmail_desc_fetchall'] = 'Hent både gamle og nye meldinger';
+$PALANG['pFetchmail_desc_keep'] = 'Behold meldingene på den eksterne e-postserveren';
+$PALANG['pFetchmail_desc_protocol'] = 'Protokoll som skal brukes';
+$PALANG['pFetchmail_desc_extra_options'] = 'Ekstra fetchmail-alternativer';
+$PALANG['pFetchmail_desc_mda'] = 'E-postleveringsagent (Mail Delivery Agent)';
+$PALANG['pFetchmail_desc_date'] = 'Dato for siste spørring/konfigurasjonsendring';
+$PALANG['pFetchmail_desc_returned_text'] = 'Tekstmelding fra siste spørring';
+
+$PALANG['please_keep_this_as_last_entry'] = ''; # needed for language-check.sh
+/* vim: set expandtab ft=php softtabstop=3 tabstop=3 shiftwidth=3: */
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-05-07 05:23:43
|
Revision: 359
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=359&view=rev
Author: GingerDog
Date: 2008-05-06 22:23:47 -0700 (Tue, 06 May 2008)
Log Message:
-----------
templates/header.php: force UTF8 via Apache/http - as per https://sourceforge.net/tracker/index.php?func=detail&aid=1959206&group_id=191583&atid=937964 and https://sourceforge.net/forum/forum.php?thread_id=2030718&forum_id=676076 - thanks
Modified Paths:
--------------
trunk/templates/header.php
Modified: trunk/templates/header.php
===================================================================
--- trunk/templates/header.php 2008-04-30 21:06:20 UTC (rev 358)
+++ trunk/templates/header.php 2008-05-07 05:23:47 UTC (rev 359)
@@ -5,6 +5,7 @@
@header ("Cache-Control: no-store, no-cache, must-revalidate");
@header ("Cache-Control: post-check=0, pre-check=0", false);
@header ("Pragma: no-cache");
+@header ("Content-Type: text/html; charset=UTF-8");
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
8 messages has been excluded from this view by a project administrator.
