SF.net SVN: postfixadmin:[893] branches/postfixadmin-2.3
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[893] branches/postfixadmin-2.3
|
From: <chr...@us...> - 2010-12-15 23:41:48
|
Revision: 893
http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=893&view=rev
Author: christian_boltz
Date: 2010-12-15 23:41:40 +0000 (Wed, 15 Dec 2010)
Log Message:
-----------
Backport of various fixes from trunk to the 2.3 branch
- list-virtual: fix displaying of 'modified' column for aliases when using
postgres
- replaced deprecated split() with preg_split() or explode()
- functions.inc.php: better error messages when database functions are missing
- create domain: fixed typo in variable name that broke the default value for
default aliases
- create domain: backup MX checkbox is now XHTML compliant
- vacation.pl logged literal $variable instead of the variable content at two
places
- POSTFIX_CONF.txt: fixed filename for quota map
- config.inc.php: removed double $CONF['database_prefix']
- config.inc.php: fixed comments about domain_post* script parameters
- CHANGELOG.TXT: add new section for 2.3.3, include all the above
Modified Paths:
--------------
branches/postfixadmin-2.3/CHANGELOG.TXT
branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt
branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl
branches/postfixadmin-2.3/config.inc.php
branches/postfixadmin-2.3/create-domain.php
branches/postfixadmin-2.3/functions.inc.php
branches/postfixadmin-2.3/list-virtual.php
branches/postfixadmin-2.3/templates/admin_create-domain.php
Modified: branches/postfixadmin-2.3/CHANGELOG.TXT
===================================================================
--- branches/postfixadmin-2.3/CHANGELOG.TXT 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/CHANGELOG.TXT 2010-12-15 23:41:40 UTC (rev 893)
@@ -10,6 +10,22 @@
# Last update:
# $Id$
+Version 2.3.3 - 2010/**/** - SVN r*** (postfixadmin-2.3 branch)
+---------------------------------------------------------------
+
+ - list-virtual: fix displaying of 'modified' column for aliases when using
+ postgres
+ - replaced deprecated split() with preg_split() or explode()
+ - functions.inc.php: better error messages when database functions are missing
+ - create domain: fixed typo in variable name that broke the default value for
+ default aliases
+ - create domain: backup MX checkbox is now XHTML compliant
+ - vacation.pl logged literal $variable instead of the variable content at two
+ places
+ - POSTFIX_CONF.txt: fixed filename for quota map
+ - config.inc.php: removed double $CONF['database_prefix']
+ - config.inc.php: fixed comments about domain_post* script parameters
+
Version 2.3.2 - 2010/08/24 - SVN r860 (postfixadmin-2.3 branch)
---------------------------------------------------------------
Modified: branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt
===================================================================
--- branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/DOCUMENTS/POSTFIX_CONF.txt 2010-12-15 23:41:40 UTC (rev 893)
@@ -102,7 +102,7 @@
# For quota support
-mysql-virtual-mailbox-limit-maps.cf:
+mysql_virtual_mailbox_limit_maps.cf:
user = postfix
password = password
hosts = localhost
Modified: branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl
===================================================================
--- branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/VIRTUAL_VACATION/vacation.pl 2010-12-15 23:41:40 UTC (rev 893)
@@ -324,12 +324,12 @@
# Recipient has vacation
if ($rv == 1) {
$realemail = $email;
- $logger->debug("Found '\$email'\ has vacation active");
+ $logger->debug("Found '$email' has vacation active");
} else {
my $vemail = $email;
$vemail =~ s/\@/#/g;
$vemail = $vemail . "\@" . $vacation_domain;
- $logger->debug("Looking for alias records that \'$email\' resolves to with vacation turned on");
+ $logger->debug("Looking for alias records that '$email' resolves to with vacation turned on");
$query = qq{SELECT goto FROM alias WHERE address=? AND (goto LIKE ? OR goto LIKE ? OR goto LIKE ? OR goto = ?)};
$stm = $dbh->prepare($query) or panic_prepare($query);
$stm->execute($email,"$vemail,%","%,$vemail","%,$vemail,%", "$vemail") or panic_execute($query,"address='$email'");
Modified: branches/postfixadmin-2.3/config.inc.php
===================================================================
--- branches/postfixadmin-2.3/config.inc.php 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/config.inc.php 2010-12-15 23:41:40 UTC (rev 893)
@@ -51,7 +51,6 @@
$CONF['database_user'] = 'postfix';
$CONF['database_password'] = 'postfixadmin';
$CONF['database_name'] = 'postfix';
-$CONF['database_prefix'] = '';
// If you need to specify a different port for a MYSQL database connection, use e.g.
// $CONF['database_host'] = '172.30.33.66:3308';
// If you need to specify a different port for POSTGRESQL database connection
@@ -368,7 +367,7 @@
// Note that this may fail if PHP is run in "safe mode", or if
// operating system features (such as SELinux) or limitations
// prevent the web-server from executing external scripts.
-// Parameters: (1) username
+// Parameters: (1) domain
//$CONF['domain_postcreation_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postcreation.sh';
// Optional:
@@ -376,7 +375,7 @@
// Note that this may fail if PHP is run in "safe mode", or if
// operating system features (such as SELinux) or limitations
// prevent the web-server from executing external scripts.
-// Parameters: (1) username
+// Parameters: (1) domain
// $CONF['domain_postdeletion_script']='sudo -u courier /usr/local/bin/postfixadmin-domain-postdeletion.sh';
// Optional:
Modified: branches/postfixadmin-2.3/create-domain.php
===================================================================
--- branches/postfixadmin-2.3/create-domain.php 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/create-domain.php 2010-12-15 23:41:40 UTC (rev 893)
@@ -78,7 +78,7 @@
$tAliases = $fAliases;
$tMaxquota = $fMaxquota;
$tMailboxes = $fMailboxes;
- $tDefaultAliases = $fDefaultaliases;
+ $tDefaultaliases = $fDefaultaliases;
$tBackupmx = $fBackupmx;
}
Modified: branches/postfixadmin-2.3/functions.inc.php
===================================================================
--- branches/postfixadmin-2.3/functions.inc.php 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/functions.inc.php 2010-12-15 23:41:40 UTC (rev 893)
@@ -1183,7 +1183,7 @@
$salt = substr(create_salt(), 0, 2); # courier-authlib supports only two-character salts
if(preg_match('/^{.*}/', $pw_db)) {
// we have a flavor in the db -> use it instead of default flavor
- $result = split('{|}', $pw_db, 3);
+ $result = preg_split('/[{}]/', $pw_db, 3); # split at { and/or }
$flavor = $result[1];
$salt = substr($result[2], 0, 2);
}
@@ -1457,7 +1457,7 @@
}
else
{
- $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available!<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
+ $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 3.x / 4.0 functions not available! (php5-mysql installed?)<br />database_type = 'mysql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
elseif ($CONF['database_type'] == "mysqli")
@@ -1473,7 +1473,7 @@
}
else
{
- $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available!<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
+ $error_text .= "<p />DEBUG INFORMATION:<br />MySQL 4.1 functions not available! (php5-mysqli installed?)<br />database_type = 'mysqli' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
elseif ($CONF['database_type'] == "pgsql")
@@ -1489,7 +1489,7 @@
}
else
{
- $error_text .= "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available!<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
+ $error_text .= "<p />DEBUG INFORMATION:<br />PostgreSQL functions not available! (php5-pgsql installed?)<br />database_type = 'pgsql' in config.inc.php, are you using a different database? $DEBUG_TEXT";
}
}
else
Modified: branches/postfixadmin-2.3/list-virtual.php
===================================================================
--- branches/postfixadmin-2.3/list-virtual.php 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/list-virtual.php 2010-12-15 23:41:40 UTC (rev 893)
@@ -166,7 +166,7 @@
# TODO: is the different query for pgsql really needed? The mailbox query below also works with both...
$query = "SELECT address,
goto,
- extract(epoch from modified) as modified,
+ modified,
active
FROM $table_alias
WHERE $sql_domain AND NOT EXISTS(SELECT 1 FROM $table_mailbox WHERE username=$table_alias.address $sql_where)
@@ -246,7 +246,7 @@
while ($row = db_array ($result['result']))
{
if ($display_mailbox_aliases) {
- $goto_split = split(",", $row['goto']);
+ $goto_split = explode(",", $row['goto']);
$row['goto_mailbox'] = 0;
$row['goto_other'] = array();
Modified: branches/postfixadmin-2.3/templates/admin_create-domain.php
===================================================================
--- branches/postfixadmin-2.3/templates/admin_create-domain.php 2010-12-15 23:17:08 UTC (rev 892)
+++ branches/postfixadmin-2.3/templates/admin_create-domain.php 2010-12-15 23:41:40 UTC (rev 893)
@@ -62,7 +62,7 @@
</tr>
<tr>
<td><?php print $PALANG['pAdminCreate_domain_backupmx'] . ":"; ?></td>
- <td><?php $checked = ($tBackupmx == 'on') ? 'checked' : ''; ?>
+ <td><?php $checked = ($tBackupmx == 'on') ? 'checked="checked"' : ''; ?>
<input class="flat" type="checkbox" value='on' name="fBackupmx" <?php print $checked; ?> />
</td>
<td> </td>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
