Browse Source

composer format

issue-642-list-virtual-pagination-after-edit
David Goodwin 3 years ago
parent
commit
38549c48ad
  1. 4
      functions.inc.php
  2. 2
      model/CliView.php
  3. 2
      public/upgrade.php

4
functions.inc.php

@ -1316,7 +1316,7 @@ function pacrypt($pw, $pw_db = "")
if (!empty($pw_db) && preg_match('/^{([0-9a-z-\.]+)}/i', $pw_db, $matches)) {
$method_in_hash = $matches[1];
if ('COURIER:' . strtoupper($method_in_hash) == $mechanism) {
// don't try and be clever.
// don't try and be clever.
} 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?");
$mechanism = $method_in_hash;
@ -1742,7 +1742,7 @@ function db_connect()
$username_password = false;
} elseif (db_pgsql()) {
// nothing to do.
// nothing to do.
} else {
throw new Exception("<p style='color: red'>FATAL Error:<br />Invalid \$CONF['database_type']! Please fix your config.inc.php!</p>");
}

2
model/CliView.php

@ -64,7 +64,7 @@ class CliView extends Shell
}
if ($struct[$field]['display_in_list'] == 0) {
# do nothing
# do nothing
} else {
$value = $result[$field];

2
public/upgrade.php

@ -110,7 +110,7 @@ function _db_add_field($table, $field, $fieldtype, $after = '')
function echo_out($text)
{
if (defined('PHPUNIT_TEST')) {
//error_log("" . $text);
//error_log("" . $text);
} else {
echo $text . "\n";
}

Loading…
Cancel
Save