pull/854/head
TimZ99 2020-02-09 17:11:57 +01:00
parent ff2947c00c
commit 13f4ba492e
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
3 changed files with 37 additions and 31 deletions

View File

@ -595,7 +595,10 @@ namespace {
$phpmailer->SMTPSecure = psm_get_conf('email_smtp_security');
$smtp_user = psm_get_conf('email_smtp_username');
$smtp_pass = psm_password_decrypt(psm_get_conf('password_encrypt_key'), psm_get_conf('email_smtp_password'));
$smtp_pass = psm_password_decrypt(
psm_get_conf('password_encrypt_key'),
psm_get_conf('email_smtp_password')
);
if ($smtp_user != '' && $smtp_pass != '') {
$phpmailer->SMTPAuth = true;

View File

@ -187,7 +187,10 @@ 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]);
$tpl_data[$encryptedField] = psm_password_decrypt(
$config['password_encrypt_key'],
$config[$encryptedField]
);
} else {
$tpl_data[$encryptedField] = '';
}