mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
composer format
This commit is contained in:
parent
a99d6b7bc8
commit
38549c48ad
@ -1316,7 +1316,7 @@ function pacrypt($pw, $pw_db = "")
|
|||||||
if (!empty($pw_db) && preg_match('/^{([0-9a-z-\.]+)}/i', $pw_db, $matches)) {
|
if (!empty($pw_db) && preg_match('/^{([0-9a-z-\.]+)}/i', $pw_db, $matches)) {
|
||||||
$method_in_hash = $matches[1];
|
$method_in_hash = $matches[1];
|
||||||
if ('COURIER:' . strtoupper($method_in_hash) == $mechanism) {
|
if ('COURIER:' . strtoupper($method_in_hash) == $mechanism) {
|
||||||
// don't try and be clever.
|
// don't try and be clever.
|
||||||
} elseif ($mechanism != $method_in_hash) {
|
} elseif ($mechanism != $method_in_hash) {
|
||||||
error_log("PostfixAdmin: configured to use $mechanism, but asked to crypt password using {$method_in_hash}; are you migrating algorithm/mechanism or is something wrong?");
|
error_log("PostfixAdmin: configured to use $mechanism, but asked to crypt password using {$method_in_hash}; are you migrating algorithm/mechanism or is something wrong?");
|
||||||
$mechanism = $method_in_hash;
|
$mechanism = $method_in_hash;
|
||||||
@ -1742,7 +1742,7 @@ function db_connect()
|
|||||||
|
|
||||||
$username_password = false;
|
$username_password = false;
|
||||||
} elseif (db_pgsql()) {
|
} elseif (db_pgsql()) {
|
||||||
// nothing to do.
|
// nothing to do.
|
||||||
} else {
|
} else {
|
||||||
throw new Exception("<p style='color: red'>FATAL Error:<br />Invalid \$CONF['database_type']! Please fix your config.inc.php!</p>");
|
throw new Exception("<p style='color: red'>FATAL Error:<br />Invalid \$CONF['database_type']! Please fix your config.inc.php!</p>");
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@ class CliView extends Shell
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($struct[$field]['display_in_list'] == 0) {
|
if ($struct[$field]['display_in_list'] == 0) {
|
||||||
# do nothing
|
# do nothing
|
||||||
} else {
|
} else {
|
||||||
$value = $result[$field];
|
$value = $result[$field];
|
||||||
|
|
||||||
|
@ -110,7 +110,7 @@ function _db_add_field($table, $field, $fieldtype, $after = '')
|
|||||||
function echo_out($text)
|
function echo_out($text)
|
||||||
{
|
{
|
||||||
if (defined('PHPUNIT_TEST')) {
|
if (defined('PHPUNIT_TEST')) {
|
||||||
//error_log("" . $text);
|
//error_log("" . $text);
|
||||||
} else {
|
} else {
|
||||||
echo $text . "\n";
|
echo $text . "\n";
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user