tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5217-websocket-settings-en-open-no-funciona-bien' into 'develop' 

Form fixes

See merge request artica/pandorafms!3242
This commit is contained in:
Alejandro Fraguas 2020-06-08 10:16:58 +02:00
parent e6a0406cd5 fae026a089
commit bf66724c9f
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/extensions/quick_shell.php
View File

@ -318,15 +318,15 @@ function quickShellSettings()
);
$gotty_host = get_parameter(
'gotty_host',
$config['gotty_host']
''
);
$gotty_ssh_port = get_parameter(
'gotty_ssh_port',
$config['gotty_ssh_port']
''
);
$gotty_telnet_port = get_parameter(
'gotty_telnet_port',
$config['gotty_telnet_port']
''
);
$gotty_user = get_parameter(

26
pandora_console/include/functions_config.php
View File

@ -354,18 +354,6 @@ function config_update_config()
if (!config_update_value('email_password', io_input_password(get_parameter('email_password')))) {
$error_update[] = __('Email password');
}
if (!config_update_value('ws_bind_address', get_parameter('ws_bind_address'))) {
$error_update[] = __('WebSocket bind address');
}
if (!config_update_value('ws_port', get_parameter('ws_port'))) {
$error_update[] = __('WebSocket port');
}
if (!config_update_value('ws_proxy_url', get_parameter('ws_proxy_url'))) {
$error_update[] = __('WebSocket proxy url');
}
break;
case 'enterprise':
@ -1599,6 +1587,20 @@ function config_update_config()
}
break;
case 'websocket_engine':
if (!config_update_value('ws_bind_address', get_parameter('ws_bind_address'))) {
$error_update[] = __('WebSocket bind address');
}
if (!config_update_value('ws_port', get_parameter('ws_port'))) {
$error_update[] = __('WebSocket port');
}
if (!config_update_value('ws_proxy_url', get_parameter('ws_proxy_url'))) {
$error_update[] = __('WebSocket proxy url');
}
break;
default:
// Ignore.
break;