tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-9662-second-round' into 'develop'

Browse Source 
Ent 9662 second round

See merge request artica/pandorafms!5629
This commit is contained in:
daniel 2023-03-27 19:25:20 +00:00
commit 8f77ecc064
49 changed files with 565 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/agentes/agent_manager.php
View File

@ -966,9 +966,9 @@ foreach ($fields as $field) {
$link_url = '';
}
$data_field[1] = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
$data_field[1] .= '<br>';
$data_field[1] .= html_print_textarea(
$customContent = '<span style="line-height: 3.5;">'.__('Link text:').'</span>';
$customContent .= '<br>';
$customContent .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
1000,
@ -976,10 +976,10 @@ foreach ($fields as $field) {
'class="min-height-30px w100p"',
true
);
$data_field[1] .= '<br>';
$data_field[1] .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
$data_field[1] .= '<br>';
$data_field[1] .= html_print_textarea(
$customContent .= '<br>';
$customContent .= '<span style="line-height: 3.5;">'.__('Link URL:').'</span>';
$customContent .= '<br>';
$customContent .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
1000,

12
pandora_console/godmode/agentes/configure_field.php
View File

@ -229,7 +229,6 @@ echo '</form>';
<script>
$(document).ready (function () {
if($('input[type=hidden][name=update_field]').val() == 1 && $('#textarea_combo_values').val() != ''){
console.log('entra2');
$('input[type=checkbox][name=is_combo_enable]').prop('checked', true);
$('#configure_field-3').show();
@ -250,7 +249,6 @@ $(document).ready (function () {
}
});
} else {
console.log('entra');
$('#configure_field-3').hide();
}
@ -261,17 +259,19 @@ $(document).ready (function () {
}
$('input[type=checkbox][name=is_link_enabled]').change(function () {
if( $(this).is(":checked") ){
if( $('input[type=checkbox][name=is_link_enabled]').prop('checked') ){
$('#configure_field-2').hide();
$('#configure_field-3').hide();
} else{
$('#configure_field-2').show();
if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
$('#configure_field-3').show();
}
}
});
$('input[type=checkbox][name=is_combo_enable]').change(function () {
if( $(this).is(":checked") ){
if( $('input[type=checkbox][name=is_combo_enable]').prop('checked') ){
$('#configure_field-3').show();
dialog_message("#message_no_set_password");
$('#configure_field-1').hide();
@ -282,13 +282,15 @@ $(document).ready (function () {
}
});
$('input[type=checkbox][name=is_password_type]').change(function () {
if( $(this).is(":checked")){
if( $('input[type=checkbox][name=is_password_type]').prop('checked')){
dialog_message("#message_no_set_combo");
$('#configure_field-3').hide();
}
else{
if($('input[type=checkbox][name=is_combo_enable]').prop('checked') === true) {
$('#configure_field-3').show();
}
}
});
});

16
pandora_console/godmode/agentes/module_manager_editor.php
View File

@ -741,8 +741,8 @@ $outputForm .= ui_toggle(
false,
true,
'',
'',
'box-flat white_table_flex white_table_graph_fixed'
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph'
);
$outputForm .= ui_toggle(
@ -753,8 +753,8 @@ $outputForm .= ui_toggle(
true,
true,
'',
'',
'box-flat white_table_flex white_table_graph_fixed'
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph'
);
$outputForm .= ui_toggle(
@ -765,8 +765,8 @@ $outputForm .= ui_toggle(
true,
true,
'',
'',
'box-flat white_table_flex white_table_graph_fixed'
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph'
);
if ((int) $moduletype !== 13) {
@ -784,8 +784,8 @@ if ((int) $moduletype !== 13) {
true,
true,
'',
'',
'box-flat white_table_flex white_table_graph_fixed'
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph'
);
}

44
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -615,6 +615,7 @@ if (modules_is_string_type($id_module_type) === false || (bool) $edit === true)
$table_simple->data['thresholds_table'][1] = '<svg id="svg_dinamic" width="500" height="300"> </svg>';
}
$table_simple->rowclass['caption_historical_data'] = 'mrgn_top_10px';
$table_simple->data['caption_historical_data'][0] = __('Historical data');
if ($disabledBecauseInPolicy) {
// If is disabled, we send a hidden in his place and print a false
@ -1454,17 +1455,14 @@ html_print_input_hidden('module_macro_count', $macro_count);
$table_new_relations = new stdClass();
$table_new_relations->id = 'module_new_relations';
$table_new_relations->width = '100%';
$table_new_relations->class = 'no-class';
$table_new_relations->class = 'no-class filter-table-adv';
$table_new_relations->data = [];
$table_new_relations->style = [];
$table_new_relations->style[0] = 'width: 10%; font-weight: bold;';
$table_new_relations->style[1] = 'width: 25%; text-align: center;';
$table_new_relations->style[2] = 'width: 10%; font-weight: bold;';
$table_new_relations->style[3] = 'width: 25%; text-align: center;';
$table_new_relations->style[4] = 'width: 10%; font-weight: bold;';
$table_new_relations->style[5] = 'width: 25%; text-align: center;';
$table_new_relations->size[0] = '25%';
$table_new_relations->size[1] = '25%';
$table_new_relations->size[2] = '25%';
$table_new_relations->size[3] = '25%';
$table_new_relations->data[0][0] = __('Agent');
$params = [];
$params['return'] = true;
$params['show_helptip'] = true;
@ -1473,15 +1471,23 @@ $params['use_hidden_input_idagent'] = true;
$params['print_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
$params['javascript_function_action_after_select_js_call'] = 'change_modules_autocomplete_input();';
$table_new_relations->data[0][1] = ui_print_agent_autocomplete_input($params);
$table_new_relations->data[0][2] = __('Module');
$table_new_relations->data[0][3] = "<div id='module_autocomplete'></div>";
$table_new_relations->data[0][0] = html_print_label_input_block(
__('Agent'),
ui_print_agent_autocomplete_input($params)
);
$table_new_relations->data[0][1] = html_print_label_input_block(
__('Module'),
"<div id='module_autocomplete'></div>"
);
$array_rel_type = [];
$array_rel_type['direct'] = __('Direct');
$array_rel_type['failover'] = __('Failover');
$table_new_relations->data[0][4] = __('Rel. type');
$table_new_relations->data[0][5] = html_print_select(
$table_new_relations->data[0][2] = html_print_label_input_block(
__('Rel. type'),
html_print_select(
$array_rel_type,
'relation_type',
'',
@ -1492,17 +1498,23 @@ $table_new_relations->data[0][5] = html_print_select(
false,
true,
''
)
);
$table_new_relations->data[0][6] = html_print_button(
$table_new_relations->data[0][3] = html_print_label_input_block(
'&nbsp;',
'<div class="inline_line">'.html_print_button(
__('Add relationship'),
'add_relation',
false,
'javascript: add_new_relation();',
'class="sub add"',
[
'class' => 'w150px secondary',
'icon' => 'plus',
],
true
)."<div id='add_relation_status' class='inline_line'></div></div>"
);
$table_new_relations->data[0][6] .= "&nbsp;&nbsp;<div id='add_relation_status' class='inline_line'></div>";
// Relationship list.
$table_relations = new stdClass();

6
pandora_console/godmode/agentes/module_manager_editor_plugin.php
View File

@ -152,9 +152,7 @@ foreach ($password_fields as $k => $p) {
load_plugin_macros_fields('simple-macro');
forced_title_callback();
}
$(document).ready(function () {
observerInputPassword();
});
$('select#id_plugin').select2('close');
}
</script>

119
pandora_console/godmode/agentes/module_manager_editor_wmi.php
View File

@ -42,8 +42,6 @@ if (empty($edit_module)) {
}
$data = [];
$data[0] = __('Target IP').' '.ui_print_help_icon('wmi_module_tab', true);
if ($page == 'enterprise/godmode/policies/policy_modules') {
if ($ip_target != 'auto' && $ip_target != '') {
$custom_ip_target = $ip_target;
@ -60,7 +58,7 @@ if ($page == 'enterprise/godmode/policies/policy_modules') {
$target_ip_values['force_pri'] = __('Force primary key');
$target_ip_values['custom'] = __('Custom');
$data[1] = html_print_select(
$inputs = html_print_select(
$target_ip_values,
'ip_target',
$ip_target,
@ -72,20 +70,41 @@ if ($page == 'enterprise/godmode/policies/policy_modules') {
false,
'',
false,
'width:200px;'
'width: 100%; margin-top: 10px;'
);
$data[1] .= html_print_input_text('custom_ip_target', $custom_ip_target, '', 15, 60, true);
$inputs .= html_print_input_text('custom_ip_target', $custom_ip_target, '', 15, 60, true);
} else {
if ($ip_target == 'auto') {
$ip_target = agents_get_address($id_agente);
}
$data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
$inputs = html_print_input_text(
'ip_target',
$ip_target,
'',
15,
60,
true,
false,
false,
'',
'mrgn_top_10px w100p'
);
}
$data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true);
$data[3] = html_print_input_text(
$data[0] = html_print_label_input_block(
__('Target IP').' <span class="help_icon_15px">'.ui_print_help_icon('wmi_module_tab', true),
$inputs,
[
'label_class' => 'font-title-font',
'div_class' => 'w100p mrgn_right_20px',
]
);
$data[2] = html_print_label_input_block(
__('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true),
html_print_input_text(
'tcp_send',
$tcp_send,
'',
@ -95,13 +114,19 @@ $data[3] = html_print_input_text(
$disabledBecauseInPolicy,
false,
'',
$classdisabledBecauseInPolicy
$classdisabledBecauseInPolicy.' mrgn_top_10px w100p'
),
[
'label_class' => 'font-title-font',
'div_class' => 'w100p mrgn_right_20px',
]
);
push_table_simple($data, 'target_ip');
$data = [];
$data[0] = __('Username');
$data[1] = html_print_input_text(
$data[0] = html_print_label_input_block(
__('Username'),
html_print_input_text(
'plugin_user',
$plugin_user,
'',
@ -111,10 +136,17 @@ $data[1] = html_print_input_text(
$disabledBecauseInPolicy,
false,
'',
$classdisabledBecauseInPolicy
$classdisabledBecauseInPolicy.' w100p'
),
[
'label_class' => 'font-title-font',
'div_class' => 'w100p display-grid mrgn_right_20px',
]
);
$data[2] = __('Password');
$data[3] = html_print_input_password(
$data[2] = html_print_label_input_block(
__('Password'),
html_print_input_password(
'plugin_pass',
'',
'',
@ -123,15 +155,23 @@ $data[3] = html_print_input_password(
true,
$disabledBecauseInPolicy,
false,
$classdisabledBecauseInPolicy,
'new-password'
$classdisabledBecauseInPolicy.' w100p',
'new-password',
true
),
[
'label_class' => 'font-title-font',
'div_class' => 'w100p display-grid mrgn_right_20px',
]
);
$table_simple->rowclass['user_pass'] = 'w100p mrgn_top_10px';
push_table_simple($data, 'user_pass');
$data = [];
$data[0] = __('WMI query');
$data[1] = html_print_input_text(
$data[0] = html_print_label_input_block(
__('WMI query'),
html_print_input_text(
'snmp_oid',
$snmp_oid,
'',
@ -142,14 +182,16 @@ $data[1] = html_print_input_text(
false,
'',
$classdisabledBecauseInPolicy
),
[
'label_class' => 'font-title-font',
'div_class' => 'w100p display-grid mrgn_right_20px',
]
);
$table_simple->colspan['wmi_query'][1] = 3;
push_table_simple($data, 'wmi_query');
$data = [];
$data[0] = __('Key string').ui_print_help_tip(__('Optional. Substring to look for in the WQL query result. The module returns 1 if found, 0 if not.'), true);
$data[1] = html_print_input_text(
$data[2] = html_print_label_input_block(
__('Key string').ui_print_help_tip(__('Optional. Substring to look for in the WQL query result. The module returns 1 if found, 0 if not.'), true),
html_print_input_text(
'snmp_community',
$snmp_community,
'',
@ -160,9 +202,20 @@ $data[1] = html_print_input_text(
false,
'',
$classdisabledBecauseInPolicy
),
[
'label_class' => 'font-title-font',
'div_class' => 'w100p display-grid mrgn_right_20px',
]
);
$data[2] = __('Field number').ui_print_help_tip(__('Column number to retrieve from the WQL query result (starting from zero).'), true);
$data[3] = html_print_input_text(
$table_simple->rowclass['wmi_query'] = 'w100p mrgn_top_10px';
push_table_simple($data, 'wmi_query');
$data = [];
$data[0] = html_print_label_input_block(
__('Field number').ui_print_help_tip(__('Column number to retrieve from the WQL query result (starting from zero).'), true),
html_print_input_text(
'tcp_port',
$tcp_port,
'',
@ -172,9 +225,16 @@ $data[3] = html_print_input_text(
$disabledBecauseInPolicy,
false,
'',
$classdisabledBecauseInPolicy
$classdisabledBecauseInPolicy.' mrgn_right_20px'
),
[
'label_class' => 'font-title-font',
'div_class' => 'w50p display-grid',
]
);
$table_simple->rowclass['key_field'] = 'w100p mrgn_top_10px';
push_table_simple($data, 'key_field');
?>
<script type="text/javascript">
@ -191,11 +251,6 @@ $(document).ready (function () {
$("#text-custom_ip_target").hide();
}
});
// Add input password values with js to hide it in browser inspector.
$('#password-plugin_pass').val('<?php echo $plugin_pass; ?>');
observerInputPassword();
});
</script>

22
pandora_console/godmode/alerts/alert_list.builder.php
View File

@ -187,7 +187,7 @@ $table->data[2][0] = html_print_label_input_block(
);
if (isset($step) === false) {
echo '<form class="add_alert_form max_floating_element_size" method="post">';
echo '<form id="form_alerts" class="add_alert_form max_floating_element_size" method="post">';
html_print_table($table);
}
@ -216,6 +216,26 @@ if (isset($step) === false) {
true
);
if ($_GET['sec2'] === 'operation/cluster/cluster') {
html_print_div(
[
'content' => html_print_submit_button(
__('Add alert'),
'add',
false,
[
'icon' => 'wand',
'form' => 'form_alerts',
'mode' => 'secondary',
],
true
),
'style' => 'display:none',
'id' => 'add_alert_div',
]
);
}
html_print_action_buttons($actionButtons, ['right_content' => $pagination]);
html_print_input_hidden('create_alert', 1);

2
pandora_console/godmode/alerts/alert_list.php
View File

@ -497,6 +497,7 @@ if (is_metaconsole() === false) {
$buttons = '';
}
if ($_GET['sec2'] !== 'operation/cluster/cluster') {
if ($tab !== 'alert') {
if ($tab === 'list') {
ui_print_standard_header(
@ -538,6 +539,7 @@ if (is_metaconsole() === false) {
);
}
}
}
} else {
alerts_meta_print_header();
}

56
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -84,7 +84,7 @@ $buttons['gis_maps_list'] = [
true,
[
'title' => __('GIS Maps list'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
];
@ -96,19 +96,30 @@ if ($idMap) {
true,
[
'title' => __('View GIS'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
];
}
ui_print_page_header(
// Header.
ui_print_standard_header(
__('GIS Maps builder'),
'images/gm_gis.png',
false,
'configure_gis_map_edit',
true,
$buttons
false,
$buttons,
[
[
'link' => '',
'label' => __('Topology maps'),
],
[
'link' => '',
'label' => __('GIS Maps'),
],
]
);
switch ($action) {
@ -480,7 +491,7 @@ $table->data[1][1] = "<table class='no-class' border='0' id='map_connection'>
<a href='javascript: addConnectionMap();'>".html_print_image(
'images/add.png',
true,
['class' => 'invert_filter']
['class' => 'invert_filter main_menu_icon']
)."</a>
<input type='hidden' name='map_connection_list' value='' id='map_connection_list' />
<input type='hidden' name='layer_list' value='' id='layer_list' />
@ -583,7 +594,7 @@ $table->data[1][1] = '<div id="form_layer" class="invisible">
$table->data[1][1] .= html_print_button(__('Add agent'), 'add_agent', true, '', 'class="sub add"', true);
$table->data[1][1] .= html_print_button(__('Add agent'), 'add_agent', true, '', ['mode' => 'secondary', 'icon' => 'next'], true);
$params = [];
$params['return'] = true;
@ -628,7 +639,7 @@ $params['javascript_is_function_select'] = true;
// Filter by group.
$params['disabled_javascript_on_blur_function'] = false;
$agent_for_group_input = ui_print_agent_autocomplete_input($params);
$add_group_btn = html_print_button(__('Add'), 'add_group', true, '', 'class="sub add"', true);
$add_group_btn = html_print_button(__('Add'), 'add_group', true, '', ['mode' => 'secondary', 'icon' => 'next'], true);
$table->data[1][1] .= '<tr><td colspan="4"><hr /></td></tr>
<tr>
@ -660,21 +671,19 @@ $table->data[1][1] .= '<tr>
html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';
switch ($action) {
case 'save_new':
case 'edit_map':
case 'update_saved':
if (empty($invalidFields) === true) {
html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
$action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
} else {
html_print_submit_button(_('Update map'), 'update_button', false, 'class="sub upd"');
$action_button = html_print_submit_button(_('Update map'), 'update_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
}
break;
case 'new_map':
html_print_submit_button(_('Save map'), 'save_button', false, 'class="sub wand"');
$action_button = html_print_submit_button(_('Save map'), 'save_button', false, ['mode' => 'primary', 'icon' => 'next'], true);
break;
default:
@ -682,7 +691,10 @@ switch ($action) {
break;
}
echo '</div>';
html_print_action_buttons(
$action_button,
['type' => 'form_action']
);
echo '</form>';
@ -702,7 +714,7 @@ echo '</form>';
false,
[
'alt' => '',
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
);
?>
@ -899,7 +911,7 @@ function setLayerEditorData (data) {
var $layerFormVisibleCheckbox = $("input#checkbox-layer_visible_form");
var $layerFormAgentsFromGroupSelect = $("#layer_group_form");
var $layerFormAgentInput = $("input#text-agent_alias");
var $layerFormAgentButton = $("input#button-add_agent");
var $layerFormAgentButton = $("button#button-add_agent");
var $layerFormAgentsListItems = $("tr.agents_list_item");
var $layerFormGroupsListItems = $("tr.groups_list_item");
@ -1005,7 +1017,7 @@ function getAgentRow (layerId, agentId, agentAlias) {
var $deleteCol = $("<td />");
var $agentAlias = $("<span class=\"agent_alias\" data-agent-id=\"" + agentId + "\">" + agentAlias + "</span>");
var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter']); ?> </a>');
var $removeBtn = $('<a class="delete_row" href="javascript:" <?php echo html_print_image('images/delete.svg', false, ['class' => 'invert_filter main_menu_icon']); ?> </a>');
$removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId);
@ -1061,7 +1073,7 @@ function getGroupRow (layerId, groupId, groupName, agentId, agentAlias) {
+ "<i>" + agentAlias + "</i>"
+ ")"
+ "</span>");
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
$removeBtn.click(function (event) {
var $layerRow = $("tr#layer_row_" + layerId);
@ -1139,8 +1151,8 @@ function getLayerRow (layerId, layerData) {
var $layerName = $("<span class=\"layer_name\">" + layerData.name + "</span>");
var $sortUpBtn = $("<a class=\"up_arrow\" href=\"javascript:;\" />");
var $sortDownBtn = $("<a class=\"down_arrow\" href=\"javascript:;\" />");
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter']); ?></a>');
var $editBtn = $('<a class="edit_layer" href="javascript:;"><?php echo html_print_image('images/edit.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
var $removeBtn = $('<a class="delete_row" href="javascript:;"><?php echo html_print_image('images/delete.svg', true, ['class' => 'invert_filter main_menu_icon']); ?></a>');
$sortUpBtn.click(moveLayerRowUpOnClick);
$sortDownBtn.click(moveLayerRowDownOnClick);
@ -1231,9 +1243,9 @@ function onLayerGroupIdChange (event) {
// Bind events
$("form#form_setup").submit(onFormSubmit);
$("input#button-add_agent").click(addAgentClick);
$("button#button-add_agent").click(addAgentClick);
$("select#layer_group_id").change(onLayerGroupIdChange);
$("input#button-add_group").click(addGroupClick);
$("button#button-add_group").click(addGroupClick);
// Populate layer list
var layers = <?php echo json_encode($layer_list); ?>;

2
pandora_console/godmode/groups/configure_group.php
View File

@ -118,7 +118,7 @@ if (is_metaconsole() === true) {
// Data before table.
$files = list_files('images/', '@groups.svg', 1, 0);
$files = list_files(((is_metaconsole() === true) ? '../../' : '').'images/', '@groups.svg', 1, 0);
$table = new stdClass();
$table->width = '100%';

2
pandora_console/godmode/massive/massive_add_action_alerts.php
View File

@ -270,7 +270,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
echo "<input type='hidden' id='hidden-agents_with_templates' value='$agents_with_templates_json'>";
attachActionButton('add', 'create', $table->width);
attachActionButton('add', 'create', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_add_alerts.php
View File

@ -293,7 +293,7 @@ $table->data[2][3] = '';
echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=add_alerts">';
html_print_table($table);
attachActionButton('add', 'add', $table->width);
attachActionButton('add', 'add', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_add_profiles.php
View File

@ -295,7 +295,7 @@ array_push($table->data, $data);
html_print_table($table);
attachActionButton('create_profiles', 'update', $table->width);
attachActionButton('create_profiles', 'update', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_copy_modules.php
View File

@ -310,7 +310,7 @@ echo '<legend><span>'.__('To agent(s)').'</span></legend>';
html_print_table($table);
echo '</fieldset>';
attachActionButton('do_operation', 'copy', $table->width);
attachActionButton('do_operation', 'copy', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_delete_action_alerts.php
View File

@ -298,7 +298,7 @@ $agents_with_templates_json = json_encode($agents_with_templates_json);
echo "<input type='hidden' id='hidden-agents_with_templates' value='".$agents_with_templates_json."'>";
attachActionButton('delete', 'delete', $table->width);
attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_delete_agents.php
View File

@ -188,7 +188,7 @@ $params = [
echo get_table_inputs_masive_agents($params);
if (is_metaconsole() === true || is_management_allowed() === true) {
attachActionButton('delete', 'delete', '100%');
attachActionButton('delete', 'delete', '100%', false, $SelectAction);
}
echo '</form>';

2
pandora_console/godmode/massive/massive_delete_alerts.php
View File

@ -358,7 +358,7 @@ $table->data[2][3] = html_print_select([], 'module[]', '', false, '', '', true,
echo '<form method="post" id="form_alerts" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_alerts" >';
html_print_table($table);
attachActionButton('delete', 'delete', $table->width);
attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_delete_modules.php
View File

@ -583,7 +583,7 @@ $table->data['form_agents_3'][3] = html_print_select(
echo '<form method="post" id="form_modules" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=delete_modules" >';
html_print_table($table);
attachActionButton('delete', 'delete', $table->width);
attachActionButton('delete', 'delete', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_delete_profiles.php
View File

@ -246,7 +246,7 @@ array_push($table->data, $data);
html_print_table($table);
attachActionButton('delete_profiles', 'delete', $table->width);
attachActionButton('delete_profiles', 'delete', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_edit_agents.php
View File

@ -1257,7 +1257,7 @@ echo '<h3 class="error invisible" id="message"> </h3>';
html_print_input_hidden('id_agente', $id_agente);
attachActionButton('update_agents', 'update', $table->width);
attachActionButton('update_agents', 'update', $table->width, false, $SelectAction);
// Shown and hide div.
echo '</div></form>';

2
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -1265,7 +1265,7 @@ $table->data['edit1'][1] = '<table width="100%">';
echo '<form method="post" action="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&option=edit_modules" id="form_edit">';
html_print_table($table);
attachActionButton('update', 'update', $table->width);
attachActionButton('update', 'update', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_edit_plugins.php
View File

@ -391,7 +391,7 @@ echo '<form method="POST" id="form-massive_plugin_edition"
html_print_table($table);
attachActionButton('update', 'update', $table->width);
attachActionButton('update', 'update', $table->width, false, $SelectAction);
echo '</form>';

2
pandora_console/godmode/massive/massive_edit_users.php
View File

@ -556,7 +556,7 @@ echo sprintf(
);
echo '</div>';
attachActionButton('edit_users', 'update', '100%');
attachActionButton('edit_users', 'update', '100%', false, $SelectAction);
echo '</form>';

59
pandora_console/godmode/massive/massive_operations.php
View File

@ -220,7 +220,7 @@ $alertstab = [
true,
[
'title' => __('Alerts operations'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
'active' => $tab == 'massive_alerts',
@ -232,7 +232,7 @@ $userstab = [
true,
[
'title' => __('Users operations'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
'active' => $tab == 'massive_users',
@ -244,7 +244,7 @@ $agentstab = [
true,
[
'title' => __('Agents operations'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
'active' => $tab == 'massive_agents',
@ -256,7 +256,7 @@ $modulestab = [
true,
[
'title' => __('Modules operations'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
'active' => $tab == 'massive_modules',
@ -268,7 +268,7 @@ $pluginstab = [
true,
[
'title' => __('Plugins operations'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>',
'active' => $tab == 'massive_plugins',
@ -308,6 +308,7 @@ $onheader['services'] = $servicestab;
// Header.
if (is_metaconsole() === false) {
ui_print_standard_header(
__('Bulk operations').' - '.$options[$option],
'images/gm_massive_operations.png',
@ -336,6 +337,29 @@ ui_print_standard_header(
],
]
);
} else {
ui_print_standard_header(
__('Bulk operations').' - '.$options[$option],
'images/gm_massive_operations.png',
false,
$help_header,
false,
[
$userstab,
$agentstab,
],
[
[
'link' => '',
'label' => __('Configuration'),
],
[
'link' => '',
'label' => __('Bulk operations'),
],
]
);
}
// Checks if the PHP configuration is correctly.
@ -419,29 +443,26 @@ if (is_management_allowed() === false) {
);
}
echo '<br />';
echo '<form method="post" id="form_options" action="'.$url.'">';
echo '<table border="0"><tr><td>';
echo __('Action');
echo '</td><td>';
html_print_select(
$tip = '';
if ($option === 'edit_agents' || $option === 'edit_modules') {
$tip = ui_print_help_tip(__('The blank fields will not be updated'), true);
}
$SelectAction = '<form method="post" id="form_options" action="'.$url.'">';
$SelectAction .= '<span class="mrgn_lft_10px mrgn_right_10px">'._('Action').'</span>';
$SelectAction .= html_print_select(
$options,
'option',
$option,
'this.form.submit()',
'',
0,
false,
true,
false,
false
);
if ($option === 'edit_agents' || $option === 'edit_modules') {
ui_print_help_tip(__('The blank fields will not be updated'));
}
).$tip;
echo '</td></tr></table>';
echo '</form>';
echo '<br />';
$SelectAction .= '</form>';
switch ($option) {
case 'delete_alerts':

19
pandora_console/godmode/servers/modificar_server.php
View File

@ -228,11 +228,24 @@ if (isset($_GET['server']) === true) {
$advanced_editor = false;
if ($server_type === 13) {
echo "<table cellpadding='4' cellspacing='4' class='databox filters font_bold margin-bottom-10' width='100%'>
echo "<table cellpadding='4' cellspacing='4' class='databox filters margin-bottom-10 max_floating_element_size filter-table-adv'>
<tr>";
echo '<td class="w100p">';
echo __('Dynamic search').'&nbsp;&nbsp;';
html_print_input_text('search_config_token', $search, '', 12);
echo html_print_label_input_block(
__('Dynamic search'),
html_print_input_text(
'search_config_token',
$search,
'',
12,
255,
true,
false,
false,
'',
'w400px'
)
);
echo '</td>';
echo '</tr></table>';
}

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

@ -254,7 +254,7 @@ foreach ($servers as $server) {
$data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext).'">';
$data[8] .= html_print_image(
'images/remote_configuration@svg.svg',
'images/remote-configuration@svg.svg',
true,
[
'title' => __('Remote configuration'),

28
pandora_console/godmode/setup/gis_step_2.php
View File

@ -50,13 +50,23 @@ echo '<form action="index.php?sec=gsetup&sec2=godmode/setup/gis_step_2" method="
switch ($action) {
case 'create_connection_map':
// Header.
ui_print_page_header(
ui_print_standard_header(
__('Create new map connection'),
'',
false,
'map_connection_tab',
true,
$buttons
$buttons,
[
[
'link' => '',
'label' => __('Setup'),
],
[
'link' => '',
'label' => __('Setup').' - '.__('Gis'),
],
]
);
$mapConnection_name = '';
@ -77,13 +87,23 @@ switch ($action) {
case 'edit_connection_map':
// Header.
ui_print_page_header(
ui_print_standard_header(
__('Edit map connection'),
'',
false,
'map_connection_tab',
true,
$buttons
$buttons,
[
[
'link' => '',
'label' => __('Setup'),
],
[
'link' => '',
'label' => __('Setup').' - '.__('Gis'),
],
]
);
$idConnectionMap = get_parameter('id_connection_map');

21
pandora_console/godmode/setup/news.php
View File

@ -25,8 +25,25 @@ if (! check_acl($config['id_user'], 0, 'PM')) {
exit;
}
// Header
ui_print_page_header(__('Site news management'), '', false, '', true);
// Header.
ui_print_standard_header(
__('Site news management'),
'images/custom_field.png',
false,
'',
true,
[],
[
[
'link' => '',
'label' => __('Admin tools'),
],
[
'link' => '',
'label' => __('Site news'),
],
]
);

5
pandora_console/godmode/users/configure_user.php
View File

@ -640,7 +640,6 @@ if ($update_user) {
}
$values = [];
$values['id_user'] = (string) get_parameter('id_user');
$values['fullname'] = (string) get_parameter('fullname');
$values['firstname'] = (string) get_parameter('firstname');
$values['lastname'] = (string) get_parameter('lastname');
@ -658,7 +657,7 @@ if ($update_user) {
$values['time_autorefresh'] = (int) get_parameter('time_autorefresh');
// API Token information.
$apiTokenRenewed = (bool) get_parameter('renewAPIToken');
$values['api_token'] = ($apiTokenRenewed === true) ? api_token_generate() : users_get_API_token($values['id_user']);
$values['api_token'] = ($apiTokenRenewed === true) ? api_token_generate() : users_get_API_token($id);
if (users_is_admin() === false && (bool) $values['is_admin'] !== false) {
db_pandora_audit(
@ -806,7 +805,7 @@ if ($update_user) {
$has_skin = false;
$has_wizard = false;
$info = '{"id_user":"'.$values['id_user'].'",
$info = '{"id_user":"'.$id.'",
"FullName":"'.$values['fullname'].'",
"Firstname":"'.$values['firstname'].'",
"Lastname":"'.$values['lastname'].'",

2
pandora_console/godmode/users/user_management.php
View File

@ -157,7 +157,7 @@ if ($new_user === true) {
true
);
} else {
// TODO. Show the user id with a label.
$userManagementTable->data['fields_iduser'][0] = html_print_input_hidden('id', $id, false, false, false, 'id');
}
// User Full name.

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

@ -1279,16 +1279,18 @@ if (check_login()) {
if ((int) $module['flag'] === 0) {
$additionalLinkAction = '&amp;flag=1';
$linkCaption = __('Force checks');
$imgaction = 'images/target.png';
} else {
$additionalLinkAction = '';
$linkCaption = __('Refresh');
$imgaction = 'images/go-back@svg.svg';
}
$moduleActionButtons[] = html_print_anchor(
[
'href' => 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$addedLinkParams.'"',
'href' => 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;id_agente_modulo='.$module['id_agente_modulo'].'&amp;refr=60'.$additionalLinkAction.'"',
'content' => html_print_image(
'images/go-back@svg.svg',
$imgaction,
true,
[ 'class' => 'main_menu_icon' ]
),

32
pandora_console/include/class/SatelliteAgent.class.php
View File

@ -162,7 +162,7 @@ class SatelliteAgent extends HTML
[
'id' => $this->tableId,
'class' => 'info_table',
'style' => 'width: 100%',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $column_names,
'ajax_url' => $this->ajaxController,
@ -200,6 +200,7 @@ class SatelliteAgent extends HTML
],
],
],
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
]
);
} catch (Exception $e) {
@ -213,10 +214,7 @@ class SatelliteAgent extends HTML
echo $modal.$msg.$aux;
echo '<div style="display: flex;justify-content: space-between;">';
echo '<div class="flex-content-left">';
html_print_select(
$select = html_print_select(
[
'0' => 'Disable / Enable selected agents',
'1' => 'Delete / Create selected agents',
@ -226,30 +224,32 @@ class SatelliteAgent extends HTML
'',
'',
0,
false,
true,
false,
false
);
html_print_submit_button(
$execute = html_print_submit_button(
__('Execute action'),
'submit_satellite_action',
false,
'class="sub next"'
[
'icon' => 'cog',
'class' => 'secondary',
],
true
);
echo '</div>';
// Create button add host.
echo '<div class="flex-content-right">';
html_print_submit_button(
$add = html_print_submit_button(
__('Add host'),
'create',
false,
'class="sub next"'
['icon' => 'next'],
true
);
echo '</div>';
echo '</div>';
html_print_action_buttons($add.$execute.$select);
// Load own javascript file.
echo $this->loadJS();
@ -503,6 +503,7 @@ class SatelliteAgent extends HTML
'arguments' => [
'name' => 'address',
'type' => 'text',
'class' => 'w100p',
'value' => $values['address'],
'return' => true,
],
@ -514,6 +515,7 @@ class SatelliteAgent extends HTML
'arguments' => [
'name' => 'name',
'type' => 'text',
'class' => 'w100p',
'value' => $values['name'],
'return' => true,
],
@ -1244,7 +1246,7 @@ class SatelliteAgent extends HTML
$('input[name*=check_]').prop('checked', check);
});
$('#submit-submit_satellite_action').click(function() {
$('#button-submit_satellite_action').click(function() {
const checks = $('input[name*=check_]:checked');
const action = $('#satellite_action').val();
let agent_delete_error = [];

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

@ -142,7 +142,7 @@ class SatelliteCollection extends HTML
[
'id' => $this->tableId,
'class' => 'info_table',
'style' => 'width: 100%',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $column_names,
'ajax_url' => $this->ajaxController,
@ -164,10 +164,12 @@ class SatelliteCollection extends HTML
'label' => __('Search'),
'type' => 'text',
'name' => 'filter_search',
'class' => 'w400px',
'size' => 12,
],
],
],
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
]
);
} catch (Exception $e) {
@ -176,6 +178,7 @@ class SatelliteCollection extends HTML
echo '<div id="aux" class="invisible"></div>';
echo '<div id="msg" class="invisible"></div>';
html_print_action_buttons('');
// Load own javascript file.
echo $this->loadJS();

15
pandora_console/include/functions_cron.php
View File

@ -489,10 +489,8 @@ function cron_list_table()
}
if ($defined_tasks !== false) {
echo '<h2>'.__('Scheduled jobs').'</h2>';
$table = new stdClass();
$table->class = 'databox data';
$table->class = 'info_table';
$table->width = '100%';
$table->data = [];
$table->head = [];
@ -912,8 +910,7 @@ function cron_list_table()
if ($function_name == 'cron_task_do_backup' || $function_name == 'cron_task_execute_custom_script') {
if ($manage_pandora) {
$data[7] = '<a href="'.$url;
$data[7] .= 'edit_task=1&id='.$task['id'].'">';
$data[7] = '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
$data[7] .= html_print_image(
'images/edit.svg',
true,
@ -926,8 +923,7 @@ function cron_list_table()
}
if ($manage_pandora) {
$data[7] .= '<a href="'.$url;
$data[7] .= 'delete_task=1&id_user_task='.$task['id'].'">';
$data[7] .= '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
$data[7] .= html_print_image(
'images/delete.svg',
true,
@ -940,8 +936,7 @@ function cron_list_table()
}
} else {
if ($write_perms || $manage_pandora) {
$data[7] = '<a href="'.$url;
$data[7] .= 'edit_task=1&id='.$task['id'].'">';
$data[7] = '<a href="javascript:form_add_cron_task('.$task['id'].',1);">';
$data[7] .= html_print_image(
'images/edit.svg',
true,
@ -994,5 +989,7 @@ function cron_list_table()
}
html_print_table($table);
} else {
ui_print_info_message(['no_close' => true, 'message' => __('There are no jobs') ]);
}
}

5
pandora_console/include/functions_massive_operations.php
View File

@ -43,7 +43,8 @@ function attachActionButton(
string $action,
string $buttonAction,
string $tableWidth,
bool $return=false
bool $return=false,
string $SelectAction=''
) {
switch ($buttonAction) {
case 'add':
@ -88,7 +89,7 @@ function attachActionButton(
['icon' => $class],
true
),
[],
['right_content' => $SelectAction],
$return
);
}

13
pandora_console/include/functions_menu.php
View File

@ -68,6 +68,19 @@ function menu_print_menu(&$menu)
$sec2 = 'godmode/alerts/alert_commands';
} else if ($sec2 === 'enterprise/godmode/setup/edit_skin') {
$sec2 = 'enterprise/godmode/setup/setup_skins';
} else if ($sec2 === 'godmode/gis_maps/configure_gis_map') {
$map_id = (string) get_parameter('map_id');
if (empty($map_id) === false) {
$sec2 = 'operation/gis_maps/render_view&map_id='.$map_id;
} else {
$sec2 = 'operation/gis_maps/gis_map';
}
} else if ($sec2 === 'enterprise/godmode/servers/manage_export_form') {
$sec2 = 'enterprise/godmode/servers/manage_export';
} else if ($sec2 === 'godmode/setup/gis_step_2') {
$sec2 = 'godmode/setup/setup&section=gis';
} else if ($sec2 === 'enterprise/godmode/agentes/agent_autoconfiguration.definition') {
$sec2 = 'enterprise/godmode/agentes/agent_autoconfiguration';
} else if ($sec2 === 'operation/gis_maps/render_view') {
$map_id = (int) get_parameter('map_id');
if (empty($map_id) === false) {

2
pandora_console/include/rest-api/models/VisualConsole/Items/ModuleGraph.php
View File

@ -545,7 +545,7 @@ final class ModuleGraph extends Item
'label' => __('Module Graph'),
'arguments' => [
'type' => 'radio_button',
'attributes' => 'class="btn" style="flex: 1;"',
'attributes' => 'class="btn mrgn_right_20px" style="flex: 1;"',
'name' => 'choosetype',
'value' => 'module',
'checkedvalue' => $checkedModule,

40
pandora_console/include/styles/pandora.css
View File

@ -10225,9 +10225,9 @@ button.submitButton > div {
button.buttonButton.onlyIcon,
button.submitButton.onlyIcon {
padding: 0 !important;
min-width: 1.7em !important;
width: 1.7em !important;
height: 1.7em !important;
min-width: 1.6em !important;
width: 1.6em !important;
height: 1.6em !important;
border: none;
box-shadow: none;
}
@ -10291,8 +10291,9 @@ button.submitButton.onlyIcon.auto_sla_graph_min {
button.buttonButton.onlyIcon.basic_chart_min,
button.submitButton.onlyIcon.basic_chart_min {
mask: url(../../images/event-history.svg) no-repeat right / contain;
-webkit-mask: url(../../images/event-history.svg) no-repeat right / contain;
mask: url(../../images/web-analisys-data@svg.svg) no-repeat right / contain;
-webkit-mask: url(../../images/web-analisys-data@svg.svg) no-repeat right /
contain;
}
button.buttonButton.onlyIcon.binary_min,
@ -11462,31 +11463,6 @@ p.trademark-copyright {
height: 24px;
}
form#satellite_conf_edit {
display: flex;
flex-direction: row;
justify-items: baseline;
justify-content: space-between;
flex-wrap: wrap;
}
form#satellite_conf_edit > fieldset {
background-color: #fff;
// border: 1px solid #e2e2e2;
padding: 0.5em;
margin: 0px 1em;
margin-bottom: 20px;
position: relative;
border-radius: 5px;
flex: 1 1 700px;
}
form#satellite_conf_edit > fieldset.full-column {
width: 100%;
flex: none;
margin: 0 0 20px;
}
.input_sub_placeholder {
font-size: 8pt;
color: #8a96a6;
@ -11766,3 +11742,7 @@ div.relative > div > div#ui-datepicker-div {
.container-div-input-password:has(.w400px-important) {
width: 400px;
}
span.help_icon_15px > img {
height: 15px !important;
}

14
pandora_console/include/styles/tables.css
View File

@ -741,6 +741,10 @@ tr.datos2 > td.datos2 > div > div > label {
line-height: 16px;
}
td[id^="basic_thresholds-"] .switch_radio_button > label[id^="label-radius"] {
line-height: 26px;
}
.mgn_tp_0_imp {
margin-top: 0px !important;
}
@ -823,3 +827,13 @@ div[id^="auto-os-"] > img {
.w22px {
width: 22px;
}
table#simple.floating_form tr[id^="simple-plugin_"],
table#simple.floating_form tr[id^="simple-macro_field"] {
display: grid;
margin-bottom: 10px;
}
table#simple.floating_form tr[id^="simple-macro_field"] > td > input {
width: 50%;
}

2
pandora_console/include/styles/visual_maps.css
View File

@ -14,6 +14,7 @@ div.external-visual-console-container {
width: 100%;
overflow-x: auto;
overflow-y: hidden;
position: relative;
z-index: 0;
}
@ -47,7 +48,6 @@ div#vc-controls .nomn #vc-refr-form {
}
div#vc-controls div.vc-title,
div#vc-controls div.vc-refr {
/*margin-top: 15px;*/
margin-left: 3px;
margin-right: 3px;
}

4
pandora_console/include/visual-console-client/vc.main.css
View File

@ -41,11 +41,11 @@
}
.visual-console-item.is-editing:hover {
border-color: #82b92e;
border-color: #2b2b2b;
}
.visual-console-item.is-editing.is-selected {
border: 2px dashed #2b2b2b;
border: 2px dashed #82b92e;
cursor: move;
z-index: 10;
}

2
pandora_console/include/visual-console-client/vc.main.css.map
View File

File diff suppressed because one or more lines are too long

20
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -540,11 +540,8 @@ $table_contact->data[] = $data;
$data_opcional = new stdClass();
$data_opcional->id = 'agent_data_main';
$data_opcional->width = '100%';
$data_opcional->class = 'floating_form';
$data_opcional->cellspacing = 0;
$data_opcional->cellpadding = 0;
$data_opcional->style[0] = 'height: 46px; width: 25%; padding-right: 5px;text-align: end;';
$data_opcional->style[1] = 'height: 46px; width: 75%; padding-left: 5px;';
// Gis and url address.
$agentAdditionalContent = '';
// Position Information.
@ -624,8 +621,6 @@ foreach ($fields as $field) {
$data = [];
$data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
$custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
if ($custom_value[0]['is_password_type']) {
$data[1] = '&bull;&bull;&bull;&bull;&bull;&bull;&bull;&bull;';
} else if ($field['is_link_enabled'] === '1') {
@ -642,6 +637,7 @@ foreach ($fields as $field) {
$data[1] = '<a href="'.$link_url.'">'.$link_text.'</a>';
} else {
$custom_value[0]['description'] = ui_bbcode_to_html($custom_value[0]['description']);
$data[1] = $custom_value[0]['description'];
}
@ -1056,19 +1052,13 @@ if (isset($data_opcional) === false || isset($data_opcional->data) === false ||
false,
false,
true,
'box-flat agent_details_col agent_details_toggle agent_details_first_row w100p',
'mrgn_right_20px',
'w100p'
'',
'white-box-content',
'box-flat white_table_graph w100p'
);
}
$agentIncidents = (isset($table_incident) === false) ? '' : html_print_table($table_incident, true);
/*
echo '<div class="agent_details_first_row">
<div class="box-flat agent_details_col mrgn_lft_20px mrgn_right_20px">'.$table_agent.'</div>
<div class="box-flat agent_details_col mrgn_right_20px">'.$agent_contact.'</div>
</div>'.$agent_info;
*/
html_print_div(
[

19
pandora_console/operation/gis_maps/gis_map.php
View File

@ -33,8 +33,9 @@ $buttons['gis_maps_list'] = [
).'</a>',
];
// Header.
ui_print_standard_header(
__('GIS Maps'),
__('List of GIS maps'),
'images/op_gis.png',
false,
'',
@ -199,7 +200,7 @@ if ($maps !== false) {
}
$table->cellclass[]['op'] = 'table_action_buttons';
$data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter']).'</a>';
$data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/edit.svg', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/delete.svg', true, ['title' => __('Delete'), 'class' => 'invert_filter main_menu_icon']).'</a>';
}
array_push($table->data, $data);
@ -213,12 +214,20 @@ if (!empty($table->data)) {
}
if ($edit_gis_maps) {
echo '<div class="action-buttons" style="width: '.$table->width.'">';
echo '<form action="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map" method="post">';
html_print_input_hidden('action', 'new_map');
html_print_submit_button(__('Create'), '', false, 'class="sub next"');
$ActionButton = html_print_submit_button(
__('Create'),
'create',
false,
[
'class' => 'sub ok submitButton',
'icon' => 'next',
],
true
);
echo '<div class="action-buttons">'.html_print_action_buttons($ActionButton, ['type' => 'form_action'], true).'</div>';
echo '</form>';
echo '</div>';
}
unset($table);

8
pandora_console/operation/gis_maps/render_view.php
View File

@ -175,9 +175,10 @@ if ($has_management_acl) {
$buttons['setup']['godmode'] = 1;
}
// Header.
ui_print_standard_header(
__('Map').' &raquo; '.__('Map').'&nbsp;'.$map['map_name'],
'images/op_gis.png',
__('Map').': '.$map['map_name'],
'images/op_snmp.png',
false,
'',
false,
@ -331,5 +332,8 @@ if ($layers != false) {
$(document).ready(function() {
var $map = $("#map");
$map.css("height", "calc(100vh - " + $map.offset().top + "px - 20px)");
$('#select2-show_status-container').parent().parent().parent().removeClass('select2');
$('#select2-refresh_time-container').parent().parent().parent().removeClass('select2');
});
</script>

2
pandora_console/operation/visual_console/view.php
View File

@ -287,7 +287,7 @@ if ($pure === false) {
$class_nlink = 'network_link_min link-create-item';
$class_odometer = 'odometer_min link-create-item';
$class_basic_chart = 'basic_chart_min link-create-item';
$class_delete = 'delete_item delete_min';
$class_delete = 'delete_item';
$class_copy = 'copy_item';
if ($config['style'] === 'pandora_black' && is_metaconsole() === false) {
$class_camera .= ' invert_filter';

4
pandora_console/views/cluster/edit.php
View File

@ -143,7 +143,9 @@ html_print_action_buttons(
var buttonback = $('#button-submit').parent().html();
$('#button-submit').hide();
var buttonback = buttonback.replace('button-submit','button-submit_copy');
$('.action_buttons_right_content').parent().html(buttonnext+buttonback);
var buttonalert = $('#button-add').parent().html();
var buttonalert = buttonalert.replace('button-add','button-add_copy');
$('.action_buttons_right_content').parent().html(buttonnext+buttonback+buttonalert);
var style = $('#principal_action_buttons').attr('style');
$('#principal_action_buttons').attr('style',style+' justify-content: unset;');

17
pandora_console/views/cluster/list.php
View File

@ -27,12 +27,23 @@
*/
// Header.
\ui_print_page_header(
__('Monitoring').' &raquo; '.__('Clusters'),
ui_print_standard_header(
__('Cluster view'),
'images/chart.png',
false,
'',
false
true,
[],
[
[
'link' => '',
'label' => __('Monitoring'),
],
[
'link' => '',
'label' => __('Clusters'),
],
]
);
if (empty($message) === false) {

4
visual_console_client/src/main.css
View File

@ -41,11 +41,11 @@
}
.visual-console-item.is-editing:hover {
border-color: #82b92e;
border-color: #2b2b2b;
}
.visual-console-item.is-editing.is-selected {
border: 2px dashed #2b2b2b;
border: 2px dashed #82b92e;
cursor: move;
z-index: 10;
}