tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

10843 & 10844

Browse Source
This commit is contained in:
Pablo Aragon 2023-03-31 10:44:51 +02:00
parent a0828ac25c
commit 426690bc35
5 changed files with 220 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

253
pandora_console/godmode/reporting/graph_builder.graph_editor.php
View File

@ -204,9 +204,142 @@ if ($count_module_array > $config['items_combined_charts']) {
); );
} }
$table = new stdClass();
$table->width = '100%';
$table->colspan[0][0] = 3;
$table->size = [];
if (defined('METACONSOLE')) {
$table->class = 'databox data';
$table->head[0] = __('Sort items');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
} else {
$table->class = 'filter-table-adv';
$table->size[0] = '50%';
$table->size[1] = '50%';
}
$table->data[0][0] = html_print_label_input_block(
__('Sort selected items'),
html_print_select_style(
[
'before' => __('before to'),
'after' => __('after to'),
],
'move_to',
'',
'',
'',
'',
0,
true
)
);
$table->data[0][1] = html_print_label_input_block(
__('Position'),
html_print_input_text_extended(
'position_to_sort',
1,
'text-position_to_sort',
'',
3,
10,
false,
"only_numbers('position_to_sort');",
'',
true
).html_print_input_hidden('ids_items_to_sort', '', true)
);
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
$SortItems .= html_print_table($table, true);
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
$SortItems .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Sort'),
'srcbutton',
false,
[
'class' => 'mini',
'icon' => 'search',
'mode' => 'secondary',
],
true
),
],
true
);
$SortItems .= '</form>';
ui_toggle(
$SortItems,
'<span class="subsection_header_title">'.__('Sort items').'</span>',
'',
'',
false,
false,
'',
'white-box-content no_border',
'filter-datatable-main box-flat white_table_graph max_floating_element_size'
);
// Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters max_floating_element_size'>";
echo '<tr>';
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
'searchBar' => true,
]
).'</td>';
echo '</tr><tr>';
echo "<td colspan='3'>";
echo "<table cellpadding='4' class='filter-table-adv'><tr>";
echo '<td>';
echo html_print_label_input_block(
__('Weight'),
'<input type="text" name="weight" value="1" size=3>'
);
echo '</td>';
echo '</tr></table>';
echo '</td>';
echo '</tr><tr>';
echo "<td colspan='3' align='right'></td>";
echo '</tr></table>';
$ActionButtons[] = html_print_submit_button(
__('Add'),
'submit-add',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
html_print_action_buttons(
implode('', $ActionButtons),
['type' => 'form_action']
);
echo '</form>';
// Modules table. // Modules table.
if ($count_module_array > 0) { if ($count_module_array > 0) {
echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters'>"; echo "<table width='100%' cellpadding=4 cellpadding=4 class='databox filters info_table'>";
echo '<tr> echo '<tr>
<th>'.__('P.').'</th> <th>'.__('P.').'</th>
<th>'.__('Agent').'</th> <th>'.__('Agent').'</th>
@ -290,124 +423,6 @@ if ($count_module_array > 0) {
echo '</table>'; echo '</table>';
} }
$table = new stdClass();
$table->width = '100%';
$table->colspan[0][0] = 3;
$table->size = [];
if (defined('METACONSOLE')) {
$table->class = 'databox data';
$table->head[0] = __('Sort items');
$table->head_colspan[0] = 4;
$table->headstyle[0] = 'text-align: center';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
} else {
$table->class = 'filter-table-adv';
$table->size[0] = '50%';
$table->size[1] = '50%';
}
$table->data[0][0] = html_print_label_input_block(
__('Sort selected items'),
html_print_select_style(
[
'before' => __('before to'),
'after' => __('after to'),
],
'move_to',
'',
'',
'',
'',
0,
true
)
);
$table->data[0][1] = html_print_label_input_block(
__('Position'),
html_print_input_text_extended(
'position_to_sort',
1,
'text-position_to_sort',
'',
3,
10,
false,
"only_numbers('position_to_sort');",
'',
true
).html_print_input_hidden('ids_items_to_sort', '', true)
);
$SortItems = "<form action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&edit_graph=1&id=".$id_graph."' method='post' onsubmit='return added_ids_sorted_items_to_hidden_input();'>";
$SortItems .= html_print_table($table, true);
$SortItems .= html_print_input_hidden('action', 'sort_items', true);
$SortItems .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Sort'),
'srcbutton',
false,
[
'class' => 'mini',
'icon' => 'search',
'mode' => 'secondary',
],
true
),
],
true
);
$SortItems .= '</form>';
ui_toggle($SortItems, __('Sort items'), '', '', false);
// Configuration form.
echo '<span id ="none_text" class="invisible">'.__('None').'</span>';
echo "<form id='agentmodules' method='post' action='index.php?sec=reporting&sec2=godmode/reporting/graph_builder&tab=graph_editor&add_module=1&edit_graph=1&id=".$id_graph."'>";
echo "<table width='100%' cellpadding='4' cellpadding='4' class='databox filters'>";
echo '<tr>';
echo '<td class="w50p pdd_50px" id="select_multiple_modules_filtered">'.html_print_input(
[
'type' => 'select_multiple_modules_filtered',
'uniqId' => 'modules',
'class' => 'flex flex-row',
'searchBar' => true,
]
).'</td>';
echo '</tr><tr>';
echo "<td colspan='3'>";
echo "<table cellpadding='4'><tr>";
echo '<td>'.__('Weight').'</td>';
echo "<td><input type='text' name='weight' value='1' size=3></td>";
echo '</tr></table>';
echo '</td>';
echo '</tr><tr>';
echo "<td colspan='3' align='right'></td>";
echo '</tr></table>';
$ActionButtons[] = html_print_submit_button(
__('Add'),
'submit-add',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
html_print_action_buttons(
implode('', $ActionButtons),
['type' => 'form_action']
);
ui_require_jquery_file('pandora.controls'); ui_require_jquery_file('pandora.controls');
ui_require_jquery_file('ajaxqueue'); ui_require_jquery_file('ajaxqueue');
ui_require_jquery_file('bgiframe'); ui_require_jquery_file('bgiframe');

72
pandora_console/include/functions_html.php
View File

@ -1559,6 +1559,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Group'), 'label' => __('Group'),
'label_class' => 'font-title-font',
'name' => 'filtered-module-group-'.$uniqId, 'name' => 'filtered-module-group-'.$uniqId,
'returnAllGroup' => $return_all_group, 'returnAllGroup' => $return_all_group,
'privilege' => 'AR', 'privilege' => 'AR',
@ -1572,14 +1573,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
// Recursion. // Recursion.
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Recursion'), 'label' => __('Recursion'),
'type' => 'switch', 'label_class' => 'font-title-font',
'name' => 'filtered-module-recursion-'.$uniqId, 'type' => 'switch',
'value' => (empty($data['mRecursion']) === true) ? false : true, 'name' => 'filtered-module-recursion-'.$uniqId,
'checked' => (empty($data['mRecursion']) === true) ? false : true, 'value' => (empty($data['mRecursion']) === true) ? false : true,
'return' => true, 'checked' => (empty($data['mRecursion']) === true) ? false : true,
'id' => 'filtered-module-recursion-'.$uniqId, 'return' => true,
'onchange' => 'fmAgentChange(\''.$uniqId.'\')', 'id' => 'filtered-module-recursion-'.$uniqId,
'onchange' => 'fmAgentChange(\''.$uniqId.'\')',
] ]
); );
@ -1598,6 +1600,7 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Module group'), 'label' => __('Module group'),
'label_class' => 'font-title-font',
'type' => 'select', 'type' => 'select',
'fields' => $module_groups, 'fields' => $module_groups,
'name' => 'filtered-module-module-group-'.$uniqId, 'name' => 'filtered-module-module-group-'.$uniqId,
@ -1682,15 +1685,16 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Agents'), 'label' => __('Agents'),
'type' => 'select', 'label_class' => 'font-title-font',
'fields' => $agents, 'type' => 'select',
'name' => 'filtered-module-agents-'.$uniqId, 'fields' => $agents,
'selected' => explode(',', $data['mAgents']), 'name' => 'filtered-module-agents-'.$uniqId,
'return' => true, 'selected' => explode(',', $data['mAgents']),
'multiple' => true, 'return' => true,
'style' => 'min-width: 200px;max-width:200px;', 'multiple' => true,
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'style' => 'min-width: 200px;max-width:200px;',
'script' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
] ]
); );
@ -1701,14 +1705,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Only common modules'), 'label' => __('Only common modules'),
'type' => 'switch', 'label_class' => 'font-title-font',
'checked' => $commonModules, 'type' => 'switch',
'value' => $commonModules, 'checked' => $commonModules,
'name' => 'filtered-module-show-common-modules-'.$uniqId, 'value' => $commonModules,
'id' => 'filtered-module-show-common-modules-'.$uniqId, 'name' => 'filtered-module-show-common-modules-'.$uniqId,
'return' => true, 'id' => 'filtered-module-show-common-modules-'.$uniqId,
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')', 'return' => true,
'onchange' => 'fmModuleChange(\''.$uniqId.'\', '.(int) is_metaconsole().')',
] ]
); );
@ -1742,14 +1747,15 @@ function html_print_select_multiple_modules_filtered(array $data):string
$output .= html_print_input( $output .= html_print_input(
[ [
'label' => __('Modules'), 'label' => __('Modules'),
'type' => 'select', 'label_class' => 'font-title-font',
'fields' => $all_modules, 'type' => 'select',
'name' => 'filtered-module-modules-'.$uniqId, 'fields' => $all_modules,
'selected' => $result, 'name' => 'filtered-module-modules-'.$uniqId,
'return' => true, 'selected' => $result,
'multiple' => true, 'return' => true,
'style' => 'min-width: 200px;max-width:200px;', 'multiple' => true,
'style' => 'min-width: 200px;max-width:200px;',
] ]
); );

