postfixadmin-svn Mailing List for PostfixAdmin (Page 100)
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
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <chr...@us...> - 2008-12-23 00:03:13
|
Revision: 504
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=504&view=rev
Author: christian_boltz
Date: 2008-12-23 00:03:08 +0000 (Tue, 23 Dec 2008)
Log Message:
-----------
edit-domain.php:
- only change transport if $CONF['transport'] is YES. Otherwise leave it
untouched (instead of changing it to $CONF['transport_default'])
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-15 21:29:08 UTC (rev 503)
+++ trunk/edit-domain.php 2008-12-23 00:03:08 UTC (rev 504)
@@ -99,8 +99,12 @@
$sqlActive = db_get_boolean(False);
}
+ $sqltransport = "";
+ if($CONF['transport'] != 'NO') { # only change transport if it is allowed in config. Otherwise, keep the old value.
+ $sqltransport = "transport='$fTransport',";
+ }
- $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
+ $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,$sqltransport backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
if ($result['rows'] == 1)
{
header ("Location: list-domain.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-15 21:29:12
|
Revision: 503
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=503&view=rev
Author: GingerDog
Date: 2008-12-15 21:29:08 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
checked=checked is more proper, right?
Modified Paths:
--------------
trunk/templates/admin_edit-domain.php
Modified: trunk/templates/admin_edit-domain.php
===================================================================
--- trunk/templates/admin_edit-domain.php 2008-12-15 21:28:41 UTC (rev 502)
+++ trunk/templates/admin_edit-domain.php 2008-12-15 21:29:08 UTC (rev 503)
@@ -55,13 +55,13 @@
<?php } ?>
<tr>
<td><?php print $PALANG['pAdminEdit_domain_backupmx'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
+ <td><?php $checked = (!empty ($tBackupmx)) ? 'checked=checked' : ''; ?>
<input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> /></td>
<td> </td>
</tr>
<tr>
<td><?php print $PALANG['pAdminEdit_domain_active'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tActive)) ? 'checked' : ''; ?>
+ <td><?php $checked = (!empty ($tActive)) ? 'checked=checked' : ''; ?>
<input class="flat" type="checkbox" name="fActive" <?php print $checked; ?> /></td>
<td> </td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-15 21:28:45
|
Revision: 502
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=502&view=rev
Author: GingerDog
Date: 2008-12-15 21:28:41 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
create-domain.php: try and remove code duplication, expand use of $form_fields (defaults etc); only allow valid transport values through
Modified Paths:
--------------
trunk/create-domain.php
trunk/templates/admin_create-domain.php
Modified: trunk/create-domain.php
===================================================================
--- trunk/create-domain.php 2008-12-15 21:27:31 UTC (rev 501)
+++ trunk/create-domain.php 2008-12-15 21:28:41 UTC (rev 502)
@@ -41,50 +41,61 @@
authentication_require_role('global-admin');
+$form_fields = array(
+ 'fDomain' => array('type' => 'str', 'default' => null),
+ 'fDescription' => array('type' => 'str', 'default' =>''),
+ 'fAliases' => array('type' => 'int', 'default' => $CONF['aliases']),
+ 'fMailboxes' => array('type' => 'int', 'default' => $CONF['mailboxes']),
+ 'fMaxquota' => array('type' => 'int', 'default' => $CONF['maxquota']),
+ 'fTransport' => array('type' => 'str', 'default' => $CONF['transport_default'], 'options' => $CONF['transport_options']),
+ 'fDefaultaliases' => array('type' => 'str', 'default' => 'off', 'options' => array('on', 'off')),
+ 'fBackupmx' => array('type' => 'str', 'default' => 'off', 'options' => array('on', 'off'))
+);
+
+foreach($form_fields as $key => $default) {
+ if(isset($_POST[$key]) && (!empty($_POST[$key]))) {
+ $$key = escape_string($_POST[$key]);
+ }
+ else {
+ $$key = $default['default'];
+ }
+ if($default['type'] == 'int') {
+ $$key = intval($$key);
+ }
+ if($default['type'] == 'str') {
+ $$key = strip_tags($$key); /* should we even bother? */
+ }
+ if(isset($default['options'])) {
+ if(!in_array($$key, $default['options'])) {
+ die("Invalid parameter given for $key");
+ }
+ }
+}
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- $tAliases = $CONF['aliases'];
- $tMailboxes = $CONF['mailboxes'];
- $tMaxquota = $CONF['maxquota'];
- $tTransport = $CONF['transport_default'];
+ /* default values as set above */
+ $tTransport = $fTransport;
+ $tAliases = $fAliases;
+ $tMaxquota = $fMaxquota;
+ $tMailboxes = $fMailboxes;
+ $tDefaultAliases = $fDefaultaliases;
+ $tBackupmx = $fBackupmx;
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset($_POST['fDomain'])) {
- $fDomain = escape_string($_POST['fDomain']);
- }
- $form_fields = array(
- 'fDescription' => '',
- 'fAliases' => '0',
- 'fMailboxes' => '0',
- 'fMaxquota' => '0',
- 'fTransport' => $CONF['transport_default'],
- 'fDefaultaliases' => '0',
- 'fBackupmx' => '0' );
-
- foreach($form_fields as $key => $default) {
- if(isset($_POST[$key]) && (!empty($_POST[$key]))) {
- $$key = escape_string($_POST[$key]);
- }
- else {
- $$key = $default;
- }
- }
-
-
- if (empty($fDomain) or domain_exist($fDomain) or !check_domain($fDomain))
+ if ($fDomain == null or domain_exist($fDomain) or !check_domain($fDomain))
{
$error = 1;
- $tDomain = escape_string ($_POST['fDomain']);
- $tDescription = escape_string ($_POST['fDescription']);
- $tAliases = escape_string ($_POST['fAliases']);
- $tMailboxes = escape_string ($_POST['fMailboxes']);
- if (isset ($_POST['fMaxquota'])) $tMaxquota = escape_string ($_POST['fMaxquota']);
- if (isset ($_POST['fTransport'])) $tTransport = escape_string ($_POST['fTransport']);
- if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = escape_string ($_POST['fDefaultaliases']);
- if (isset ($_POST['fBackupmx'])) $tBackupmx = escape_string ($_POST['fBackupmx']);
- /* if (empty ($fDomain) or !check_domain ($fDomain)) */ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
+ $tDomain = $fDomain;
+ $tDescription = $fDescription;
+ $tAliases = $fAliases;
+ $tMailboxes = $fMailboxes;
+ if (isset ($_POST['fMaxquota'])) $tMaxquota = $fMaxquota;
+ if (isset ($_POST['fTransport'])) $tTransport = $fTransport;
+ if (isset ($_POST['fDefaultaliases'])) $tDefaultaliases = $fDefaultaliases;
+ if (isset ($_POST['fBackupmx'])) $tBackupmx = $fBackupmx;
+ $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error2'];
if (domain_exist ($fDomain)) $pAdminCreate_domain_domain_text = $PALANG['pAdminCreate_domain_domain_text_error'];
}
Modified: trunk/templates/admin_create-domain.php
===================================================================
--- trunk/templates/admin_create-domain.php 2008-12-15 21:27:31 UTC (rev 501)
+++ trunk/templates/admin_create-domain.php 2008-12-15 21:28:41 UTC (rev 502)
@@ -55,15 +55,15 @@
<?php } ?>
<tr>
<td><?php print $PALANG['pAdminCreate_domain_defaultaliases'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tDefaultaliases)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fDefaultaliases" <?php print $checked; ?> />
+ <td><?php $checked = ($tDefaultaliases == 'on') ? 'checked=checked' : ''; ?>
+ <input class="flat" type="checkbox" value='on' name="fDefaultaliases" <?php print $checked; ?> />
</td>
<td><?php print $PALANG['pAdminCreate_domain_defaultaliases_text']; ?></td>
</tr>
<tr>
<td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
- <td><?php $checked = (!empty ($tBackupmx)) ? 'checked' : ''; ?>
- <input class="flat" type="checkbox" name="fBackupmx" <?php print $checked; ?> />
+ <td><?php $checked = ($tBackupmx == 'on') ? 'checked' : ''; ?>
+ <input class="flat" type="checkbox" value='on' name="fBackupmx" <?php print $checked; ?> />
</td>
<td> </td>
</tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-15 21:27:36
|
Revision: 501
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=501&view=rev
Author: GingerDog
Date: 2008-12-15 21:27:31 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
edit-domain.php: only allow valid transport definitions through
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-13 07:30:36 UTC (rev 500)
+++ trunk/edit-domain.php 2008-12-15 21:27:31 UTC (rev 501)
@@ -69,7 +69,10 @@
$fTransport = $CONF['transport_default'];
if($CONF['transport'] != 'NO' && isset ($_POST['fTransport'])) {
- $fTransport = escape_string ($_POST['fTransport']);
+ $fTransport = escape_string($_POST['fTransport']);
+ if(!in_array($fTransport, $CONF['transport_options'])) {
+ die("Invalid transport option given; check config.inc.php");
+ }
}
if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-13 07:30:40
|
Revision: 500
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=500&view=rev
Author: GingerDog
Date: 2008-12-13 07:30:36 +0000 (Sat, 13 Dec 2008)
Log Message:
-----------
upgrade.php: bug fix (thanks to matt rude for reporting it. no thanks to me for failing to type!) - see also https://sourceforge.net/tracker/?func=detail&atid=937964&aid=2423106&group_id=191583
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-12-12 20:55:32 UTC (rev 499)
+++ trunk/upgrade.php 2008-12-13 07:30:36 UTC (rev 500)
@@ -1022,7 +1022,7 @@
function upgrade_495_mysql() {
$table_mailbox = table_by_key('mailbox');
db_query_parsed("ALTER TABLE $table_mailbox add local_part varchar(255) "); // allow to be null
- db_query_parsed("UPDATE $table_mailbox SET local_part = substring_index(username, '@', 1");
+ db_query_parsed("UPDATE $table_mailbox SET local_part = substring_index(username, '@', 1)");
db_query_parsed("ALTER TABLE $table_mailbox change local_part local_part varchar(255) NOT NULL"); // remove null-ness...
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-12 20:55:36
|
Revision: 499
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=499&view=rev
Author: GingerDog
Date: 2008-12-12 20:55:32 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
edit-domain.php: fix bug where editing a domain nukes the transport field (we actually were not checking the config field properly to see whether transport control was turned on or not; this fixes https://sourceforge.net/tracker/index.php?func=detail&aid=2378038&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/edit-domain.php
Modified: trunk/edit-domain.php
===================================================================
--- trunk/edit-domain.php 2008-12-12 19:43:46 UTC (rev 498)
+++ trunk/edit-domain.php 2008-12-12 20:55:32 UTC (rev 499)
@@ -39,69 +39,74 @@
if ($_SERVER['REQUEST_METHOD'] == "GET")
{
- if (isset ($_GET['domain']))
- {
- $domain = escape_string ($_GET['domain']);
- $domain_properties = get_domain_properties ($domain);
+ if (isset ($_GET['domain']))
+ {
+ $domain = escape_string ($_GET['domain']);
+ $domain_properties = get_domain_properties ($domain);
- $tDescription = $domain_properties['description'];
- $tAliases = $domain_properties['aliases'];
- $tMailboxes = $domain_properties['mailboxes'];
- $tMaxquota = $domain_properties['maxquota'];
- $tTransport = $domain_properties['transport'];
- $tBackupmx = $domain_properties['backupmx'];
- $tActive = $domain_properties['active'];
- }
+ $tDescription = $domain_properties['description'];
+ $tAliases = $domain_properties['aliases'];
+ $tMailboxes = $domain_properties['mailboxes'];
+ $tMaxquota = $domain_properties['maxquota'];
+ $tTransport = $domain_properties['transport'];
+ $tBackupmx = $domain_properties['backupmx'];
+ $tActive = $domain_properties['active'];
+ }
}
if ($_SERVER['REQUEST_METHOD'] == "POST")
{
- if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
+ if (isset ($_GET['domain'])) $domain = escape_string ($_GET['domain']);
- if (isset ($_POST['fDescription'])) $fDescription = escape_string ($_POST['fDescription']);
- if (isset ($_POST['fAliases'])) $fAliases = intval($_POST['fAliases']);
- if (isset ($_POST['fMailboxes'])) $fMailboxes = intval($_POST['fMailboxes']);
- if (isset ($_POST['fMaxquota'])) {
- $fMaxquota = intval($_POST['fMaxquota']);
- } else {
- $fMaxquota = 0;
- }
- if (isset ($_POST['fTransport'])) $fTransport = escape_string ($_POST['fTransport']);
- if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
- if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
+ if (isset ($_POST['fDescription'])) $fDescription = escape_string ($_POST['fDescription']);
+ if (isset ($_POST['fAliases'])) $fAliases = intval($_POST['fAliases']);
+ if (isset ($_POST['fMailboxes'])) $fMailboxes = intval($_POST['fMailboxes']);
+ if (isset ($_POST['fMaxquota'])) {
+ $fMaxquota = intval($_POST['fMaxquota']);
+ } else {
+ $fMaxquota = 0;
+ }
- if ($fBackupmx == "on")
- {
- $fAliases = -1;
- $fMailboxes = -1;
- $fMaxquota = -1;
- $fBackupmx = 1;
- $sqlBackupmx = db_get_boolean(True);
- }
- else
- {
- $fBackupmx = 0;
- $sqlBackupmx = db_get_boolean(False);
- }
+ $fTransport = $CONF['transport_default'];
+ if($CONF['transport'] != 'NO' && isset ($_POST['fTransport'])) {
+ $fTransport = escape_string ($_POST['fTransport']);
+ }
- if ($fActive == "on") {
- $sqlActive = db_get_boolean(True);
- }
- else {
- $sqlActive = db_get_boolean(False);
- }
+ if (isset ($_POST['fBackupmx'])) $fBackupmx = escape_string ($_POST['fBackupmx']);
+ if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
-
- $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
- if ($result['rows'] == 1)
- {
- header ("Location: list-domain.php");
- exit;
- }
- else
- {
- $tMessage = $PALANG['pAdminEdit_domain_result_error'];
- }
+ if ($fBackupmx == "on")
+ {
+ $fAliases = -1;
+ $fMailboxes = -1;
+ $fMaxquota = -1;
+ $fBackupmx = 1;
+ $sqlBackupmx = db_get_boolean(True);
+ }
+ else
+ {
+ $fBackupmx = 0;
+ $sqlBackupmx = db_get_boolean(False);
+ }
+
+ if ($fActive == "on") {
+ $sqlActive = db_get_boolean(True);
+ }
+ else {
+ $sqlActive = db_get_boolean(False);
+ }
+
+
+ $result = db_query ("UPDATE $table_domain SET description='$fDescription',aliases=$fAliases,mailboxes=$fMailboxes,maxquota=$fMaxquota,transport='$fTransport',backupmx='$sqlBackupmx',active='$sqlActive',modified=NOW() WHERE domain='$domain'");
+ if ($result['rows'] == 1)
+ {
+ header ("Location: list-domain.php");
+ exit;
+ }
+ else
+ {
+ $tMessage = $PALANG['pAdminEdit_domain_result_error'];
+ }
}
include ("templates/header.php");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-12 19:43:50
|
Revision: 498
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=498&view=rev
Author: GingerDog
Date: 2008-12-12 19:43:46 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
only add hte ssl field to postgresql dbs if it does not already exist
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-12-12 19:42:12 UTC (rev 497)
+++ trunk/upgrade.php 2008-12-12 19:43:46 UTC (rev 498)
@@ -932,7 +932,9 @@
}
function upgrade_439_pgsql() {
$table_fetchmail = table_by_key('fetchmail');
- db_query_parsed("ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false");
+ if(!_pgsql_field_exists($table_fetchmail, 'ssl')) {
+ db_query_parsed("ALTER TABLE $table_fetchmail ADD COLUMN ssl BOOLEAN NOT NULL DEFAULT false");
+ }
}
function upgrade_473_mysql() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-12 19:42:17
|
Revision: 497
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=497&view=rev
Author: GingerDog
Date: 2008-12-12 19:42:12 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
specify the local_part when adding new mailboxes; part 3 of operation shutup-libertytek-charles :)
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-12-12 19:40:39 UTC (rev 496)
+++ trunk/create-mailbox.php 2008-12-12 19:42:12 UTC (rev 497)
@@ -263,8 +263,11 @@
// apparently uppercase usernames really confuse some IMAP clients.
$fUsername = strtolower($fUsername);
-
- $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')");
+ $local_part = '';
+ if(preg_match('/^(.*)@/', $fUsername, $matches)) {
+ $local_part = $matches[1];
+ }
+ $result = db_query ("INSERT INTO $table_mailbox (username,password,name,maildir,local_part,quota,domain,created,modified,active) VALUES ('$fUsername','$password','$fName','$maildir','$local_part','$quota','$fDomain',NOW(),NOW(),'$sqlActive')");
if ($result['rows'] != 1 || !mailbox_postcreation($fUsername,$fDomain,$maildir, $quota))
{
$tDomain = $fDomain;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-12 19:40:44
|
Revision: 496
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=496&view=rev
Author: GingerDog
Date: 2008-12-12 19:40:39 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
allow local_part to change (in theory this code serves no purpose, as the username cannot be changed.. but perhaps it will be in the future (part 2 of operation shut-up-libertytek-charles :) )
Modified Paths:
--------------
trunk/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-12-11 21:14:59 UTC (rev 495)
+++ trunk/edit-mailbox.php 2008-12-12 19:40:39 UTC (rev 496)
@@ -151,8 +151,10 @@
$formvars['name'] = $fName;
$formvars['quota'] =$quota;
$formvars['active']=$sqlActive;
-
- $result = db_update ('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
+ if(preg_match('/^(.*)@/', $fUsername, $matches)) {
+ $formvars['local_part'] = $matches[1];
+ }
+ $result = db_update('mailbox', "username='$fUsername' AND domain='$fDomain'", $formvars, array('modified'));
$maildir = $user_details['maildir'];
if ($result != 1 || !mailbox_postedit($fUsername,$fDomain,$maildir, $quota)) {
$tMessage = $PALANG['pEdit_mailbox_result_error'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-11 21:15:04
|
Revision: 495
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=495&view=rev
Author: GingerDog
Date: 2008-12-11 21:14:59 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
upgrade.php: first part of adding support for local_part of a mailboxs address - see https://sourceforge.net/forum/forum.php?thread_id=2343775&forum_id=676076
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-12-11 20:05:04 UTC (rev 494)
+++ trunk/upgrade.php 2008-12-11 21:14:59 UTC (rev 495)
@@ -41,7 +41,6 @@
AND pg_catalog.pg_table_is_visible(c.oid)
)
AND a.attname = '$field' ";
-// echo $sql;
$r = db_query($sql);
$row = db_row($r['result']);
if($row) {
@@ -1006,3 +1005,22 @@
db_query_parsed("ALTER TABLE $table_log CHANGE `data` `data` TEXT {LATIN1} NOT NULL");
}
+# Add a local_part field to the mailbox table, and populate it with the local part of the user's address.
+# This is to make it easier (hopefully) to change the filesystem location of a mailbox in the future
+# See https://sourceforge.net/forum/message.php?msg_id=5394663
+function upgrade_495_pgsql() {
+ $table_mailbox = table_by_key('mailbox');
+ if(!_pgsql_field_exists($table_mailbox, 'local_part')) {
+ db_query_parsed("ALTER TABLE $table_mailbox add column local_part varchar(255) ");
+ db_query_parsed("UPDATE $table_mailbox SET local_part = substring(username from '^(.*)@')");
+ db_query_parsed("ALTER TABLE $table_mailbox alter column local_part SET NOT NULL");
+ }
+}
+# See https://sourceforge.net/forum/message.php?msg_id=5394663
+function upgrade_495_mysql() {
+ $table_mailbox = table_by_key('mailbox');
+ db_query_parsed("ALTER TABLE $table_mailbox add local_part varchar(255) "); // allow to be null
+ db_query_parsed("UPDATE $table_mailbox SET local_part = substring_index(username, '@', 1");
+ db_query_parsed("ALTER TABLE $table_mailbox change local_part local_part varchar(255) NOT NULL"); // remove null-ness...
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-11 20:05:09
|
Revision: 494
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=494&view=rev
Author: GingerDog
Date: 2008-12-11 20:05:04 +0000 (Thu, 11 Dec 2008)
Log Message:
-----------
add table defintion to the delete url - see https://sourceforge.net/forum/forum.php?thread_id=2283853&forum_id=676076
Modified Paths:
--------------
trunk/templates/search.php
Modified: trunk/templates/search.php
===================================================================
--- trunk/templates/search.php 2008-12-07 19:28:10 UTC (rev 493)
+++ trunk/templates/search.php 2008-12-11 20:05:04 UTC (rev 494)
@@ -93,7 +93,7 @@
$active = ($tAlias[$i]['active'] == 1) ? $PALANG['YES'] : $PALANG['NO'];
print " <td><a href=\"edit-active.php?alias=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "&return=search.php?search=" . urlencode ($fSearch) . "\">" . $active . "</a></td>\n";
print " <td><a href=\"edit-alias.php?address=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\">" . $PALANG['edit'] . "</a></td>\n";
- print " <td><a href=\"delete.php?delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
+ print " <td><a href=\"delete.php?table=alias&delete=" . urlencode ($tAlias[$i]['address']) . "&domain=" . $tAlias[$i]['domain'] . "\"onclick=\"return confirm ('" . $PALANG['confirm'] . $PALANG['pOverview_get_aliases'] . ": ". $tAlias[$i]['address'] . "')\">" . $PALANG['del'] . "</a></td>\n";
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-07 19:28:14
|
Revision: 493
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=493&view=rev
Author: GingerDog
Date: 2008-12-07 19:28:10 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
bug fix reported by johnjdevine - see http://sourceforge.net/forum/forum.php?thread_id=2644846&forum_id=676076
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-12-01 19:35:31 UTC (rev 492)
+++ trunk/upgrade.php 2008-12-07 19:28:10 UTC (rev 493)
@@ -564,7 +564,7 @@
$result = db_query_parsed("
BEGIN;
ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
- ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES $domain;
+ ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES $table_domain;
UPDATE $table_vacation SET domain = domain_old;
ALTER TABLE $table_vacation DROP COLUMN domain_old;
COMMIT;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-12-01 19:35:37
|
Revision: 492
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=492&view=rev
Author: GingerDog
Date: 2008-12-01 19:35:31 +0000 (Mon, 01 Dec 2008)
Log Message:
-----------
updated pt-br translation from Luis - see email to dev list
Modified Paths:
--------------
trunk/languages/pt-br.lang
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2008-11-25 10:00:09 UTC (rev 491)
+++ trunk/languages/pt-br.lang 2008-12-01 19:35:31 UTC (rev 492)
@@ -1,424 +1,437 @@
<?php
-# $Id$
+
//
// Language file Portuguese - Brazil
// by Roberto
+// updated by Luis <luis at riseup d0t net>
//
$PALANG['YES'] = 'Sim';
$PALANG['NO'] = 'Não';
-$PALANG['edit'] = 'Modificar';
-$PALANG['del'] = 'Apagar';
-$PALANG['exit'] = 'Exit'; # XXX
-$PALANG['cancel'] = 'Cancel'; # XXX
-$PALANG['save'] = 'Save'; # XXX
-$PALANG['confirm'] = 'Você deseja apagar esse registro ?\n';
-$PALANG['confirm_domain'] = 'Você tem certeza que quer apagar todos os registros deste domínio ?\n';
-$PALANG['check_update'] = 'Check for update'; # XXX
-$PALANG['invalid_parameter'] = 'Invalid parameter!'; # XXX
-$PALANG['pFooter_logged_as'] = 'Logged as %s'; # XXX
+$PALANG['edit'] = 'Editar';
+$PALANG['del'] = 'Remover';
+$PALANG['exit'] = 'Sair';
+$PALANG['cancel'] = 'Cancelar';
+$PALANG['save'] = 'Gravar';
+$PALANG['confirm'] = 'Tem certeza de que deseja remover?\n';
+$PALANG['confirm_domain'] = 'Tem certeza de que deseja remover todos os registros deste domínio? Essa ação não pode ser desfeita!\n';
+$PALANG['check_update'] = 'Checar por atualização';
+$PALANG['invalid_parameter'] = 'Parâmetro inválido!';
-$PALANG['pLogin_welcome'] = 'Administrador de e-mail, digite aqui seu login';
-$PALANG['pLogin_username'] = 'Usuário (e-mail)';
+$PALANG['pFooter_logged_as'] = 'Autenticado como %s';
+
+$PALANG['pLogin_welcome'] = 'Administradores devem se autenticar aqui para gerenciar seus domínios.';
+$PALANG['pLogin_username'] = 'Usuário (email)';
$PALANG['pLogin_password'] = 'Senha';
$PALANG['pLogin_button'] = 'Entrar';
-$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">O usuário é inválido. Certifique-se de ter digitado o e-mail corretamente</span>';
+$PALANG['pLogin_username_incorrect'] = '<span class="error_msg">Usuário inválido. Certifique-se de ter digitado o email corretamente!</span>';
$PALANG['pLogin_password_incorrect'] = '<span class="error_msg">Senha inválida!</span>';
-$PALANG['pLogin_login_users'] = 'Usuários, cliquem aqui para suas opções';
+$PALANG['pLogin_login_users'] = 'Usuários devem clicar aqui para acessar a seção de usuários.';
-$PALANG['pMenu_main'] = 'Main'; # XXX
-$PALANG['pMenu_overview'] = 'Visão geral';
-$PALANG['pMenu_create_alias'] = 'Criar alias';
-$PALANG['pMenu_create_alias_domain'] = 'Add Alias Domain'; # XXX
-$PALANG['pMenu_create_mailbox'] = 'Criar conta de e-mail';
-$PALANG['pMenu_fetchmail'] = 'Fetch Email'; # XXX
-$PALANG['pMenu_sendmail'] = 'Enviar e-mail';
-$PALANG['pMenu_password'] = 'Senha';
-$PALANG['pMenu_viewlog'] = 'Ver histórico';
+$PALANG['pMenu_main'] = 'Menu Principal';
+$PALANG['pMenu_overview'] = 'Visão Geral';
+$PALANG['pMenu_create_alias'] = 'Criar Alias';
+$PALANG['pMenu_create_alias_domain'] = 'Criar Alias de Domínio';
+$PALANG['pMenu_create_mailbox'] = 'Criar Conta de Email';
+$PALANG['pMenu_fetchmail'] = 'Recuperar Mensagens';
+$PALANG['pMenu_sendmail'] = 'Enviar Mensagem';
+$PALANG['pMenu_password'] = 'Alterar Senha';
+$PALANG['pMenu_viewlog'] = 'Histórico';
$PALANG['pMenu_logout'] = 'Sair';
$PALANG['pMain_welcome'] = 'Bem-vindo ao Postfix Admin!';
-$PALANG['pMain_overview'] = 'Veja os aliases e as contas de e-mail.(Modificar/Apagar).';
-$PALANG['pMain_create_alias'] = 'Crie novo alias para o seu domínio.';
-$PALANG['pMain_create_mailbox'] = 'Crie nova conta de e-mail para o seu domínio.';
-$PALANG['pMain_sendmail'] = 'Envie uma mensagem para uma nova conta criada';
-$PALANG['pMain_password'] = 'Mudar a senha da conta Administrador.';
-$PALANG['pMain_viewlog'] = 'Ver o histórico.';
-$PALANG['pMain_logout'] = 'Sair do sistema.';
+$PALANG['pMain_overview'] = 'Liste seus aliases (redirecionadores) e contas de email. Você pode editá-los / removê-los aqui.';
+$PALANG['pMain_create_alias'] = 'Crie um novo alias (redirecionador) para o seu domínio.';
+$PALANG['pMain_create_mailbox'] = 'Crie uma nova conta de email para o seu domínio.';
+$PALANG['pMain_sendmail'] = 'Envie uma mensagem para uma conta recém-criada.';
+$PALANG['pMain_password'] = 'Altere a senha da sua conta de administrador.';
+$PALANG['pMain_viewlog'] = 'Veja o histórico de administração.';
+$PALANG['pMain_logout'] = 'Saia do sistema.';
-$PALANG['pOverview_disabled'] = 'Disabled'; # XXX
-$PALANG['pOverview_unlimited'] = 'Unlimited'; # XXX
-$PALANG['pOverview_title'] = ':: Defined Domains'; # XXX
-$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'] = 'Visão geral para ';
-$PALANG['pOverview_alias_domain_aliases'] = 'Alias Domains'; # XXX
-$PALANG['pOverview_alias_domain_target'] = '%s is an Alias Domain for:'; # XXX
+$PALANG['pOverview_disabled'] = 'Desabilitado';
+$PALANG['pOverview_unlimited'] = 'Ilimitado';
+$PALANG['pOverview_title'] = ':: Domínios';
+$PALANG['pOverview_up_arrow'] = 'Topo da Página';
+$PALANG['pOverview_right_arrow'] = 'Próxima Página';
+$PALANG['pOverview_left_arrow'] = 'Página Anterior';
+$PALANG['pOverview_alias_domain_title'] = ':: Aliases de Domínio';
+$PALANG['pOverview_alias_title'] = ':: Aliases';
+$PALANG['pOverview_mailbox_title'] = ':: Contas de email';
+$PALANG['pOverview_button'] = 'Acessar';
+$PALANG['pOverview_welcome'] = 'Visão geral de ';
+$PALANG['pOverview_alias_domain_aliases'] = 'Aliases de Domínio';
+$PALANG['pOverview_alias_domain_target'] = '%s é um alias de domínio para:';
$PALANG['pOverview_alias_alias_count'] = 'Aliases';
-$PALANG['pOverview_alias_mailbox_count'] = 'Contas de e-mail';
+$PALANG['pOverview_alias_mailbox_count'] = 'Contas de email';
$PALANG['pOverview_alias_address'] = 'De';
$PALANG['pOverview_alias_goto'] = 'Para';
-$PALANG['pOverview_alias_modified'] = 'Última modificação';
-$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'] = 'Usuário';
+$PALANG['pOverview_alias_modified'] = 'Última Modificação';
+$PALANG['pOverview_alias_domain_modified'] = 'Última Modificação';
+$PALANG['pOverview_alias_active'] = 'Habilitado';
+$PALANG['pOverview_alias_domain_active'] = 'Habilitado';
+$PALANG['pOverview_alias_edit'] = 'Alias';
+$PALANG['and_x_more'] = '[e %s mais...]';
+$PALANG['pOverview_mailbox_username'] = 'Email';
$PALANG['pOverview_mailbox_name'] = 'Nome';
-$PALANG['pOverview_mailbox_quota'] = 'Limite (MB)';
-$PALANG['pOverview_mailbox_modified'] = 'Última modificação';
-$PALANG['pOverview_mailbox_active'] = 'Ativo';
-$PALANG['pOverview_vacation_edit'] = 'VACATION IS ON'; # XXX
-$PALANG['pOverview_vacation_option'] = 'Set Vacation'; # XXX
+$PALANG['pOverview_mailbox_quota'] = 'Cota de Espaço (MB)';
+$PALANG['pOverview_mailbox_modified'] = 'Última Modificação';
+$PALANG['pOverview_mailbox_active'] = 'Habilitado';
+$PALANG['pOverview_vacation_edit'] = 'EM MODO DE FÉRIAS';
+$PALANG['pOverview_vacation_option'] = 'Modo de férias';
+
$PALANG['pOverview_get_domain'] = 'Domínio';
$PALANG['pOverview_get_aliases'] = 'Aliases';
-$PALANG['pOverview_get_alias_domains'] = 'Domain Aliases'; # XXX
-$PALANG['pOverview_get_mailboxes'] = 'Contas de e-mail';
-$PALANG['pOverview_get_quota'] = 'Limite das contas de e-mail (MB)';
-$PALANG['pOverview_get_modified'] = 'Última modificação';
+$PALANG['pOverview_get_alias_domains'] = 'Aliases de Domínio';
+$PALANG['pOverview_get_mailboxes'] = 'Contas de email';
+$PALANG['pOverview_get_quota'] = 'Cota de Espaço (MB)';
+$PALANG['pOverview_get_modified'] = 'Última Modificação';
-$PALANG['pDelete_delete_error'] = '<span class="error_msg">Não foi possível apagar esse registro ';
-$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">Esse domínio não é seu! ';
-$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_error4'] = 'All domains are already aliased.'; # XXX
-$PALANG['pCreate_alias_domain_success'] = 'The domain alias has been added to the alias domain table!'; # XXX
+$PALANG['pDelete_delete_error'] = '<span class="error_msg">Não foi possível remover o registro ';
+$PALANG['pDelete_delete_success'] = '%s removido.';
+$PALANG['pDelete_postdelete_error'] = '<span class="error_msg">Não foi possível remover a conta de email ';
+$PALANG['pDelete_domain_error'] = '<span class="error_msg">Domínio não lhe pertence ';
+$PALANG['pDelete_domain_alias_error'] = '<span class="error_msg">Domínio não lhe pertence ';
+$PALANG['pDelete_alias_error'] = '<span class="error_msg">Não foi possível remover o alias ';
-$PALANG['pCreate_alias_welcome'] = 'Criar um novo alias para este domínio';
+$PALANG['pCreate_alias_domain_welcome'] = 'Configuração de espelhamento de endereços de um domínio para outro.';
+$PALANG['pCreate_alias_domain_alias'] = 'Alias de Domínio';
+$PALANG['pCreate_alias_domain_alias_text'] = 'O domínio para o qual as mensagens são enviadas.';
+$PALANG['pCreate_alias_domain_target'] = 'Domínio Destino';
+$PALANG['pCreate_alias_domain_target_text'] = 'O domínio para onde as mensagens devem ir.';
+$PALANG['pCreate_alias_domain_active'] = 'Habilitado';
+$PALANG['pCreate_alias_domain_button'] = 'Criar Alias de Domínio';
+$PALANG['pCreate_alias_domain_error1'] = 'Você não possui permissão para criar a configuração desejada.';
+$PALANG['pCreate_alias_domain_error2'] = 'Configuração inválida. Por favor, defina outra configuração!';
+$PALANG['pCreate_alias_domain_error3'] = 'Não foi possível criar o alias de domínio.';
+$PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhados.';
+$PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado!';
+
+$PALANG['pCreate_alias_welcome'] = 'Criação de um novo alias para o domínio.';
$PALANG['pCreate_alias_address'] = 'Alias';
-$PALANG['pCreate_alias_address_text_error1'] = '<br><span class="error_msg">Esse ALIAS não é válido!</span>';
-$PALANG['pCreate_alias_address_text_error2'] = '<br><span class="error_msg">Esse endereço de e-mail já existe. Por favor, escolha outro nome!</span>';
-$PALANG['pCreate_alias_address_text_error3'] = '<br><span class="error_msg">Você alcançou seu limite de aliases!</span>';
+$PALANG['pCreate_alias_address_text_error1'] = '<br /><span class="error_msg">Alias inválido!</span>';
+$PALANG['pCreate_alias_address_text_error2'] = '<br /><span class="error_msg">Endereço de email fornecido já existe. Por favor, escolha outro endereço!</span>';
+$PALANG['pCreate_alias_address_text_error3'] = '<br /><span class="error_msg">Você alcançou seu limite de aliases!</span>';
$PALANG['pCreate_alias_goto'] = 'Para';
-$PALANG['pCreate_alias_active'] = 'Active'; # XXX
-$PALANG['pCreate_alias_button'] = 'Criar um alias';
-$PALANG['pCreate_alias_goto_text'] = 'Enviar as mensagens para';
-$PALANG['pCreate_alias_goto_text_error'] = 'Os endereços de e-mail.<br /><span class="error_msg">não são válidos!</span>';
-$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Impossível adicionar alias à tabela de aliases!</span>';
-$PALANG['pCreate_alias_result_success'] = 'O alias já foi criado!';
-$PALANG['pCreate_alias_catchall_text'] = 'Para criar um alias global, utilize "*".<br />Para encaminhar de um domínio a outro, use "@domain.tld" no campo Para';
+$PALANG['pCreate_alias_active'] = 'Habilitado';
+$PALANG['pCreate_alias_button'] = 'Criar Alias';
+$PALANG['pCreate_alias_goto_text'] = 'Para onde as mensagens serão enviadas.';
+$PALANG['pCreate_alias_goto_text_error'] = 'Para onde as mensagens serão redirecionadas.<br /><span class="error_msg">O endereço no campo Para é inválido!</span>';
+$PALANG['pCreate_alias_result_error'] = '<span class="error_msg">Não foi possível criar o alias!</span>';
+$PALANG['pCreate_alias_result_success'] = 'Alias criado!';
+$PALANG['pCreate_alias_catchall_text'] = 'Para criar um alias global, use "*" no campo Alias.<br />Para encaminhar de um domínio para outro, use "*@dominio.tld" no campo Para.';
-$PALANG['pEdit_alias_welcome'] = 'Modificar um alias neste domínio.<br>Uma entrada por linha.';
+$PALANG['pEdit_alias_welcome'] = 'Edição de alias do domínio.<br />Uma entrada por linha.';
$PALANG['pEdit_alias_address'] = 'Alias';
-$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Impossível encontrar o alias!</span>';
+$PALANG['pEdit_alias_address_error'] = '<span class="error_msg">Não foi possível encontrar o alias!</span>';
$PALANG['pEdit_alias_goto'] = 'Para';
-$PALANG['pEdit_alias_active'] = 'Active'; # XXX
-$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Você não digitou um destinatário (Para)</span>';
-$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">O e-mail que você digitou não é válido: ';
-$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Esse domínio não é seu: ';
-$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'] = 'Modificar o alias';
-$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Impossível modificar esse alias!</span>';
+$PALANG['pEdit_alias_active'] = 'Habilitado';
+$PALANG['pEdit_alias_goto_text_error1'] = '<span class="error_msg">Você não preencheu o campo Para</span>';
+$PALANG['pEdit_alias_goto_text_error2'] = '<span class="error_msg">O endereço de email fornecido é inválido: ';
+$PALANG['pEdit_alias_domain_error'] = '<span class="error_msg">Domínio não lhe pertence: ';
+$PALANG['pEdit_alias_domain_result_error'] = '<span class="error_msg">Não foi possível editar o alias de domínio!</span>';
+$PALANG['pEdit_alias_forward_and_store'] = 'Entregar mensagens na caixa de email local além de redirecioná-las.';
+$PALANG['pEdit_alias_forward_only'] = 'Apenas redirecionar as mensagens para os endereços acima.';
+$PALANG['pEdit_alias_button'] = 'Editar Alias';
+$PALANG['pEdit_alias_result_error'] = '<span class="error_msg">Não foi possível editar o alias!</span>';
-$PALANG['pCreate_mailbox_welcome'] = 'Criar conta de e-mail para esse domínio.';
+$PALANG['pCreate_mailbox_welcome'] = 'Criação de uma nova conta de email para o domínio.';
$PALANG['pCreate_mailbox_username'] = 'Usuário';
-$PALANG['pCreate_mailbox_username_text_error1'] = '<br><span class="error_msg">Esse e-mail é inválido!</span>';
-$PALANG['pCreate_mailbox_username_text_error2'] = '<br><span class="error_msg">Esse e-mail já existe! Por favor, escolha outro nome</span>';
-$PALANG['pCreate_mailbox_username_text_error3'] = '<br><span class="error_msg">Você alcançou o limite de contas de e-mail!</span>';
+$PALANG['pCreate_mailbox_username_text_error1'] = '<br /><span class="error_msg">Email inválido!</span>';
+$PALANG['pCreate_mailbox_username_text_error2'] = '<br /><span class="error_msg">Endereço de email fornecido já existe. Por favor, escolha outro endereço!</span>';
+$PALANG['pCreate_mailbox_username_text_error3'] = '<br /><span class="error_msg">Você alcançou o limite de contas de email!</span>';
$PALANG['pCreate_mailbox_password'] = 'Senha';
$PALANG['pCreate_mailbox_password2'] = 'Senha (confirmação)';
-$PALANG['pCreate_mailbox_password_text'] = 'Senha para a conta POP3/IMAP';
-$PALANG['pCreate_mailbox_password_text_error'] = 'Senha para a conta POP3/IMAP<br /><span class="error_msg">A senha é inválida!<br />ou não foi digitada</span>';
+$PALANG['pCreate_mailbox_password_text'] = 'Senha para POP3/IMAP';
+$PALANG['pCreate_mailbox_password_text_error'] = 'Senha para POP3/IMAP<br /><span class="error_msg">As senhas fornecidas são diferentes!<br />Ou não foram digitadas!</span>';
$PALANG['pCreate_mailbox_name'] = 'Nome';
$PALANG['pCreate_mailbox_name_text'] = 'Nome completo';
-$PALANG['pCreate_mailbox_quota'] = 'Limite';
+$PALANG['pCreate_mailbox_quota'] = 'Cota de espaço';
$PALANG['pCreate_mailbox_quota_text'] = 'MB';
-$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">O limite especificado é muito alto!</span>';
-$PALANG['pCreate_mailbox_active'] = 'Ativo';
-$PALANG['pCreate_mailbox_mail'] = 'Criar e-mail';
-$PALANG['pCreate_mailbox_button'] = 'Adicionar e-mail';
-$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Impossível criar conta de e-mail!</span>';
-$PALANG['pCreate_mailbox_result_success'] = 'O e-mail já foi criado!';
-$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'The mailbox has been added to the mailbox table, but none (or only some) of the predefined sub-folders could be created'; # XXX
+$PALANG['pCreate_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">A cota de espaço especificada é muito alta!</span>';
+$PALANG['pCreate_mailbox_active'] = 'Habilitada';
+$PALANG['pCreate_mailbox_mail'] = 'Enviar mensagem de boas-vindas';
+$PALANG['pCreate_mailbox_button'] = 'Criar Conta de Email';
+$PALANG['pCreate_mailbox_result_error'] = '<span class="error_msg">Não foi possível criar a conta de email!</span>';
+$PALANG['pCreate_mailbox_result_success'] = 'Conta de email criada!';
+$PALANG['pCreate_mailbox_result_succes_nosubfolders'] = 'Conta de email criada, mas nenhum (ou apenas alguns) dos subdiretórios pré-definidos puderam ser criados';
-$PALANG['pEdit_mailbox_welcome'] = 'Modificar conta de e-mail.';
+$PALANG['pEdit_mailbox_welcome'] = 'Edição de conta de email do domínio.';
$PALANG['pEdit_mailbox_username'] = 'Usuário';
-$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Impossível encontrar esse e-mail!</span>';
+$PALANG['pEdit_mailbox_username_error'] = '<span class="error_msg">Não foi possível encontrar a conta de email!</span>';
$PALANG['pEdit_mailbox_password'] = 'Nova senha';
$PALANG['pEdit_mailbox_password2'] = 'Nova senha (confirmação)';
-$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">As senhas são diferentes!</span>';
+$PALANG['pEdit_mailbox_password_text_error'] = '<span class="error_msg">As senhas fornecidas são diferentes!</span>';
$PALANG['pEdit_mailbox_name'] = 'Nome';
-$PALANG['pEdit_mailbox_name_text'] = 'Full name'; # XXX
-$PALANG['pEdit_mailbox_quota'] = 'Limite';
+$PALANG['pEdit_mailbox_name_text'] = 'Nome completo';
+$PALANG['pEdit_mailbox_quota'] = 'Cota de espaço';
$PALANG['pEdit_mailbox_quota_text'] = 'MB';
-$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">O limite especificado é muito alto!</span>';
-$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Esse domínio não é seu: ';
-$PALANG['pEdit_mailbox_button'] = 'Modificar conta de e-mail';
-$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Impossível mudar sua senha!</span>';
+$PALANG['pEdit_mailbox_quota_text_error'] = 'MB<br /><span class="error_msg">A cota de espaço especificada é muito alta!</span>';
+$PALANG['pEdit_mailbox_domain_error'] = '<span class="error_msg">Domínio não lhe pertence: ';
+$PALANG['pEdit_mailbox_button'] = 'Editar Conta de Email';
+$PALANG['pEdit_mailbox_result_error'] = '<span class="error_msg">Não foi possível editar a conta de email!</span>';
-$PALANG['pPassword_welcome'] = 'Mudar senha.';
+$PALANG['pPassword_welcome'] = 'Alteração de senha.';
$PALANG['pPassword_admin'] = 'Usuário';
-$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">As informações fornecidas não são de uma conta válida!</span>';
+$PALANG['pPassword_admin_text_error'] = '<span class="error_msg">USUÁRIO fornecido não é uma conta de email válida!</span>';
$PALANG['pPassword_password_current'] = 'Senha atual';
-$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Você não digitou a senha atual!</span>';
+$PALANG['pPassword_password_current_text_error'] = '<span class="error_msg">Você não digitou sua senha atual!</span>';
$PALANG['pPassword_password'] = 'Nova senha';
$PALANG['pPassword_password2'] = 'Nova senha (confirmação)';
-$PALANG['pPassword_password_text_error'] = '<span class="error_msg">As senhas digitadas não correspondem!<br />Ou são nulas!</span>';
-$PALANG['pPassword_button'] = 'Mudar senha';
-$PALANG['pPassword_result_error'] = '<span class="error_msg">Impossível modificar a senha!</span>';
-$PALANG['pPassword_result_success'] = 'Sua senha foi modificada com sucesso!';
-$PALANG['pEdit_vacation_set'] = 'Change / Set away message'; # XXX
-$PALANG['pEdit_vacation_remove'] = 'Remove away message'; # XXX
-$PALANG['pVacation_result_error'] = '<span class="error_msg">Unable to update auto response settings!</span>'; # XXX
-$PALANG['pVacation_result_removed'] = 'Auto response has been removed!'; # XXX
-$PALANG['pVacation_result_added'] = 'Auto response has been enabled!'; # XXX
+$PALANG['pPassword_password_text_error'] = '<span class="error_msg">As senhas fornecidas são diferentes!<br />Ou não foram digitadas!</span>';
+$PALANG['pPassword_button'] = 'Alterar Senha';
+$PALANG['pPassword_result_error'] = '<span class="error_msg">Não foi possível alterar sua senha!</span>';
+$PALANG['pPassword_result_success'] = 'Senha alterada!';
-$PALANG['pViewlog_welcome'] = 'Ver as 10 últimas ações para ';
+$PALANG['pEdit_vacation_set'] = 'Editar / Definir Mensagem';
+$PALANG['pEdit_vacation_remove'] = 'Remover Mensagem';
+
+$PALANG['pVacation_result_error'] = '<span class="error_msg">Não foi possível atualizar as opções de resposta automática!</span>';
+$PALANG['pVacation_result_removed'] = 'Resposta automática removida!';
+$PALANG['pVacation_result_added'] = 'Resposta automática habilitada!';
+
+$PALANG['pViewlog_welcome'] = 'Últimas 10 ações para ';
$PALANG['pViewlog_timestamp'] = 'Data/Hora';
$PALANG['pViewlog_username'] = 'Administrador';
$PALANG['pViewlog_domain'] = 'Domínio';
$PALANG['pViewlog_action'] = 'Ação';
-$PALANG['pViewlog_data'] = 'Informação';
-$PALANG['pViewlog_action_create_mailbox'] = 'create mailbox'; # XXX
-$PALANG['pViewlog_action_delete_mailbox'] = 'delete mailbox'; # XXX
-$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_data'] = 'Descrição';
-$PALANG['pViewlog_button'] = 'Ir';
-$PALANG['pViewlog_result_error'] = '<span class="error_msg">Não foi possível achar os históricos!</span>';
+$PALANG['pViewlog_action_create_mailbox'] = 'criar conta de email';
+$PALANG['pViewlog_action_delete_mailbox'] = 'remover conta de email';
+$PALANG['pViewlog_action_edit_mailbox'] = 'editar conta de email';
+$PALANG['pViewlog_action_edit_mailbox_state'] = 'habilitar/desabilitar conta de email';
+$PALANG['pViewlog_action_create_alias'] = 'criar alias';
+$PALANG['pViewlog_action_create_alias_domain'] = 'criar alias de domínio';
+$PALANG['pViewlog_action_delete_alias'] = 'remover alias';
+$PALANG['pViewlog_action_delete_alias_domain'] = 'remover alias de domínio';
+$PALANG['pViewlog_action_edit_alias'] = 'editar alias';
+$PALANG['pViewlog_action_edit_alias_state'] = 'habilitar/desabilitar alias';
+$PALANG['pViewlog_action_edit_alias_domain_state'] = 'habilitar/desabilitar alias de domínio';
+$PALANG['pViewlog_action_edit_password'] = 'alterar senha';
-$PALANG['pSendmail_welcome'] = 'Enviar um e-mail.';
+$PALANG['pViewlog_button'] = 'Acessar';
+$PALANG['pViewlog_result_error'] = '<span class="error_msg">Não foi possível encontrar o histórico!</span>';
+
+$PALANG['pSendmail_welcome'] = 'Envio de mensagem.';
$PALANG['pSendmail_admin'] = 'De';
$PALANG['pSendmail_to'] = 'Para';
-$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">(Para) está vazio ou não é um e-mail válido!</span>';
+$PALANG['pSendmail_to_text_error'] = '<span class="error_msg">Campo Para está vazio ou não é um endereço de email válido!</span>';
$PALANG['pSendmail_subject'] = 'Assunto';
-$PALANG['pSendmail_subject_text'] = 'Bem-vindo';
-$PALANG['pSendmail_body'] = 'Mensagem';
-$PALANG['pSendmail_button'] = 'Enviar um e-mail';
-$PALANG['pSendmail_result_error'] = '<span class="error_msg">Erro no envio da mensagem!</span>'; # XXX text change - new: <span class="error_msg">Unable to send email!</span>
-$PALANG['pSendmail_result_success'] = 'A mensagem foi enviada!'; # XXX text change - new: Email sent!
+$PALANG['pSendmail_subject_text'] = 'Bem-vindo(a)';
+$PALANG['pSendmail_body'] = 'Corpo da Mensagem';
+$PALANG['pSendmail_button'] = 'Enviar Mensagem';
+$PALANG['pSendmail_result_error'] = '<span class="error_msg">Não foi possível enviar a mensagem!</span>';
+$PALANG['pSendmail_result_success'] = 'Mensagem enviada!';
-$PALANG['pAdminMenu_list_admin'] = 'Lista de administradores';
-$PALANG['pAdminMenu_list_domain'] = 'Lista de domínios';
-$PALANG['pAdminMenu_list_virtual'] = 'Lista virtual';
-$PALANG['pAdminMenu_viewlog'] = 'Ver histórico';
-$PALANG['pAdminMenu_backup'] = 'Backup'; # XXX
-$PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de domínios';
-$PALANG['pAdminMenu_create_admin'] = 'Novo administrador';
-$PALANG['pAdminMenu_create_domain'] = 'Novo domínio';
-$PALANG['pAdminMenu_create_alias'] = 'Criar alias';
-$PALANG['pAdminMenu_create_mailbox'] = 'Criar e-mail';
+$PALANG['pAdminMenu_list_admin'] = 'Administradores';
+$PALANG['pAdminMenu_list_domain'] = 'Domínios';
+$PALANG['pAdminMenu_list_virtual'] = 'Virtual';
+$PALANG['pAdminMenu_viewlog'] = 'Histórico';
+$PALANG['pAdminMenu_backup'] = 'Backup';
+$PALANG['pAdminMenu_create_domain_admins'] = 'Administradores de Domínio';
+$PALANG['pAdminMenu_create_admin'] = 'Criar Administrador';
+$PALANG['pAdminMenu_create_domain'] = 'Criar Domínio';
+$PALANG['pAdminMenu_create_alias'] = 'Criar Alias';
+$PALANG['pAdminMenu_create_mailbox'] = 'Criar Conta de Email';
$PALANG['pAdminList_admin_domain'] = 'Domínio';
$PALANG['pAdminList_admin_username'] = 'Administrador';
$PALANG['pAdminList_admin_count'] = 'Domínios';
-$PALANG['pAdminList_admin_modified'] = 'Última modificação';
-$PALANG['pAdminList_admin_active'] = 'Ativo';
+$PALANG['pAdminList_admin_modified'] = 'Última Modificação';
+$PALANG['pAdminList_admin_active'] = 'Habilitado';
$PALANG['pAdminList_domain_domain'] = 'Domínio';
$PALANG['pAdminList_domain_description'] = 'Descrição';
-$PALANG['pAdminList_domain_aliases'] = 'Alias';
-$PALANG['pAdminList_domain_mailboxes'] = 'Contas de e-mail';
-$PALANG['pAdminList_domain_maxquota'] = 'Limite máximo (MB)';
-$PALANG['pAdminList_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminList_domain_backupmx'] = 'Backup MX'; # XXX
-$PALANG['pAdminList_domain_modified'] = 'Última modificação';
-$PALANG['pAdminList_domain_active'] = 'Ativo';
+$PALANG['pAdminList_domain_aliases'] = 'Aliases';
+$PALANG['pAdminList_domain_mailboxes'] = 'Contas de Email';
+$PALANG['pAdminList_domain_maxquota'] = 'Cota de Espaço (MB)';
+$PALANG['pAdminList_domain_transport'] = 'Transporte';
+$PALANG['pAdminList_domain_backupmx'] = 'MX de Backup';
+$PALANG['pAdminList_domain_modified'] = 'Última Modificação';
+$PALANG['pAdminList_domain_active'] = 'Habilitado';
-$PALANG['pAdminList_virtual_button'] = 'Ir';
-$PALANG['pAdminList_virtual_welcome'] = 'Visão geral para ';
-$PALANG['pAdminList_virtual_alias_alias_count'] = 'Alias';
-$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Contas de e-mail';
+$PALANG['pAdminList_virtual_button'] = 'Acessar';
+$PALANG['pAdminList_virtual_welcome'] = 'Visão geral de ';
+$PALANG['pAdminList_virtual_alias_alias_count'] = 'Aliases';
+$PALANG['pAdminList_virtual_alias_mailbox_count'] = 'Contas de email';
$PALANG['pAdminList_virtual_alias_address'] = 'De';
$PALANG['pAdminList_virtual_alias_goto'] = 'Para';
-$PALANG['pAdminList_virtual_alias_modified'] = 'Última modificação';
-$PALANG['pAdminList_virtual_mailbox_username'] = 'Usuário';
+$PALANG['pAdminList_virtual_alias_modified'] = 'Última Modificação';
+$PALANG['pAdminList_virtual_mailbox_username'] = 'Email';
$PALANG['pAdminList_virtual_mailbox_name'] = 'Nome';
-$PALANG['pAdminList_virtual_mailbox_quota'] = 'Limite (MB)';
-$PALANG['pAdminList_virtual_mailbox_modified'] = 'Última modificação';
-$PALANG['pAdminList_virtual_mailbox_active'] = 'Ativo';
+$PALANG['pAdminList_virtual_mailbox_quota'] = 'Cota de Espaço (MB)';
+$PALANG['pAdminList_virtual_mailbox_modified'] = 'Última Modificação';
+$PALANG['pAdminList_virtual_mailbox_active'] = 'Habilitado';
-$PALANG['pAdminCreate_domain_welcome'] = 'Criar novo domínio';
+$PALANG['pAdminCreate_domain_welcome'] = 'Criação de um novo domínio.';
$PALANG['pAdminCreate_domain_domain'] = 'Domínio';
$PALANG['pAdminCreate_domain_domain_text_error'] = '<span class="error_msg">O domínio já existe!</span>';
-$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">The domain is invalid!</span>'; # XXX
+$PALANG['pAdminCreate_domain_domain_text_error2'] = '<span class="error_msg">Domínio inválido!</span>';
$PALANG['pAdminCreate_domain_description'] = 'Descrição';
-$PALANG['pAdminCreate_domain_aliases'] = 'Alias';
+$PALANG['pAdminCreate_domain_aliases'] = 'Aliases';
$PALANG['pAdminCreate_domain_aliases_text'] = '-1 = desativar | 0 = ilimitado';
-$PALANG['pAdminCreate_domain_mailboxes'] = 'Contas de e-mail';
+$PALANG['pAdminCreate_domain_mailboxes'] = 'Contas de email';
$PALANG['pAdminCreate_domain_mailboxes_text'] = '-1 = desativar | 0 = ilimitado';
-$PALANG['pAdminCreate_domain_maxquota'] = 'Limite máximo';
+$PALANG['pAdminCreate_domain_maxquota'] = 'Cota de espaço máxima';
$PALANG['pAdminCreate_domain_maxquota_text'] = 'MB<br /> -1 = desativar | 0 = ilimitado';
-$PALANG['pAdminCreate_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminCreate_domain_transport_text'] = 'Define transport'; # XXX
-$PALANG['pAdminCreate_domain_defaultaliases'] = 'Adicionar aliases (padrão)';
-$PALANG['pAdminCreate_domain_defaultaliases_text'] = ''; # XXX
-$PALANG['pAdminCreate_domain_backupmx'] = 'Mail server is backup MX'; # XXX
-$PALANG['pAdminCreate_domain_button'] = 'Criar domínio';
-$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Impossível criar domínio!</span>';
-$PALANG['pAdminCreate_domain_result_success'] = 'O domínio já existe!';
-$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['pAdminCreate_domain_transport'] = 'Transporte';
+$PALANG['pAdminCreate_domain_transport_text'] = 'Definir transporte';
+$PALANG['pAdminCreate_domain_defaultaliases'] = 'Adicionar aliases padrão';
+$PALANG['pAdminCreate_domain_defaultaliases_text'] = '';
+$PALANG['pAdminCreate_domain_backupmx'] = 'Servidor de email é um MX de backup';
+$PALANG['pAdminCreate_domain_button'] = 'Criar Domínio';
+$PALANG['pAdminCreate_domain_result_error'] = '<span class="error_msg">Não foi possível criar o domínio!</span>';
+$PALANG['pAdminCreate_domain_result_success'] = 'Domínio criado!';
-$PALANG['pAdminEdit_domain_welcome'] = 'Modificar domínio';
+$PALANG['pAdminDelete_domain_error'] = '<span class="error_msg">Não foi possível remover o domínio!</span>';
+$PALANG['pAdminDelete_alias_domain_error'] = '<span class="error_msg">Não foi possível remover o alias de domínio!</span>';
+
+$PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.';
$PALANG['pAdminEdit_domain_domain'] = 'Domínio';
$PALANG['pAdminEdit_domain_description'] = 'Descrição';
$PALANG['pAdminEdit_domain_aliases'] = 'Aliases';
$PALANG['pAdminEdit_domain_aliases_text'] = '-1 = desativar | 0 = ilimitado';
-$PALANG['pAdminEdit_domain_mailboxes'] = 'Contas de e-mail';
+$PALANG['pAdminEdit_domain_mailboxes'] = 'Contas de email';
$PALANG['pAdminEdit_domain_mailboxes_text'] = '-1 = desativar | 0 = ilimitado';
-$PALANG['pAdminEdit_domain_maxquota'] = 'Limite máximo';
+$PALANG['pAdminEdit_domain_maxquota'] = 'Cota de espaço máxima';
$PALANG['pAdminEdit_domain_maxquota_text'] = 'MB<br /> -1 = desativar | 0 = ilimitado';
-$PALANG['pAdminEdit_domain_transport'] = 'Transport'; # XXX
-$PALANG['pAdminEdit_domain_transport_text'] = 'Define transport'; # XXX
-$PALANG['pAdminEdit_domain_backupmx'] = 'Mail server is backup MX'; # XXX
-$PALANG['pAdminEdit_domain_active'] = 'Ativo';
-$PALANG['pAdminEdit_domain_button'] = 'Modificar domínio';
-$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Impossível modificar domínio!</span>';
+$PALANG['pAdminEdit_domain_transport'] = 'Transporte';
+$PALANG['pAdminEdit_domain_transport_text'] = 'Definir transporte';
+$PALANG['pAdminEdit_domain_backupmx'] = 'Servidor de email é um MX de backup';
+$PALANG['pAdminEdit_domain_active'] = 'Habilitado';
+$PALANG['pAdminEdit_domain_button'] = 'Editar Domínio';
+$PALANG['pAdminEdit_domain_result_error'] = '<span class="error_msg">Não foi possível editar o domínio!</span>';
-$PALANG['pAdminCreate_admin_welcome'] = 'Criar novo administrador de domínio';
+$PALANG['pAdminCreate_admin_welcome'] = 'Criação de um novo administrador de domínio.';
$PALANG['pAdminCreate_admin_username'] = 'Administrador';
-$PALANG['pAdminCreate_admin_username_text'] = 'Usuário (e-mail)';
-$PALANG['pAdminCreate_admin_username_text_error1'] = '<span class="error_msg">Não é um nome de administrador válido</span>';
-$PALANG['pAdminCreate_admin_username_text_error2'] = '<span class="error_msg">Esse administrador não existe ou não é válido</span>';
+$PALANG['pAdminCreate_admin_username_text'] = 'Endereço de email';
+$PALANG['pAdminCreate_admin_username_text_error1'] = 'Endereço de email<br /><span class="error_msg">Endereço de email inválido!</span>';
+$PALANG['pAdminCreate_admin_username_text_error2'] = 'Endereço de email<br /><span class="error_msg">Administrador já existe ou é inválido</span>';
$PALANG['pAdminCreate_admin_password'] = 'Senha';
$PALANG['pAdminCreate_admin_password2'] = 'Senha (confirmação)';
-$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">A senha digitada não é válida<br> ou é nula!</span>';
-$PALANG['pAdminCreate_admin_button'] = 'Criar um administrador';
-$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Impossível criar administrador!</span>';
-$PALANG['pAdminCreate_admin_result_success'] = 'O administrador já foi criado!';
-$PALANG['pAdminCreate_admin_address'] = 'Domínio';
+$PALANG['pAdminCreate_admin_password_text_error'] = '<span class="error_msg">As senhas fornecidas são diferentes!<br />Ou não foram digitadas!</span>';
+$PALANG['pAdminCreate_admin_button'] = 'Criar Administrador';
+$PALANG['pAdminCreate_admin_result_error'] = '<span class="error_msg">Não foi possível criar o administrador!</span>';
+$PALANG['pAdminCreate_admin_result_success'] = 'Administrador criado!';
+$PALANG['pAdminCreate_admin_address'] = 'Domínio(s)';
-$PALANG['pAdminEdit_admin_welcome'] = 'Modificar dmínio';
+$PALANG['pAdminEdit_admin_welcome'] = 'Edição de administrador de domínio.';
$PALANG['pAdminEdit_admin_username'] = 'Administrador';
$PALANG['pAdminEdit_admin_password'] = 'Senha';
$PALANG['pAdminEdit_admin_password2'] = 'Senha (confirmação)';
-$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">A senha digitada não é válida<br /> ou é nula!</span>';
-$PALANG['pAdminEdit_admin_active'] = 'Ativo';
-$PALANG['pAdminEdit_admin_super_admin'] = 'Super admin'; # XXX
-$PALANG['pAdminEdit_admin_button'] = 'Modificar administdrador';
-$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Impossível modificar administrador !</span>';
-$PALANG['pAdminEdit_admin_result_success'] = 'Administrador já foi criado!';
+$PALANG['pAdminEdit_admin_password_text_error'] = '<span class="error_msg">As senhas fornecidas são diferentes!<br />Ou não foram digitadas!</span>';
+$PALANG['pAdminEdit_admin_active'] = 'Habilitado';
+$PALANG['pAdminEdit_admin_super_admin'] = 'Super administrador';
+$PALANG['pAdminEdit_admin_button'] = 'Editar Administrador';
+$PALANG['pAdminEdit_admin_result_error'] = '<span class="error_msg">Não foi possível editar o administrador!</span>';
+$PALANG['pAdminEdit_admin_result_success'] = 'Administrador editado!';
-$PALANG['pUsersLogin_welcome'] = 'Digite seu e-mail e sua senha para modificar a senha e seus aliases.';
-$PALANG['pUsersLogin_username'] = 'Usuário (e-mail)';
+$PALANG['pUsersLogin_welcome'] = 'Usuários devem se autenticar aqui para troca de senha e configuração de redirecionamento de mensagens.';
+$PALANG['pUsersLogin_username'] = 'Usuário (email)';
$PALANG['pUsersLogin_password'] = 'Senha';
$PALANG['pUsersLogin_button'] = 'Entrar';
-$PALANG['pUsersLogin_username_incorrect'] = 'O usuário é inválido. Certifique-se de ter digitado o e-mail corretamente!';
-$PALANG['pUsersLogin_password_incorrect'] = 'Sua senha é inválida!';
+$PALANG['pUsersLogin_username_incorrect'] = 'Usuário inválido. Certifique-se de ter digitado o email corretamente!';
+$PALANG['pUsersLogin_password_incorrect'] = 'Senha inválida!';
-$PALANG['pUsersMenu_vacation'] = 'Resposta automática';
-$PALANG['pUsersMenu_edit_alias'] = 'Modificar redirecionamento';
-$PALANG['pUsersMenu_password'] = 'Modificar senha';
+$PALANG['pUsersMenu_vacation'] = 'Resposta Automática';
+$PALANG['pUsersMenu_edit_alias'] = 'Configurar Redirecionamento';
+$PALANG['pUsersMenu_password'] = 'Alterar Senha';
-$PALANG['pUsersMain_vacation'] = 'Configurar uma mensagem para a resposta automática.';
-$PALANG['pUsersMain_vacationSet'] = $PALANG['pUsersMenu_vacation'] . ' is ON, click \'' . $PALANG['pUsersMenu_vacation'] . '\' to ' . $PALANG['edit'] . '/remove'; # XXX
-$PALANG['pUsersMain_edit_alias'] = 'Modificar e-mail para redirecionamento.';
-$PALANG['pUsersMain_password'] = 'Changer votre mot de passe.';
+$PALANG['pUsersMain_vacation'] = 'Configure uma mensagem de ausente ou outra resposta automática.';
+$PALANG['pUsersMain_vacationSet'] = 'Resposta automática HABILITADA. Clique em \'Resposta Automática\' para editar/remover.';
+$PALANG['pUsersMain_edit_alias'] = 'Defina endereços de email para redirecionamento de mensagens.';
+$PALANG['pUsersMain_password'] = 'Altere a senha de sua conta.';
-$PALANG['pUsersVacation_welcome'] = 'Resposta automática.';
-$PALANG['pUsersVacation_welcome_text'] = 'Sua resposta automática já está configurada!';
+$PALANG['pUsersVacation_welcome'] = 'Configuração de resposta automática.';
+$PALANG['pUsersVacation_welcome_text'] = 'Você já possui uma resposta automática configurada!';
$PALANG['pUsersVacation_subject'] = 'Assunto';
-$PALANG['pUsersVacation_subject_text'] = 'Resposta de encaminhamento';
-$PALANG['pUsersVacation_body'] = 'Mensagem';
+$PALANG['pUsersVacation_subject_text'] = 'Ausente';
+$PALANG['pUsersVacation_body'] = 'Corpo da Mensagem';
$PALANG['pUsersVacation_body_text'] = <<<EOM
-Eu estarei ausente de <date> até <date>.
-Em caso de urgência, favor contatar <contact person>.
+Estarei ausente de <data> até <data>.
+Em caso de urgência, favor contatar <pessoa de contato>.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Ausente';
-$PALANG['pUsersVacation_button_back'] = 'Retorno';
-$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Impossível atualizar suas configurações para resposta automática!</span>';
-$PALANG['pUsersVacation_result_success'] = 'Sua resposta automática foi removida!';
+$PALANG['pUsersVacation_button_back'] = 'De Volta';
+$PALANG['pUsersVacation_result_error'] = '<span class="error_msg">Não foi possível atualizar suas configurações de resposta automática!</span>';
+$PALANG['pUsersVacation_result_success'] = 'Resposta automática removida!';
-$PALANG['pCreate_dbLog_createmailbox'] = 'create mailbox'; # XXX
-$PALANG['pCreate_dbLog_createalias'] = 'create alias'; # XXX
-$PALANG['pDelete_dbLog_deletealias'] = 'delete alias'; # XXX
-$PALANG['pDelete_dbLog_deletemailbox'] = 'delete mailbox'; # XXX
+$PALANG['pCreate_dbLog_createmailbox'] = 'criar conta de email';
+$PALANG['pCreate_dbLog_createalias'] = 'criar alias';
+$PALANG['pDelete_dbLog_deletealias'] = 'remover alias';
+$PALANG['pDelete_dbLog_deletemailbox'] = 'remover conta de email';
-$PALANG['pEdit_dbLog_editactive'] = 'change active state'; # XXX
-$PALANG['pEdit_dbLog_editalias'] = 'edit alias'; # XXX
-$PALANG['pEdit_dbLog_editmailbox'] = 'edit mailbox'; # XXX
+$PALANG['pEdit_dbLog_editactive'] = 'habilitar/desabilitar';
+$PALANG['pEdit_dbLog_editalias'] = 'editar alias';
+$PALANG['pEdit_dbLog_editmailbox'] = 'editar conta de email';
-$PALANG['pSearch'] = 'search'; # XXX
-$PALANG['pSearch_welcome'] = 'Searching for: ';
-$PALANG['pReturn_to'] = 'Return to'; # XXX
-$PALANG['pBroadcast_title'] = 'Send broadcast message'; # XXX
-$PALANG['pBroadcast_from'] = 'From'; # XXX
-$PALANG['pBroadcast_name'] = 'Your name'; # XXX
-$PALANG['pBroadcast_subject'] = 'Subject'; # XXX
-$PALANG['pBroadcast_message'] = 'Message'; # XXX
-$PALANG['pBroadcast_send'] = 'Send message'; # XXX
-$PALANG['pBroadcast_success'] = 'Your broadcast message was sent.'; # XXX
-$PALANG['pAdminMenu_broadcast_message'] = 'Broadcast message'; # XXX
-$PALANG['pBroadcast_error_empty'] = 'The fields Name, Subject and Message should\'t be empty !'; # XXX
-$PALANG['pStatus_undeliverable'] = 'maybe UNDELIVERABLE '; # XXX
-$PALANG['pStatus_custom'] = 'Delivers to '; # XXX
-$PALANG['pStatus_popimap'] = 'POP/IMAP '; # XXX
-$PALANG['pPasswordTooShort'] = "Password is too short - requires %s characters"; # XXX
-$PALANG['pInvalidDomainRegex'] = "Invalid domain name %s, fails regexp check"; # XXX
-$PALANG['pInvalidDomainDNS'] = "Invalid domain %s, and/or not discoverable in DNS"; # XXX
-$PALANG['pInvalidMailRegex'] = "Invalid email address, fails regexp check"; # XXX
-$PALANG['pFetchmail_welcome'] = 'Fetch mail for:'; # XXX
-$PALANG['pFetchmail_new_entry'] = 'New entry'; # XXX
-$PALANG['pFetchmail_database_save_error'] = 'Could not save this entry in the database!'; # XXX
-$PALANG['pFetchmail_database_save_success'] = 'Entry saved in database.'; # XXX
-$PALANG['pFetchmail_error_invalid_id'] = 'No entry with ID %s found!'; # XXX
-$PALANG['pFetchmail_invalid_mailbox'] = 'Invalid mailbox!'; # XXX
-$PALANG['pFetchmail_server_missing'] = 'Please enter the remote server name!'; # XXX
-$PALANG['pFetchmail_user_missing'] = 'Please enter the remote username!'; # XXX
-$PALANG['pFetchmail_password_missing'] = 'Please enter the remote password!'; # XXX
-$PALANG['pFetchmail_field_id'] = 'ID'; # XXX
-$PALANG['pFetchmail_field_mailbox'] = 'Mailbox'; # XXX
-$PALANG['pFetchmail_field_src_server'] = 'Server'; # XXX
-$PALANG['pFetchmail_field_src_auth'] = 'Auth Type'; # XXX
-$PALANG['pFetchmail_field_src_user'] = 'User'; # XXX
-$PALANG['pFetchmail_field_src_password'] = 'Password'; # XXX
-$PALANG['pFetchmail_field_src_folder'] = 'Folder'; # XXX
-$PALANG['pFetchmail_field_poll_time'] = 'Poll'; # XXX
-$PALANG['pFetchmail_field_fetchall'] = 'Fetch All'; # XXX
-$PALANG['pFetchmail_field_keep'] = 'Keep'; # XXX
-$PALANG['pFetchmail_field_protocol'] = 'Protocol'; # XXX
-$PALANG['pFetchmail_field_usessl'] = 'SSL active'; # XXX
-$PALANG['pFetchmail_field_extra_options'] = 'Extra Options'; # XXX
-$PALANG['pFetchmail_field_mda'] = 'MDA'; # XXX
-$PALANG['pFetchmail_field_date'] = 'Date'; # XXX
-$PALANG['pFetchmail_field_returned_text'] = 'Returned Text'; # XXX
-$PALANG['pFetchmail_desc_id'] = 'Record ID'; # XXX
-$PALANG['pFetchmail_desc_mailbox'] = 'Local mailbox'; # XXX
-$PALANG['pFetchmail_desc_src_server'] = 'Remote Server'; # XXX
-$PALANG['pFetchmail_desc_src_auth'] = 'Mostly \'password\''; # Translators: Please do NOT translate 'password' here # XXX
-$PALANG['pFetchmail_desc_src_user'] = 'Remote User'; # XXX
-$PALANG['pFetchmail_desc_src_password'] = 'Remote Password'; # XXX
-$PALANG['pFetchmail_desc_src_folder'] = 'Remote Folder'; # XXX
-$PALANG['pFetchmail_desc_poll_time'] = 'Poll every ... minutes'; # XXX
-$PALANG['pFetchmail_desc_fetchall'] = 'Retrieve both old (seen) and new messages'; # XXX
-$PALANG['pFetchmail_desc_keep'] = 'Keep retrieved messages on the remote mailserver'; # XXX
-$PALANG['pFetchmail_desc_protocol'] = 'Protocol to use'; # XXX
-$PALANG['pFetchmail_desc_usessl'] = 'SSL encryption'; # XXX
-$PALANG['pFetchmail_desc_extra_options'] = 'Extra fetchmail Options'; # XXX
-$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent'; # XXX
-$PALANG['pFetchmail_desc_date'] = 'Date of last polling/configuration change'; # XXX
-$PALANG['pFetchmail_desc_returned_text'] = 'Text message from last polling'; # XXX
+$PALANG['pSearch'] = 'Pesquisar';
+$PALANG['pSearch_welcome'] = 'Pesquisando por: ';
+$PALANG['pReturn_to'] = 'Retornar para';
+
+$PALANG['pBroadcast_title'] = 'Envio de mensagem em massa.';
+$PALANG['pBroadcast_from'] = 'De';
+$PALANG['pBroadcast_name'] = 'Seu nome';
+$PALANG['pBroadcast_subject'] = 'Assunto';
+$PALANG['pBroadcast_message'] = 'Mensagem';
+$PALANG['pBroadcast_send'] = 'Enviar Mensagem';
+$PALANG['pBroadcast_success'] = 'Mensagem em massa enviada.';
+$PALANG['pAdminMenu_broadcast_message'] = 'Mensagem em massa';
+$PALANG['pBroadcast_error_empty'] = 'Os campos Nome, Assunto e Mensagem devem ser preenchidos!';
+
+$PALANG['pStatus_undeliverable'] = 'talvez NÃO-ENTREGÁVEL ';
+$PALANG['pStatus_custom'] = 'Envia para ';
+$PALANG['pStatus_popimap'] = 'POP/IMAP ';
+
+$PALANG['pPasswordTooShort'] = "Senha muito curta - requer %s caracteres"; # uso: flash_error(sprintf($PALANG['pPasswordTooShort'], $CONF['min_password_length']));
+$PALANG['pInvalidDomainRegex'] = "Nome de domínio inválido %s, falhou checagem por expressão regular";
+$PALANG['pInvalidDomainDNS'] = "Domínio inválido %s, e/ou não pôde ser resolvido por DNS";
+$PALANG['pInvalidMailRegex'] = "Endereço de email inválido, falhou checagem por expressão regular";
+
+$PALANG['pFetchmail_welcome'] = 'Configuração de recuperação de mensagens para: ';
+$PALANG['pFetchmail_new_entry'] = 'Criar Novo Registro';
+$PALANG['pFetchmail_database_save_error'] = 'Registro não pôde ser gravado no banco de dados!';
+$PALANG['pFetchmail_database_save_success'] = 'Registro gravado no banco de dados.';
+$PALANG['pFetchmail_error_invalid_id'] = 'Nenhum registro com ID %s foi encontrado!';
+$PALANG['pFetchmail_invalid_mailbox'] = 'Conta de email inválida!';
+$PALANG['pFetchmail_server_missing'] = 'Favor fornecer o nome do servidor remoto!';
+$PALANG['pFetchmail_user_missing'] = 'Favor fornecer o nome de usuário da conta remota!';
+$PALANG['pFetchmail_password_missing'] = 'Favor fornecer a senha da conta remota!';
+$PALANG['pFetchmail_field_id'] = 'ID';
+$PALANG['pFetchmail_field_mailbox'] = 'Conta';
+$PALANG['pFetchmail_field_src_server'] = 'Servidor';
+$PALANG['pFetchmail_field_src_auth'] = 'Autenticação';
+$PALANG['pFetchmail_field_src_user'] = 'Usuário';
+$PALANG['pFetchmail_field_src_password'] = 'Senha';
+$PALANG['pFetchmail_field_src_folder'] = 'Diretório';
+$PALANG['pFetchmail_field_poll_time'] = 'Checar';
+$PALANG['pFetchmail_field_fetchall'] = 'Recuperar todas';
+$PALANG['pFetchmail_field_keep'] = 'Manter';
+$PALANG['pFetchmail_field_protocol'] = 'Protocolo';
+$PALANG['pFetchmail_field_usessl'] = 'SSL habilitado';
+$PALANG['pFetchmail_field_extra_options'] = 'Opções extra';
+$PALANG['pFetchmail_field_mda'] = 'MDA';
+$PALANG['pFetchmail_field_date'] = 'Data';
+$PALANG['pFetchmail_field_returned_text'] = 'Texto retornado';
+$PALANG['pFetchmail_desc_id'] = 'ID do registro';
+$PALANG['pFetchmail_desc_mailbox'] = 'Conta de email local';
+$PALANG['pFetchmail_desc_src_server'] = 'Servidor remoto';
+$PALANG['pFetchmail_desc_src_auth'] = 'Quase sempre \'password\''; # Translators: Please do NOT translate 'password' here
+$PALANG['pFetchmail_desc_src_user'] = 'Usuário remoto';
+$PALANG['pFetchmail_desc_src_password'] = 'Senha remota';
+$PALANG['pFetchmail_desc_src_folder'] = 'Diretório remoto';
+$PALANG['pFetchmail_desc_poll_time'] = 'Checar a cada ... minutos';
+$PALANG['pFetchmail_desc_fetchall'] = 'Recuperar mensagens novas e antigas (lidas)';
+$PALANG['pFetchmail_desc_keep'] = 'Manter mensagens recuperadas no servidor remoto';
+$PALANG['pFetchmail_desc_protocol'] = 'Protocolo a ser usado';
+$PALANG['pFetchmail_desc_usessl'] = 'Criptografado com SSL';
+$PALANG['pFetchmail_desc_extra_options'] = 'Opções extra do fetchmail';
+$PALANG['pFetchmail_desc_mda'] = 'Mail Delivery Agent';
+$PALANG['pFetchmail_desc_date'] = 'Data da última checagem/mudança de configuração';
+$PALANG['pFetchmail_desc_returned_text'] = 'Mensagem de texto da última checagem';
+
$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-11-25 10:00:12
|
Revision: 491
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=491&view=rev
Author: GingerDog
Date: 2008-11-25 10:00:09 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
upgrade.php: syntax error fix
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-25 09:55:27 UTC (rev 490)
+++ trunk/upgrade.php 2008-11-25 10:00:09 UTC (rev 491)
@@ -363,17 +363,17 @@
if(!_pgsql_object_exists(table_by_key('alias'))) {
db_query_parsed('
- CREATE TABLE ' . table_by_key('alias') . ' (
+ CREATE TABLE ' . table_by_key("alias") . ' (
address character varying(255) NOT NULL,
goto text NOT NULL,
- domain character varying(255) NOT NULL REFERENCES "' . table_by_key('domain') '",
+ domain character varying(255) NOT NULL REFERENCES "' . table_by_key("domain") . '",
created timestamp with time zone default now(),
modified timestamp with time zone default now(),
active boolean NOT NULL default true,
Constraint "alias_key" Primary Key ("address")
);
- CREATE INDEX alias_address_active ON ' . table_by_key('alias') . '(address,active);
- COMMENT ON TABLE ' . table_by_key('alias') . ' IS \'Postfix Admin - Virtual Aliases\';
+ CREATE INDEX alias_address_active ON ' . table_by_key("alias") . '(address,active);
+ COMMENT ON TABLE ' . table_by_key("alias") . ' IS \'Postfix Admin - Virtual Aliases\';
');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-25 09:55:31
|
Revision: 490
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=490&view=rev
Author: GingerDog
Date: 2008-11-25 09:55:27 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
upgrade.php: see bug 2339963
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-25 09:51:51 UTC (rev 489)
+++ trunk/upgrade.php 2008-11-25 09:55:27 UTC (rev 490)
@@ -401,10 +401,9 @@
COMMENT ON TABLE ' . table_by_key('log') . ' IS \'Postfix Admin - Log\';
');
}
-
if(!_pgsql_object_exists(table_by_key('mailbox'))) {
db_query_parsed('
- CREATE TABLE mailbox (
+ CREATE TABLE ' . table_by_key('mailbox') . ' (
username character varying(255) NOT NULL,
password character varying(255) NOT NULL default \'\',
name character varying(255) NOT NULL default \'\',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-25 09:51:53
|
Revision: 489
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=489&view=rev
Author: GingerDog
Date: 2008-11-25 09:51:51 +0000 (Tue, 25 Nov 2008)
Log Message:
-----------
setup.php: fix table_by_key issue for domain table
Modified Paths:
--------------
trunk/setup.php
Modified: trunk/setup.php
===================================================================
--- trunk/setup.php 2008-11-24 21:01:27 UTC (rev 488)
+++ trunk/setup.php 2008-11-25 09:51:51 UTC (rev 489)
@@ -309,9 +309,10 @@
if (isset ($_POST['fPassword2'])) $fPassword2 = escape_string ($_POST['fPassword2']);
// XXX need to ensure domains table includes an 'ALL' entry.
- $r = db_query("SELECT * FROM domain WHERE domain = 'ALL'");
+ $table_domain = table_by_key('domain');
+ $r = db_query("SELECT * FROM $table_domain WHERE domain = 'ALL'");
if($r['rows'] == 0) {
- db_insert('domain', array('domain' => 'ALL')); // all other fields should default through the schema.
+ db_insert($table_domain, array('domain' => 'ALL')); // all other fields should default through the schema.
}
list ($error, $tMessage, $pAdminCreate_admin_username_text, $pAdminCreate_admin_password_text) = create_admin($fUsername, $fPassword, $fPassword2, array('ALL'), TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-24 21:01:30
|
Revision: 488
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=488&view=rev
Author: GingerDog
Date: 2008-11-24 21:01:27 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
see bug 2338300 - patch merged
Modified Paths:
--------------
trunk/languages/fr.lang
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2008-11-24 20:54:20 UTC (rev 487)
+++ trunk/languages/fr.lang 2008-11-24 21:01:27 UTC (rev 488)
@@ -341,10 +341,10 @@
$PALANG['pUsersVacation_welcome_text'] = 'Votre repondeur automatique est déjà configuré!';
$PALANG['pUsersVacation_subject'] = 'Sujet';
$PALANG['pUsersVacation_subject_text'] = 'En dehors du bureau';
-$PALANG['pUsersVacation_body'] = 'Message'; # XXX
+$PALANG['pUsersVacation_body'] = ''; # XXX
$PALANG['pUsersVacation_body_text'] = <<<EOM
-Je serais absent(e) de <date> jusqu\'au <date>.
-Pour urgence communiquez avec mon collegue <contact person>.
+Je serai absent(e) de <date> jusqu\'au <date>.
+Pour toute urgence, merci de contacter <contact person>.
EOM;
$PALANG['pUsersVacation_button_away'] = 'Absence';
$PALANG['pUsersVacation_button_back'] = 'De retour';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-24 20:54:25
|
Revision: 487
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=487&view=rev
Author: GingerDog
Date: 2008-11-24 20:54:20 +0000 (Mon, 24 Nov 2008)
Log Message:
-----------
upgrade.php: use dynamic table names more often - should make postgresql more happy with shcmeas etc
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-23 12:24:14 UTC (rev 486)
+++ trunk/upgrade.php 2008-11-24 20:54:20 UTC (rev 487)
@@ -366,7 +366,7 @@
CREATE TABLE ' . table_by_key('alias') . ' (
address character varying(255) NOT NULL,
goto text NOT NULL,
- domain character varying(255) NOT NULL REFERENCES domain,
+ domain character varying(255) NOT NULL REFERENCES "' . table_by_key('domain') '",
created timestamp with time zone default now(),
modified timestamp with time zone default now(),
active boolean NOT NULL default true,
@@ -381,7 +381,7 @@
db_query_parsed('
CREATE TABLE ' . table_by_key('domain_admins') . ' (
username character varying(255) NOT NULL,
- domain character varying(255) NOT NULL REFERENCES domain,
+ domain character varying(255) NOT NULL REFERENCES "' . table_by_key('domain') . '",
created timestamp with time zone default now(),
active boolean NOT NULL default true
);
@@ -410,7 +410,7 @@
name character varying(255) NOT NULL default \'\',
maildir character varying(255) NOT NULL default \'\',
quota integer NOT NULL default 0,
- domain character varying(255) NOT NULL REFERENCES domain,
+ domain character varying(255) NOT NULL REFERENCES "' . table_by_key('domain') . '",
created timestamp with time zone default now(),
modified timestamp with time zone default now(),
active boolean NOT NULL default true,
@@ -428,7 +428,7 @@
subject character varying(255) NOT NULL,
body text NOT NULL ,
cache text NOT NULL ,
- "domain" character varying(255) NOT NULL REFERENCES "domain",
+ "domain" character varying(255) NOT NULL REFERENCES "' . table_by_key('domain') . '",
created timestamp with time zone DEFAULT now(),
active boolean DEFAULT true NOT NULL
);
@@ -438,7 +438,7 @@
if(!_pgsql_object_exists(table_by_key('vacation_notification'))) {
db_query_parsed('
CREATE TABLE ' . table_by_key('vacation_notification') . ' (
- on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
+ on_vacation character varying(255) NOT NULL REFERENCES ' . table_by_key('vacation') . '(email) ON DELETE CASCADE,
notified character varying(255) NOT NULL,
notified_at timestamp with time zone NOT NULL DEFAULT now(),
CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified)
@@ -512,6 +512,7 @@
$table_log = table_by_key('log');
$table_mailbox = table_by_key('mailbox');
$table_vacation = table_by_key('vacation');
+ $table_vacation_notification = table_by_key('vacation_notification');
if(!_pgsql_field_exists($table_domain, 'quota')) {
$result = db_query_parsed("ALTER TABLE $table_domain ADD COLUMN quota int NOT NULL default '0'");
@@ -519,14 +520,14 @@
$result = db_query_parsed("ALTER TABLE $table_domain ALTER COLUMN domain DROP DEFAULT");
if(!_pgsql_object_exists('domain_domain_active')) {
- $result = db_query_parsed("CREATE INDEX domain_domain_active ON domain(domain,active)");
+ $result = db_query_parsed("CREATE INDEX domain_domain_active ON $table_domain(domain,active)");
}
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN domain DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_alias ALTER COLUMN address DROP DEFAULT");
$result = db_query_parsed("ALTER TABLE $table_alias ALTER COLUMN domain DROP DEFAULT");
if(!_pgsql_object_exists('alias_address_active')) {
- $result = db_query_parsed("CREATE INDEX alias_address_active ON alias(address,active)");
+ $result = db_query_parsed("CREATE INDEX alias_address_active ON $table_alias(address,active)");
}
$result = db_query_parsed("ALTER TABLE $table_domain_admins ALTER COLUMN username DROP DEFAULT");
@@ -546,13 +547,13 @@
$result = db_query_parsed("
BEGIN;
ALTER TABLE $table_mailbox RENAME COLUMN domain TO domain_old;
- ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES domain (domain);
+ ALTER TABLE $table_mailbox ADD COLUMN domain varchar(255) REFERENCES $table_domain (domain);
UPDATE $table_mailbox SET domain = domain_old;
ALTER TABLE $table_mailbox DROP COLUMN domain_old;
COMMIT;"
);
if(!_pgsql_object_exists('mailbox_username_active')) {
- db_query_parsed('CREATE INDEX mailbox_username_active ON mailbox(username,active)');
+ db_query_parsed('CREATE INDEX mailbox_username_active ON $table_mailbox(username,active)');
}
@@ -564,20 +565,20 @@
$result = db_query_parsed("
BEGIN;
ALTER TABLE $table_vacation RENAME COLUMN domain to domain_old;
- ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES domain;
+ ALTER TABLE $table_vacation ADD COLUMN domain varchar(255) REFERENCES $domain;
UPDATE $table_vacation SET domain = domain_old;
ALTER TABLE $table_vacation DROP COLUMN domain_old;
COMMIT;
");
if(!_pgsql_object_exists('vacation_email_active')) {
- $result = db_query_parsed("CREATE INDEX vacation_email_active ON vacation(email,active)");
+ $result = db_query_parsed("CREATE INDEX vacation_email_active ON $table_vacation(email,active)");
}
- if(!_pgsql_object_exists('vacation_notification')) {
+ if(!_pgsql_object_exists($table_vacation_notification)) {
$result = db_query_parsed("
- CREATE TABLE vacation_notification (
- on_vacation character varying(255) NOT NULL REFERENCES vacation(email) ON DELETE CASCADE,
+ CREATE TABLE $table_vacation_notification (
+ on_vacation character varying(255) NOT NULL REFERENCES $table_vacation(email) ON DELETE CASCADE,
notified character varying(255) NOT NULL,
notified_at timestamp with time zone NOT NULL DEFAULT now(),
CONSTRAINT vacation_notification_pkey primary key(on_vacation,notified));");
@@ -756,6 +757,7 @@
*/
function upgrade_318_mysql() {
$table_vacation_notification = table_by_key('vacation_notification');
+ $table_vacation = table_by_key('vacation');
db_query_parsed( "
CREATE TABLE {IF_NOT_EXISTS} $table_vacation_notification (
@@ -764,7 +766,7 @@
notified_at timestamp NOT NULL default CURRENT_TIMESTAMP,
PRIMARY KEY on_vacation (`on_vacation`, `notified`),
CONSTRAINT `vacation_notification_pkey`
- FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE
+ FOREIGN KEY (`on_vacation`) REFERENCES $table_vacation(`email`) ON DELETE CASCADE
)
ENGINE=InnoDB DEFAULT {LATIN1} TYPE=InnoDB
COMMENT='Postfix Admin - Virtual Vacation Notifications'
@@ -789,7 +791,7 @@
# create constraint...
$result = db_query_parsed("
ALTER TABLE $table_vacation_notification ADD CONSTRAINT `vacation_notification_pkey`
- FOREIGN KEY (`on_vacation`) REFERENCES vacation(`email`) ON DELETE CASCADE ");
+ FOREIGN KEY (`on_vacation`) REFERENCES $table_vacation(`email`) ON DELETE CASCADE ");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 12:24:16
|
Revision: 486
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=486&view=rev
Author: christian_boltz
Date: 2008-11-23 12:24:14 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
CHANGELOG.txt
- updated with changes up to r485
- moved SVN revisions to version headlines - this increases the chance that
we don't forget to include them ;-)
Modified Paths:
--------------
trunk/CHANGELOG.TXT
Modified: trunk/CHANGELOG.TXT
===================================================================
--- trunk/CHANGELOG.TXT 2008-11-23 12:18:20 UTC (rev 485)
+++ trunk/CHANGELOG.TXT 2008-11-23 12:24:14 UTC (rev 486)
@@ -39,7 +39,11 @@
- fix: honor $CONF['default_transport'] even if $CONF['transport'] = "no" (patch by fabiobon)
- show links to create mailboxes or alias even on disabled domains
- added support for fetchmail's "ssl" option
+ - superadmin can now setup fetchmail for all users, not only for himself
- force username to be lowercase - this helps some IMAP clients apprently
+ - the "probably undeliverable" marker now honors catchall targets
+ - on mailbox creation, show password if $CONF['generate_password'] == 'YES', but
+ do not show it if it was _not_ autogenerated and $CONF['show_password'] == 'NO'
- dropped $CONF['show_custom_count']. PHP can count ;-)
- dropped obsolete VIRTUAL_VACATION/mail-filter script
- translation updates
@@ -47,15 +51,14 @@
- SVN revision *******************************
-Version 2.2.1.1 - 2008/07/23
-----------------------------
+Version 2.2.1.1 - 2008/07/23 - SVN r412
+---------------------------------------
- fixed version number in functions.inc.php ;-)
- - SVN revision 412
-Version 2.2.1 - 2008/07/21
---------------------------
+Version 2.2.1 - 2008/07/21 - SVN r408
+-------------------------------------
- added quota parameter to mailbox_postcreation hook
- new hook to update the quota after editing a mailbox ($CONF['mailbox_postedit_script'])
@@ -65,7 +68,6 @@
- several small bugfixes
- Norwegian (bokmal) translation added
- several translation updates
- - SVN revision 408
Version 2.2.0 - 2008/04/29
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-23 12:18:24
|
Revision: 485
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=485&view=rev
Author: christian_boltz
Date: 2008-11-23 12:18:20 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
edit-mailbox.php, templates/edit-mailbox.php:
- revert r482 (show password when editing mailboxes) because it does more
harm than good (see mailinglist for details).
Also opened a feature request to bring this back in a way that works for
everybody:
https://sourceforge.net/tracker/index.php?func=detail&aid=2332595&group_id=191583&atid=937967
Modified Paths:
--------------
trunk/edit-mailbox.php
trunk/templates/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-11-22 10:23:36 UTC (rev 484)
+++ trunk/edit-mailbox.php 2008-11-23 12:18:20 UTC (rev 485)
@@ -20,7 +20,6 @@
*
* tMessage
* tName
- * tPassword
* tQuota
*
* Form POST \ GET Variables:
@@ -76,11 +75,7 @@
if ('pgsql'==$CONF['database_type']) {
$tActive = ('t'==$user_details['active']) ? 1 : 0;
}
- $tPassword = '';
- if ($CONF['show_password'] == "YES")
- {
- $tPassword = $user_details['password'];
- }
+
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
if ($result['rows'] == 1)
{
Modified: trunk/templates/edit-mailbox.php
===================================================================
--- trunk/templates/edit-mailbox.php 2008-11-22 10:23:36 UTC (rev 484)
+++ trunk/templates/edit-mailbox.php 2008-11-23 12:18:20 UTC (rev 485)
@@ -12,7 +12,7 @@
</tr>
<tr>
<td><?php print $PALANG['pEdit_mailbox_password'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword" value="<?php print htmlspecialchars ($tPassword,ENT_QUOTES); ?>"/></td>
+ <td><input class="flat" type="password" name="fPassword" /></td>
<td><?php print $pEdit_mailbox_password_text; ?></td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-22 10:23:45
|
Revision: 484
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=484&view=rev
Author: christian_boltz
Date: 2008-11-22 10:23:36 +0000 (Sat, 22 Nov 2008)
Log Message:
-----------
edit-mailbox:
- password change is now recognized even if only the "new password (again)"
field was changed/filled
Modified Paths:
--------------
trunk/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-11-21 21:10:21 UTC (rev 483)
+++ trunk/edit-mailbox.php 2008-11-22 10:23:36 UTC (rev 484)
@@ -103,7 +103,7 @@
if (isset ($_POST['fQuota'])) $fQuota = intval ($_POST['fQuota']);
if (isset ($_POST['fActive'])) $fActive = escape_string ($_POST['fActive']);
- if($fPassword != $user_details['password']){
+ if($fPassword != $user_details['password'] || $fPassword2 != $user_details['password']){
$min_length = $CONF['min_password_length'];
if($fPassword == $fPassword2) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-21 21:10:27
|
Revision: 483
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=483&view=rev
Author: christian_boltz
Date: 2008-11-21 21:10:21 +0000 (Fri, 21 Nov 2008)
Log Message:
-----------
upgrade.php
- upgrade_483_mysql(): change log.data to TEXT (was VARCHAR) - this fixes
problems when changing aliases with lots of targets
https://sourceforge.net/tracker/?func=detail&atid=937964&aid=1980062&group_id=191583
Modified Paths:
--------------
trunk/upgrade.php
Modified: trunk/upgrade.php
===================================================================
--- trunk/upgrade.php 2008-11-13 11:56:52 UTC (rev 482)
+++ trunk/upgrade.php 2008-11-21 21:10:21 UTC (rev 483)
@@ -1000,3 +1000,8 @@
db_query_parsed("alter table $table_fmail rename column ssl to usessl");
}
+function upgrade_483_mysql () {
+ $table_log = table_by_key('log');
+ db_query_parsed("ALTER TABLE $table_log CHANGE `data` `data` TEXT {LATIN1} NOT NULL");
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Gin...@us...> - 2008-11-13 11:56:56
|
Revision: 482
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=482&view=rev
Author: GingerDog
Date: 2008-11-13 11:56:52 +0000 (Thu, 13 Nov 2008)
Log Message:
-----------
patch from int on irc - if $CONF[show_passwords] then do so
Modified Paths:
--------------
trunk/edit-mailbox.php
trunk/templates/edit-mailbox.php
Modified: trunk/edit-mailbox.php
===================================================================
--- trunk/edit-mailbox.php 2008-11-12 22:57:30 UTC (rev 481)
+++ trunk/edit-mailbox.php 2008-11-13 11:56:52 UTC (rev 482)
@@ -20,6 +20,7 @@
*
* tMessage
* tName
+ * tPassword
* tQuota
*
* Form POST \ GET Variables:
@@ -75,7 +76,11 @@
if ('pgsql'==$CONF['database_type']) {
$tActive = ('t'==$user_details['active']) ? 1 : 0;
}
-
+ $tPassword = '';
+ if ($CONF['show_password'] == "YES")
+ {
+ $tPassword = $user_details['password'];
+ }
$result = db_query ("SELECT * FROM $table_domain WHERE domain='$fDomain'");
if ($result['rows'] == 1)
{
Modified: trunk/templates/edit-mailbox.php
===================================================================
--- trunk/templates/edit-mailbox.php 2008-11-12 22:57:30 UTC (rev 481)
+++ trunk/templates/edit-mailbox.php 2008-11-13 11:56:52 UTC (rev 482)
@@ -12,7 +12,7 @@
</tr>
<tr>
<td><?php print $PALANG['pEdit_mailbox_password'] . ":"; ?></td>
- <td><input class="flat" type="password" name="fPassword" /></td>
+ <td><input class="flat" type="password" name="fPassword" value="<?php print htmlspecialchars ($tPassword,ENT_QUOTES); ?>"/></td>
<td><?php print $pEdit_mailbox_password_text; ?></td>
</tr>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-12 22:57:35
|
Revision: 481
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=481&view=rev
Author: christian_boltz
Date: 2008-11-12 22:57:30 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
create-mailbox.php:
- show password when $CONF['generate_password'] == 'YES', fixes
https://sourceforge.net/tracker/index.php?func=detail&aid=2015707&group_id=191583&atid=937964
- do not show password if it was _not_ autogenerated and $CONF['show_password'] == 'NO'
Modified Paths:
--------------
trunk/create-mailbox.php
Modified: trunk/create-mailbox.php
===================================================================
--- trunk/create-mailbox.php 2008-11-12 22:07:50 UTC (rev 480)
+++ trunk/create-mailbox.php 2008-11-12 22:57:30 UTC (rev 481)
@@ -112,11 +112,13 @@
$pCreate_mailbox_username_text = $PALANG['pCreate_mailbox_username_text_error1'];
}
+ $tPassGenerated = 0;
if (empty ($fPassword) or empty ($fPassword2) or ($fPassword != $fPassword2))
{
if (empty ($fPassword) and empty ($fPassword2) and $CONF['generate_password'] == "YES")
{
$fPassword = generate_password ();
+ $tPassGenerated = 1;
}
else
{
@@ -278,22 +280,6 @@
*/
$tDomain = $fDomain;
- if ($CONF['generate_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- if ($CONF['show_password'] == "YES")
- {
- $tMessage .= " / $fPassword)</br />";
- }
- else
- {
- $tMessage .= ")</br />";
- }
- }
-
$tQuota = $CONF['maxquota'];
if ($fMail == "on")
@@ -320,11 +306,14 @@
}
}
+ $tShowpass = "";
+ if ( $tPassGenerated == 1 || $CONF['show_password'] == "YES") $tShowpass = " / $fPassword";
+
if (create_mailbox_subfolders($fUsername,$fPassword))
{
- $tMessage = $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername)";
+ $tMessage .= $PALANG['pCreate_mailbox_result_success'] . "<br />($fUsername$tShowpass)";
} else {
- $tMessage = $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername)";
+ $tMessage .= $PALANG['pCreate_mailbox_result_succes_nosubfolders'] . "<br />($fUsername$tShowpass)";
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2008-11-12 22:07:55
|
Revision: 480
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=480&view=rev
Author: christian_boltz
Date: 2008-11-12 22:07:50 +0000 (Wed, 12 Nov 2008)
Log Message:
-----------
functions.inc.php
- gen_show_status(): "probably undeliverable" marker now honors catchall
aliases and no longer marks aliases pointing to a catchall as invalid
https://sourceforge.net/tracker/index.php?func=detail&aid=2013772&group_id=191583&atid=937964
Modified Paths:
--------------
trunk/functions.inc.php
Modified: trunk/functions.inc.php
===================================================================
--- trunk/functions.inc.php 2008-11-12 21:48:31 UTC (rev 479)
+++ trunk/functions.inc.php 2008-11-12 22:07:50 UTC (rev 480)
@@ -2006,7 +2006,8 @@
$stat_ok = 1;
while ( ($g=array_pop($gotos)) && $stat_ok )
{
- $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '$g'");
+ $stat_catchall = substr($g,strpos($g,"@"));
+ $stat_result = db_query ("SELECT address FROM $table_alias WHERE address = '$g' OR address = '$stat_catchall'");
if ($stat_result['rows'] == 0)
{
$stat_ok = 0;
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.
