diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index 18a6fdd0bf..54e0ec6b12 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -298,7 +298,7 @@ function mainAgentsAlerts() $table2->data[2][0] = __('Threshold'); $table2->data[2][1] = html_print_input_text('module_action_threshold', '0', '', 5, 7, true); - $table2->data[2][1] .= ' '.__('seconds').ui_print_help_icon('action_threshold', true); + $table2->data[2][1] .= ' '.__('seconds'); $content2 = '
'; $content2 .= html_print_table($table2, true); diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php index cee4cb2684..5dc3118def 100644 --- a/pandora_console/godmode/agentes/agent_manager.php +++ b/pandora_console/godmode/agentes/agent_manager.php @@ -341,7 +341,7 @@ $table_server .= html_print_select( __('None'), 0, true -).'
'.ui_print_help_icon('agent_server', true).'
'; +).'
'; // Description. $table_description = '

'.__('Description').':

'; @@ -368,7 +368,7 @@ echo '
'; if (enterprise_installed()) { $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]); - $table_adv_secondary_groups = '

'.__('Secondary groups').': '.ui_print_help_icon('secondary_groups', true).'

'; + $table_adv_secondary_groups = '

'.__('Secondary groups').':

'; $table_adv_secondary_groups_left = html_print_select_groups( false, // Use the current user to select the groups @@ -546,13 +546,13 @@ $params['cascade_protection'] = true; $table_adv_parent .= '
'; $table_adv_parent .= ui_print_agent_autocomplete_input($params); if (enterprise_installed()) { - $table_adv_parent .= html_print_checkbox_switch('cascade_protection', 1, $cascade_protection, true).__('Cascade protection').' '.ui_print_help_icon('cascade_protection', true); + $table_adv_parent .= html_print_checkbox_switch('cascade_protection', 1, $cascade_protection, true).__('Cascade protection').' '; } $table_adv_parent .= __('Module').' '.html_print_select($modules_values, 'cascade_protection_module', $cascade_protection_module, '', '', 0, true).'
'; // Learn mode / Normal mode -$table_adv_module_mode = '

'.__('Module definition').': '.ui_print_help_icon('module_definition', true).'

'; +$table_adv_module_mode = '

'.__('Module definition').':