50
pandora_console/include/functions_ui.php
View File

@ -1287,38 +1287,44 @@ function ui_format_alert_row(
$additionUrl = ''; $additionUrl = '';
} }
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
$forceTitle, [
'force_execution_'.$alert['id'], 'href' => $url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl,
false, 'content' => html_print_image(
'window.location.assign("'.$url.'&amp;id_alert='.$alert['id'].'&amp;refr=60'.$additionUrl.'");', 'images/force@svg.svg',
[ 'mode' => 'link' ], true,
[
'title' => $forceTitle,
'class' => 'main_menu_icon invert_filter',
]
),
],
true true
); );
} }
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
__('View'),
'view_template_'.$alert['id'],
false,
'',
[ [
'mode' => 'link', 'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'],
'class' => 'template_details', 'class' => 'template_details',
'href' => 'ajax.php?page=godmode/alerts/alert_templates&get_template_tooltip=1&id_template='.$template['id'], 'content' => html_print_image(
'images/details.svg',
true,
['class' => 'main_menu_icon invert_filter']
),
], ],
true true
); );
} else { } else {
$forceExecButtons[] = html_print_button( $forceExecButtons[] = html_print_anchor(
__('View'),
'view_template_'.$alert['id'],
false,
'',
[ [
'mode' => 'link', 'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'],
'class' => 'template_details', 'class' => 'template_details',
'href' => ui_get_full_url('/', false, false, false).'/ajax.php?page=enterprise/meta/include/ajax/tree_view.ajax&action=get_template_tooltip&id_template='.$template['id'].'&server_name='.$alert['server_data']['server_name'], 'content' => html_print_image(
'images/details.svg',
true,
['class' => 'main_menu_icon invert_filter']
),
], ],
true true
); );

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

