Merge branch '1358-Configuracion-de-email-en-la-consola-de-Pandora-dev' into 'develop'

Added encryption select in enterprise setup

See merge request !869
This commit is contained in:
vgilc 2017-10-04 16:05:51 +02:00
commit bd184f9e7a
1 changed files with 6 additions and 0 deletions

View File

@ -262,6 +262,8 @@ function config_update_config () {
$error_update[] = __('Server SMTP');
if (!config_update_value ('email_smtpPort', (int)get_parameter('email_smtpPort')))
$error_update[] = __('Port SMTP');
if (!config_update_value ('email_encryption', get_parameter('email_encryption')))
$error_update[] = __('Encryption');
if (!config_update_value ('email_username', get_parameter('email_username')))
$error_update[] = __('Email user');
if (!config_update_value ('email_password', get_parameter('email_password')))
@ -1236,6 +1238,10 @@ function config_process_config () {
if (!isset ($config['email_smtpPort'])) {
config_update_value ( 'email_smtpPort', 25);
}
if (!isset ($config['email_encryption'])) {
config_update_value ( 'email_encryption', 0);
}
if (!isset ($config['email_username'])) {
config_update_value ( 'email_username', "");