diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php index 9ea79ba364..2f45e19606 100644 --- a/pandora_console/extensions/quick_shell.php +++ b/pandora_console/extensions/quick_shell.php @@ -273,6 +273,14 @@ function buildConnectionURL($method) { global $config; + if (isset($config['gotty_ssh_use_ssl']) === false) { + $config['gotty_ssh_use_ssl'] = ''; + } + + if (isset($config['gotty_telnet_use_ssl']) === false) { + $config['gotty_telnet_use_ssl'] = ''; + } + $address = (empty($config['gotty_addr']) === true) ? $_SERVER['SERVER_ADDR'] : $config['gotty_addr']; $use_ssl = ($method === 'ssh') ? $config['gotty_ssh_use_ssl'] : $config['gotty_telnet_use_ssl']; $protocol = ((bool) $use_ssl === true) ? 'https://' : 'http://'; @@ -353,6 +361,18 @@ function quickShellSettings() config_update_value('gotty_telnet_enabled', $gotty_telnet_enabled); } + if (isset($config['gotty_addr']) === false) { + $config['gotty_addr'] = ''; + } + + if (isset($config['gotty_ssh_use_ssl']) === false) { + $config['gotty_ssh_use_ssl'] = ''; + } + + if (isset($config['gotty_telnet_use_ssl']) === false) { + $config['gotty_telnet_use_ssl'] = ''; + } + if ($config['gotty_addr'] != $gotty_addr) { config_update_value('gotty_addr', $gotty_addr); } @@ -389,6 +409,25 @@ function quickShellSettings() $general_table->data = []; $general_table->style = []; $general_table->style[0] = 'width: 50%;'; + if (isset($config['gotty_addr']) === false) { + $config['gotty_addr'] = ''; + } + + if (isset($config['gotty_ssh_enabled']) === false) { + $config['gotty_ssh_enabled'] = ''; + } + + if (isset($config['gotty_ssh_use_ssl']) === false) { + $config['gotty_ssh_use_ssl'] = ''; + } + + if (isset($disable_agentaccess) === false) { + $disable_agentaccess = ''; + } + + if (isset($config['gotty_telnet_use_ssl']) === false) { + $config['gotty_telnet_use_ssl'] = ''; + } $general_table->data[0][] = html_print_label_input_block( __('Address'), diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index 283610e06a..fe44b479a9 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -246,6 +246,7 @@ if ($new_agent === true) { // QR Code table. +$CodeQRContent = ''; if ($new_agent === false) { $CodeQRContent .= html_print_div(['id' => 'qr_container_image'], true); $CodeQRContent .= html_print_anchor( diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index df6dcc1eb6..1db1d922e3 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -413,15 +413,19 @@ if (isset($config['error_config_update_config'])) { ui_print_success_message(__('Correct update the setup options')); } - if (is_array($config['error_config_update_config']['errors']) === true) { - foreach ($config['error_config_update_config']['errors'] as $msg) { - ui_print_error_message($msg); + if (isset($config['error_config_update_config']['errors']) === true) { + if (is_array($config['error_config_update_config']['errors']) === true) { + foreach ($config['error_config_update_config']['errors'] as $msg) { + ui_print_error_message($msg); + } } } - if (is_array($config['error_config_update_config']['warnings']) === true) { - foreach ($config['error_config_update_config']['warnings'] as $msg) { - ui_print_warning_message($msg); + if (isset($config['error_config_update_config']['warnings']) === true) { + if (is_array($config['error_config_update_config']['warnings']) === true) { + foreach ($config['error_config_update_config']['warnings'] as $msg) { + ui_print_warning_message($msg); + } } } diff --git a/pandora_console/godmode/setup/setup_ITSM.php b/pandora_console/godmode/setup/setup_ITSM.php index 313e6763c0..899a73a985 100644 --- a/pandora_console/godmode/setup/setup_ITSM.php +++ b/pandora_console/godmode/setup/setup_ITSM.php @@ -137,6 +137,10 @@ $row['hostname'] = html_print_label_input_block( ['div_class' => 'ITSM-remote-setup-ITSM_hostname'] ); +if (isset($config['ITSM_token']) === false) { + $config['ITSM_token'] = ''; +} + // ITSM token. $row['password'] = html_print_label_input_block( __('Token'), diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php index f9f2afcd14..df4d75d6aa 100644 --- a/pandora_console/godmode/setup/setup_auth.php +++ b/pandora_console/godmode/setup/setup_auth.php @@ -390,7 +390,7 @@ if (is_ajax() === true) { set_unless_defined($config['double_auth_enabled'], false); $row = []; $row['name'] = __('Double authentication'); - $row['control'] .= html_print_checkbox_switch( + $row['control'] = html_print_checkbox_switch( 'double_auth_enabled', 1, $config['double_auth_enabled'], @@ -405,7 +405,7 @@ if (is_ajax() === true) { set_unless_defined($config['2FA_all_users'], false); $row = []; $row['name'] = __('Force 2FA for all users is enabled'); - $row['control'] .= html_print_checkbox_switch( + $row['control'] = html_print_checkbox_switch( '2FA_all_users', 1, $config['2FA_all_users'], diff --git a/pandora_console/godmode/setup/setup_ehorus.php b/pandora_console/godmode/setup/setup_ehorus.php index 6f4879a4ac..5f0d258082 100644 --- a/pandora_console/godmode/setup/setup_ehorus.php +++ b/pandora_console/godmode/setup/setup_ehorus.php @@ -78,6 +78,18 @@ $table_remote->class = 'databox filters filter-table-adv'; $table_remote->size['ehorus_hostname'] = '50%'; $table_remote->size['ehorus_port'] = '50%'; +if (isset($config['ehorus_user_level_conf']) === false) { + $config['ehorus_user_level_conf'] = ''; +} + +if (isset($config['ehorus_user']) === false) { + $config['ehorus_user'] = ''; +} + +if (isset($config['ehorus_pass']) === false) { + $config['ehorus_pass'] = ''; +} + // Enable eHorus user configuration. $row = []; $row['ehorus_user_level_conf'] = html_print_label_input_block( diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index 3366fcc6f8..f9ea0ece51 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -488,6 +488,10 @@ $table->data[$i][] = html_print_label_input_block( ) ); +if (isset($config['force_public_url']) === false) { + $config['force_public_url'] = ''; +} + $table->data[$i++][] = html_print_label_input_block( __('Force use Public URL'), html_print_switch( @@ -498,6 +502,10 @@ $table->data[$i++][] = html_print_label_input_block( ) ); +if (isset($config['public_url_exclusions']) === false) { + $config['public_url_exclusions'] = ''; +} + $table->data[$i++][] = html_print_label_input_block( __('Public URL host exclusions'), html_print_textarea( @@ -919,6 +927,10 @@ echo ''; $table_ncm_config->size[0] = '50%'; $table_ncm_config->data = []; + if (isset($config['tftp_server_ip']) === false) { + $config['tftp_server_ip'] = ''; + } + $table_ncm_config->data[0][] = html_print_label_input_block( __('FTP server IP').ui_print_help_tip(__('This value will be used by TFTP_SERVER_IP macro in NCM scripts.'), true), html_print_input_text( diff --git a/pandora_console/godmode/setup/welcome_tips.php b/pandora_console/godmode/setup/welcome_tips.php index 1a62aa857b..ae669029d3 100644 --- a/pandora_console/godmode/setup/welcome_tips.php +++ b/pandora_console/godmode/setup/welcome_tips.php @@ -74,6 +74,8 @@ if ($view === 'create' || $view === 'edit') { if (count($errors) === 0) { if (count($files) > 0) { $uploadImages = $tipsWindow->uploadImages($files); + } else { + $uploadImages = ''; } $response = $tipsWindow->createTip($id_lang, $id_profile, $title, $text, $url, $enable, $uploadImages); diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php index d4fc275122..fb8987431d 100644 --- a/pandora_console/godmode/snmpconsole/snmp_filters.php +++ b/pandora_console/godmode/snmpconsole/snmp_filters.php @@ -377,11 +377,15 @@ if ($edit_filter > -2) { echo ''; } + +if (isset($index) === false) { + $index = 0; +} ?> '; $output .= '