'; $table_adv_module_mode .= '
'; $table_adv_module_mode .= html_print_radio_button_extended( 'modo', diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php index 799eddcec6..7fa2b9a3f0 100644 --- a/pandora_console/godmode/alerts/alert_commands.php +++ b/pandora_console/godmode/alerts/alert_commands.php @@ -84,9 +84,7 @@ if (is_ajax()) { // If the field is the number one, print the help message. if ($i == 1) { // If our context is snmpconsole, show snmp_alert helps. - if ((isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) { - $fdesc .= ui_print_help_icon('snmp_alert_field1', true); - } else { + if ((!isset($_SERVER['HTTP_REFERER'])) && ( preg_match('/snmp_alert/', $_SERVER['HTTP_REFERER']) > 0 )) { $fdesc .= ui_print_help_icon('alert_config', true); } } diff --git a/pandora_console/godmode/alerts/alert_view.php b/pandora_console/godmode/alerts/alert_view.php index 6de5473020..f96f6e6644 100644 --- a/pandora_console/godmode/alerts/alert_view.php +++ b/pandora_console/godmode/alerts/alert_view.php @@ -386,7 +386,7 @@ if (count($actions) == 1 && isset($actions[0])) { $table->data[$kaction][($k + 1)] = human_time_description_raw($action_threshold, true, 'tiny'); } - $table->head[($k + 1)] = __('Threshold').''.ui_print_help_icon('action_threshold', true, '', 'images/header_help.png').''; + $table->head[($k + 1)] = __('Threshold'); } } diff --git a/pandora_console/godmode/massive/massive_add_action_alerts.php b/pandora_console/godmode/massive/massive_add_action_alerts.php index 919380c9a9..9abac11def 100755 --- a/pandora_console/godmode/massive/massive_add_action_alerts.php +++ b/pandora_console/godmode/massive/massive_add_action_alerts.php @@ -215,7 +215,6 @@ $table->data[3][1] .= __('Number of alerts match from').' '; $table->data[3][1] .= html_print_input_text('fires_min', 0, '', 4, 10, true); $table->data[3][1] .= ' '.__('to').' '; $table->data[3][1] .= html_print_input_text('fires_max', 0, '', 4, 10, true); -$table->data[3][1] .= ui_print_help_icon('alert-matches', true); $table->data[3][1] .= ''; echo ''; diff --git a/pandora_console/godmode/massive/massive_copy_modules.php b/pandora_console/godmode/massive/massive_copy_modules.php index 00c76792e4..b79a64460e 100755 --- a/pandora_console/godmode/massive/massive_copy_modules.php +++ b/pandora_console/godmode/massive/massive_copy_modules.php @@ -125,7 +125,7 @@ echo ''; echo ''; -echo ''.__('Source').ui_print_help_icon('manageconfig', true).''; +echo ''.__('Source'); echo ''; html_print_table($table); echo ''; diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index ae6b5b1432..a803fa4725 100755 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -695,7 +695,7 @@ $table->data['edit1'][1] = ''; true ); - $table->data['edit3'][0] = __('Post process').ui_print_help_icon('postprocess', true); + $table->data['edit3'][0] = __('Post process'); $table->data['edit3'][1] = html_print_extended_select_for_post_process( 'post_process', @@ -846,10 +846,6 @@ $table->data['edit1'][1] = '
'; // FF stands for Flip-flop. $table->data['edit7'][0] = __('FF threshold').' '; - $table->data['edit7'][0] .= ui_print_help_icon( - 'ff_threshold', - true - ); $table->colspan['edit7'][1] = 3; $table->data['edit7'][1] = __('Mode').' '; @@ -1060,26 +1056,26 @@ $table->data['edit1'][1] = '
'; true ); - $table->data['edit22'][0] = __('Web checks').ui_print_help_icon('web_checks', true); + $table->data['edit22'][0] = __('Web checks'); ; $table->data['edit22'][1] = ''; $table->data['edit16'][2] = __('Port'); $table->data['edit16'][3] = html_print_input_text('tcp_port', '', '', 5, 20, true); - $table->data['edit17'][0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true); + $table->data['edit17'][0] = __('TCP send'); $table->data['edit17'][1] = html_print_textarea('tcp_send2', 2, 65, '', '', true); $table->data['edit17'][2] = __('TCP receive'); $table->data['edit17'][3] = html_print_textarea('tcp_rcv', 2, 65, '', '', true); - $table->data['edit18'][0] = __('WMI query').ui_print_help_icon('wmiquery', true); + $table->data['edit18'][0] = __('WMI query'); $table->data['edit18'][1] = html_print_input_text('wmi_query', '', '', 35, 255, true); $table->data['edit18'][2] = __('Key string'); $table->data['edit18'][3] = html_print_input_text('key_string', '', '', 20, 60, true); - $table->data['edit19'][0] = __('Field number').ui_print_help_icon('wmifield', true); + $table->data['edit19'][0] = __('Field number'); $table->data['edit19'][1] = html_print_input_text('field_number', '', '', 5, 15, true); $table->data['edit20'][0] = __('Plugin').ui_print_help_icon('plugin_macros', true); diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index 0d52a01377..13e5fb41e1 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -65,7 +65,7 @@ if (enterprise_installed()) { 'basic' => __('Basic'), 'advanced' => __('Advanced'), ]; - $table->data[0][3] = html_print_select($wizard_levels, 'wizard_level', $wizard_level, '', '', -1, true, false, false).' '.ui_print_help_icon('meta_access', true); + $table->data[0][3] = html_print_select($wizard_levels, 'wizard_level', $wizard_level, '', '', -1, true, false, false); } else { $table->data[0][2] = ''; $table->data[0][3] = html_print_input_hidden('wizard_level', $wizard_level, true); @@ -154,7 +154,7 @@ $table->data[2][1] = html_print_select( $table->data[2][2] = __('Interval'); $table->data[2][3] = html_print_extended_select_for_time('module_interval', $module_interval, '', '', '0', false, true); -$table->data[3][0] = __('Dynamic Interval').' '.ui_print_help_icon('dynamic_threshold', true); +$table->data[3][0] = __('Dynamic Interval'); $table->data[3][1] = html_print_extended_select_for_time('dynamic_interval', $dynamic_interval, '', 'None', '0', 10, true, 'width:150px', false); $table->data[3][1] .= ''.html_print_image('images/cog.png', true, ['title' => __('Advanced options Dynamic Threshold')]).''; @@ -165,7 +165,7 @@ $table->data[3][2] .= html_print_input_text('dynamic_max', $dynamic_max, '', 10, $table->data[3][3] = ''.__('Dynamic Two Tailed: ').''; $table->data[3][3] .= html_print_checkbox('dynamic_two_tailed', 1, $dynamic_two_tailed, true); -$table->data[4][0] = __('Warning status').' '.ui_print_help_icon('warning_status', true); +$table->data[4][0] = __('Warning status'); $table->data[4][1] = ''.__('Min.').'  '; $table->data[4][1] .= html_print_input_text( 'min_warning', @@ -200,7 +200,7 @@ $table->data[4][2] = ' '; $table->colspan[4][2] = 2; $table->rowspan[4][2] = 3; -$table->data[5][0] = __('Critical status').' '.ui_print_help_icon('critical_status', true); +$table->data[5][0] = __('Critical status'); $table->data[5][1] = ''.__('Min.').'  '; $table->data[5][1] .= html_print_input_text( 'min_critical', @@ -231,7 +231,7 @@ $table->data[5][1] .= html_print_input_text( $table->data[5][1] .= '
'.__('Inverse interval').''; $table->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critical_inverse, true); -$table->data[6][0] = __('FF threshold').' '.ui_print_help_icon('ff_threshold', true); +$table->data[6][0] = __('FF threshold'); $table->colspan[6][1] = 3; $table->data[6][1] = __('Keep counters'); diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php index 8befa28555..0f39406ce9 100755 --- a/pandora_console/godmode/modules/manage_network_components_form_network.php +++ b/pandora_console/godmode/modules/manage_network_components_form_network.php @@ -57,16 +57,16 @@ $data = []; $data[0] = __('SNMP Enterprise String'); $data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 30, 400, true); // $table->colspan['snmp_2'][1] = 3; -$data[2] = __('SNMP community').ui_print_help_icon('column_macros', true); +$data[2] = __('SNMP community'); $data[3] = html_print_input_text('snmp_community', $snmp_community, '', 15, 60, true); push_table_row($data, 'snmp_2'); $data = []; -$data[0] = __('Auth user').ui_print_help_icon('column_macros', true); +$data[0] = __('Auth user'); $data[1] = html_print_input_text('snmp3_auth_user', $snmp3_auth_user, '', 15, 60, true); -$data[2] = __('Auth password').ui_print_help_icon('column_macros', true); +$data[2] = __('Auth password'); $data[3] = html_print_input_password('snmp3_auth_pass', $snmp3_auth_pass, '', 15, 60, true); $data[3] .= html_print_input_hidden_extended('active_snmp_v3', 0, 'active_snmp_v3_mncfn', true); push_table_row($data, 'field_snmpv3_row1'); @@ -74,7 +74,7 @@ push_table_row($data, 'field_snmpv3_row1'); $data = []; $data[0] = __('Privacy method'); $data[1] = html_print_select(['DES' => __('DES'), 'AES' => __('AES')], 'snmp3_privacy_method', $snmp3_privacy_method, '', '', '', true); -$data[2] = __('Privacy pass').ui_print_help_icon('column_macros', true); +$data[2] = __('Privacy pass'); $data[3] = html_print_input_password('snmp3_privacy_pass', $snmp3_privacy_pass, '', 15, 60, true); push_table_row($data, 'field_snmpv3_row2'); @@ -98,7 +98,7 @@ $data[3] = html_print_select( push_table_row($data, 'field_snmpv3_row3'); $data = []; -$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true); +$data[0] = __('Post process'); $data[1] = html_print_extended_select_for_post_process( 'post_process', $post_process, @@ -117,7 +117,7 @@ push_table_row($data, 'field_process'); // Advanced stuff $data = []; -$data[0] = __('TCP send').' '.ui_print_help_icon('tcp_send', true); +$data[0] = __('TCP send'); $data[1] = html_print_textarea('tcp_send', 2, 65, $tcp_send, '', true); $table->colspan['tcp_send'][1] = 3; diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php index edbabe69eb..19d3c45e8f 100755 --- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php +++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.php @@ -31,7 +31,7 @@ $data[1] = html_print_select_from_sql( ); // Store the macros in base64 into a hidden control to move between pages $data[1] .= html_print_input_hidden('macros', base64_encode($macros), true); -$data[2] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false)); +$data[2] = __('Post process'); $data[3] = html_print_extended_select_for_post_process( 'post_process', $post_process, diff --git a/pandora_console/godmode/modules/manage_network_components_form_wmi.php b/pandora_console/godmode/modules/manage_network_components_form_wmi.php index 09681b34c8..e76d3c086a 100755 --- a/pandora_console/godmode/modules/manage_network_components_form_wmi.php +++ b/pandora_console/godmode/modules/manage_network_components_form_wmi.php @@ -30,29 +30,29 @@ require_once $config['homedir'].'/include/functions_modules.php'; $data = []; $data[0] = __('WMI query').' '.ui_print_help_icon('wmi_query_tab', true); $data[1] = html_print_input_text('snmp_oid', $snmp_oid, '', 25, 255, true); -$data[2] = __('Key string').' '.ui_print_help_icon('wmikey', true, ui_get_full_url(false, false, false, false)); +$data[2] = __('Key string'); $data[3] = html_print_input_text('snmp_community', $snmp_community, '', 25, 255, true); push_table_row($data, 'wmi_1'); $data = []; -$data[0] = __('Field number').' '.ui_print_help_icon('wmifield', true, ui_get_full_url(false, false, false, false)); +$data[0] = __('Field number'); $data[1] = html_print_input_text('tcp_port', $tcp_port, '', 5, 25, true); -$data[2] = __('Namespace').' '.ui_print_help_icon('wminamespace', true, ui_get_full_url(false, false, false, false)); +$data[2] = __('Namespace'); $data[3] = html_print_input_text('tcp_send', $tcp_send, '', 25, 255, true); push_table_row($data, 'wmi_2'); $data = []; -$data[0] = __('Username').ui_print_help_icon('column_macros', true); +$data[0] = __('Username'); $data[1] = html_print_input_text('plugin_user', $plugin_user, '', 15, 255, true); -$data[2] = __('Password').ui_print_help_icon('column_macros', true); +$data[2] = __('Password'); $data[3] = html_print_input_password('plugin_pass', $plugin_pass, '', 25, 255, true); push_table_row($data, 'wmi_3'); $data = []; -$data[0] = __('Post process').' '.ui_print_help_icon('postprocess', true, ui_get_full_url(false, false, false, false)); +$data[0] = __('Post process'); $data[1] = html_print_extended_select_for_post_process( 'post_process', $post_process,