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-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

This commit is contained in:
Jonathan 2023-03-30 10:26:36 +02:00
parent da08d4e802 2c1301f542
commit ace79d3ac1
10 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/agentes/inventory_manager.php
View File

@ -267,7 +267,7 @@ if (db_get_num_rows($sql) == 0) {
$data[5] .= '</b></a>&nbsp;&nbsp;'; $data[5] .= '</b></a>&nbsp;&nbsp;';
// Force refresh module // Force refresh module
$data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">'; $data[5] .= '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=inventory&id_agente='.$id_agente.'&force_inventory_module='.$row['id_agent_module_inventory'].'">';
$data[5] .= html_print_image('images/change-active.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>'; $data[5] .= html_print_image('images/force@svg.svg', true, ['border' => '0', 'title' => __('Force'), 'class' => 'main_menu_icon invert_filter']).'</b></a>';
array_push($table->data, $data); array_push($table->data, $data);
} }

4
pandora_console/godmode/servers/servers.build_table.php
View File

@ -208,7 +208,7 @@ foreach ($servers as $server) {
if ($server['type'] === 'data') { if ($server['type'] === 'data') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">'; $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
$data[8] .= html_print_image( $data[8] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Reset module status and fired alert counts'), 'title' => __('Reset module status and fired alert counts'),
@ -219,7 +219,7 @@ foreach ($servers as $server) {
} else if ($server['type'] === 'enterprise snmp') { } else if ($server['type'] === 'enterprise snmp') {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">'; $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
$data[8] .= html_print_image( $data[8] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Claim back SNMP modules'), 'title' => __('Claim back SNMP modules'),

2
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -673,7 +673,7 @@ class DiscoveryTaskList extends HTML
$data[0] .= ');" >'; $data[0] .= ');" >';
$data[0] .= html_print_image( $data[0] .= html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force'), 'title' => __('Force'),

5
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -810,10 +810,7 @@ class HostDevices extends Wizard
'name' => 'interval_manual_defined', 'name' => 'interval_manual_defined',
'return' => true, 'return' => true,
], ],
'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.ui_print_help_tip( 'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.html_print_extended_select_for_time(
__('The minimum recomended interval for Recon Task is 5 minutes'),
true
).html_print_extended_select_for_time(
'interval', 'interval',
$this->task['interval_sweep'], $this->task['interval_sweep'],
'', '',

2
pandora_console/include/ajax/module.php
View File

@ -1279,7 +1279,7 @@ if (check_login()) {
if ((int) $module['flag'] === 0) { if ((int) $module['flag'] === 0) {
$additionalLinkAction = '&amp;flag=1'; $additionalLinkAction = '&amp;flag=1';
$linkCaption = __('Force checks'); $linkCaption = __('Force checks');
$imgaction = 'images/target.png'; $imgaction = 'images/force@svg.svg';
} else { } else {
$additionalLinkAction = ''; $additionalLinkAction = '';
$linkCaption = __('Refresh'); $linkCaption = __('Refresh');

5
pandora_console/include/class/CustomNetScan.class.php
View File

@ -524,7 +524,7 @@ class CustomNetScan extends Wizard
// Schedule. // Schedule.
$form['inputs'][] = [ $form['inputs'][] = [
'label' => __('Interval').ui_print_help_tip( 'label' => __('Interval').ui_print_help_tip(
__('Manual interval means that it will be executed only On-demand'), __('Manual interval means that it will be executed only On-demand').', '.__('The minimum recomended interval for Recon Task is 5 minutes'),
true true
), ),
'class' => 'input-interval', 'class' => 'input-interval',
@ -549,9 +549,6 @@ class CustomNetScan extends Wizard
true, true,
false, false,
false false
).ui_print_help_tip(
__('The minimum recomended interval for Recon Task is 5 minutes'),
true
).'</span>', ).'</span>',
]; ];

16
pandora_console/include/functions_cron.php
View File

@ -530,7 +530,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -568,7 +568,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -623,7 +623,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -715,7 +715,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -751,7 +751,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -797,7 +797,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -839,7 +839,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),
@ -873,7 +873,7 @@ function cron_list_table()
$task['id'] $task['id']
), ),
'content' => html_print_image( 'content' => html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force run'), 'title' => __('Force run'),

4
pandora_console/include/functions_events.php
View File

@ -4560,7 +4560,7 @@ function events_page_details($event, $server_id=0)
true, true,
[ [
'title' => __('Go to data overview'), 'title' => __('Go to data overview'),
'class' => 'invert_filter', 'class' => 'invert_filter main_menu_icon',
] ]
); );
} else { } else {
@ -4569,7 +4569,7 @@ function events_page_details($event, $server_id=0)
true, true,
[ [
'title' => __('Go to data overview'), 'title' => __('Go to data overview'),
'class' => 'invert_filter', 'class' => 'invert_filter main_menu_icon',
'style' => 'opacity: .5', 'style' => 'opacity: .5',
] ]
); );

4
pandora_console/include/styles/pandora_black.css
View File

@ -1600,3 +1600,7 @@ a.pandora_pagination,
.info_table > tbody > tr > td { .info_table > tbody > tr > td {
border-bottom: 1px solid #3f3f3f; border-bottom: 1px solid #3f3f3f;
} }
.font-title-font {
color: #fff;
}

2
pandora_console/views/cluster/view.php
View File

@ -216,7 +216,7 @@ $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
$table_agent_header .= '&nbsp;&nbsp;'; $table_agent_header .= '&nbsp;&nbsp;';
$table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id(); $table_agent_header .= '<a href="'.$model->url.'&op=force&id='.$cluster->id();
$table_agent_header .= '">'.html_print_image( $table_agent_header .= '">'.html_print_image(
'images/change-active.svg', 'images/force@svg.svg',
true, true,
[ [
'title' => __('Force cluster status calculation'), 'title' => __('Force cluster status calculation'),