Stopped filling inputs with passwords

This commit is contained in:
TimZ99 2020-02-09 17:30:01 +01:00
parent 5ca3788c97
commit ce5485bc27
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 4 additions and 11 deletions

View File

@ -186,14 +186,7 @@ class ConfigController extends AbstractController
}
// encrypted fields
foreach ($this->encryptedFields as $encryptedField) {
if (true === isset($config[$encryptedField]) && trim($config[$encryptedField])) {
$tpl_data[$encryptedField] = psm_password_decrypt(
$config['password_encrypt_key'],
$config[$encryptedField]
);
} else {
$tpl_data[$encryptedField] = '';
}
$tpl_data[$encryptedField] = '';
}
$tpl_data[$this->default_tab . '_active'] = 'active';
@ -246,9 +239,8 @@ class ConfigController extends AbstractController
$value = filter_input(INPUT_POST, $encryptedField);
if ($value !== null && $value !== '') {
$clean[$encryptedField] = psm_password_encrypt(psm_get_conf('password_encrypt_key'), $value);
} else {
$clean[$encryptedField] = '';
}
// else { leave as is }
}
$language_refresh = ($clean['language'] != psm_get_conf('language'));
foreach ($clean as $key => $value) {
@ -478,6 +470,7 @@ class ConfigController extends AbstractController
'label_log_retention_period_description' => psm_get_lang('config', 'log_retention_period_description'),
'label_log_retention_days' => psm_get_lang('config', 'log_retention_days'),
'label_days' => psm_get_lang('config', 'log_retention_days'),
'label_leave_blank' => psm_get_lang('users', 'password_leave_blank'),
);
}

View File

@ -99,7 +99,7 @@
<!-- email user -->
{{ macro.input_field("text", "email_smtp_username", null, "email_smtp_username", label_email_smtp_username, email_smtp_username, label_email_smtp_username, "255") }}
<!-- email password -->
{{ macro.input_field("password", "email_smtp_password", null, "email_smtp_password", label_email_smtp_password, email_smtp_password, label_email_smtp_password, "255", 'email_smtp_password_help', label_email_smtp_password_description, null, true) }}
{{ macro.input_field("password", "email_smtp_password", null, "email_smtp_password", label_email_smtp_password, email_smtp_password, label_leave_blank, "255", 'email_smtp_password_help', label_email_smtp_password_description, null, true) }}
{{ macro.button_test("testEmail", label_test) }}
{{ macro.input_hidden("test_email", "0") }}
{{ macro.button_save("email_submit", label_save) }}