1
0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-06 06:42:37 +03:00

merge postfixadmin_3.3 into master

This commit is contained in:
David Goodwin
2021-01-21 13:52:41 +00:00
3 changed files with 10 additions and 4 deletions

View File

@@ -6,6 +6,14 @@
# #
# Further details on the project are available at https://github.com/postfixadmin/postfixadmin # Further details on the project are available at https://github.com/postfixadmin/postfixadmin
Version 3.3.4 - 2021/01/19
-------------------------------------------------
- Fix forgot-password (theme + trying to use class before autoload registered) (see //github.com/postfixadmin/postfixadmin/issues/427)
- Fix PHP 8.0 issues (string{} offset in CLI, psalm warning about string + int in MailboxHandler)
- Add PHP 8.0 to travis build + hopefully fix build
- Fix editform to add linefeeds on for e.g. alias editing (see https://github.com/postfixadmin/postfixadmin/pull/424)
- Fix mysql_crypt password hash - not all MySQL variants have RANDOM_BYTES function, so use our PHP based salt instead. (see https://github.com/postfixadmin/postfixadmin/issues/422)
Version 3.3.3 - 2021/01/14 Version 3.3.3 - 2021/01/14
------------------------------------------------- -------------------------------------------------
- Improve error handling around login (require non-empty password; cope with pacrypt() throwing an exception; see https://github.com/postfixadmin/postfixadmin/issues/420) - Improve error handling around login (require non-empty password; cope with pacrypt() throwing an exception; see https://github.com/postfixadmin/postfixadmin/issues/420)

View File

@@ -227,7 +227,7 @@ if(@file_exists('/usr/bin/doveadm')) { // @ to silence openbase_dir stuff; see h
$CONF['password_validation'] = array( $CONF['password_validation'] = array(
# '/regular expression/' => '$PALANG key (optional: + parameter)', # '/regular expression/' => '$PALANG key (optional: + parameter)',
'/.{5}/' => 'password_too_short 5', # minimum length 5 characters '/.{5}/' => 'password_too_short 5', # minimum length 5 characters
'/([a-zA-Z].*){3}/' => 'password_no_characters 3', # must contain at least 3 characters '/([a-zA-Z].*){3}/' => 'password_no_characters 3', # must contain at least 3 consecutive characters
'/([0-9].*){2}/' => 'password_no_digits 2', # must contain at least 2 digits '/([0-9].*){2}/' => 'password_no_digits 2', # must contain at least 2 digits
/* support a 'callable' value which if it returns a non-empty string will be assumed to have failed. */ /* support a 'callable' value which if it returns a non-empty string will be assumed to have failed. */
@@ -714,7 +714,7 @@ $CONF['xmlrpc_enabled'] = false;
//More details in README.password_expiration //More details in README.password_expiration
$CONF['password_expiration'] = 'YES'; $CONF['password_expiration'] = 'YES';
$CONF['version'] = '3.3.3'; $CONF['version'] = '3.3.4';
// If you want to keep most settings at default values and/or want to ensure // If you want to keep most settings at default values and/or want to ensure
// that future updates work without problems, you can use a separate config // that future updates work without problems, you can use a separate config

View File

@@ -25,8 +25,6 @@
* fUsername * fUsername
*/ */
/* if in .../users, we need to load a different common.php; not this file is symlinked with public/ */ /* if in .../users, we need to load a different common.php; not this file is symlinked with public/ */
if (preg_match('/\/users\//', $_SERVER['REQUEST_URI'])) { if (preg_match('/\/users\//', $_SERVER['REQUEST_URI'])) {
$rel_path = '../'; $rel_path = '../';