@ -931,6 +931,10 @@ select:-internal-list-box {
justify-content: flex-start; justify-content: flex-start;
} }
.flex-align-start {
align-items: start;
}
.flex-baseline { .flex-baseline {
align-self: baseline; align-self: baseline;
} }
@ -7404,6 +7408,10 @@ div.graph div.legend table {
/* /*
* PADDING RIGHT * PADDING RIGHT
*/ */
.pdd_r_0px {
padding-right: 0px !important;
}
.pdd_r_2px { .pdd_r_2px {
padding-right: 2px; padding-right: 2px;
} }
@ -7475,6 +7483,10 @@ div.graph div.legend table {
/* /*
* PADDING LEFT * PADDING LEFT
*/ */
.pdd_l_0px {
padding-left: 0px !important;
}
.pdd_l_4px { .pdd_l_4px {
padding-left: 4px; padding-left: 4px;
} }

8
pandora_console/operation/agentes/alerts_status.php
View File

@ -233,6 +233,7 @@ if ((bool) check_acl($config['id_user'], $id_group, 'LW') === true || (bool) che
[ [
'title' => __('Operations'), 'title' => __('Operations'),
'text' => __('Operations'), 'text' => __('Operations'),
'class' => 'left pdd_l_0px pdd_r_0px w100p',
], ],
); );
@ -317,6 +318,7 @@ if (is_metaconsole() === true) {
$no_sortable_columns = [ $no_sortable_columns = [
0, 0,
1, 1,
2,
5, 5,
]; ];
} else { } else {
@ -514,10 +516,14 @@ function alerts_table_controls() {
attribute: 'href', attribute: 'href',
cluetipClass: 'default' cluetipClass: 'default'
}).click (function () { }).click (function () {
console.log('click aqui');
return false; return false;
}); });
$("a.template_details").cluetip ({
arrows: true,
attribute: 'href',
cluetipClass: 'default'
});
$('[id^=checkbox-all_validate]').change(function(){ $('[id^=checkbox-all_validate]').change(function(){
if ($("#checkbox-all_validate").prop("checked")) { if ($("#checkbox-all_validate").prop("checked")) {