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' into 'develop' 

Ent 9662 second round

See merge request artica/pandorafms!5605
This commit is contained in:
daniel 2023-03-15 20:25:30 +00:00
parent 8804cc46d5 63ad563bf2
commit 83f2f2d008
43 changed files with 3118 additions and 2492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,21 +487,18 @@ if (isset($groups[$grupo]) === true || $new_agent === true) {
$tableAgent->data['primary_group'][0] .= html_print_input_hidden('grupo', $grupo, true);
}
$tableAgent->data['primary_group'][0] .= html_print_div(
[
'content' => ui_print_group_icon(
$grupo,
true,
'',
($id_agente === 0) ? 'display: none;' : '',
true,
false,
false,
'after_input_icon'
),
],
true
$tableAgent->data['primary_group'][0] .= '<span id="group_preview">';
$tableAgent->data['primary_group'][0] .= ui_print_group_icon(
$grupo,
true,
'',
($id_agente === 0) ? 'display: none;' : '',
true,
false,
false,
'after_input_icon'
);
$tableAgent->data['primary_group'][0] .= '</span>';
$tableAgent->data['caption_interval'][0] = __('Interval');
// $tableAgent->rowstyle['interval'] = 'width: 260px';
@ -974,7 +971,7 @@ foreach ($fields as $field) {
$data_field[1] .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
65,
1000,
$link_text,
'class="min-height-30px w100p"',
true
@ -985,7 +982,7 @@ foreach ($fields as $field) {
$data_field[1] .= html_print_textarea(
'customvalue_'.$field['id_field'].'[]',
2,
65,
1000,
$link_url,
'class="min-height-30px w100p"',
true
@ -994,7 +991,7 @@ foreach ($fields as $field) {
$customContent = html_print_textarea(
'customvalue_'.$field['id_field'],
2,
65,
1000,
$custom_value,
'class="min-height-30px w100p"',
true
@ -1039,7 +1036,7 @@ if (empty($fields) === false) {
'',
true,
false,
'white_box white_box_opened white_table_graph_fixed',
'white_box white_box_opened white_table_graph_fixed no_border',
'no-border custom_fields_elements'
);
}

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

@ -827,12 +827,6 @@ if ($id_agente) {
'link' => '',
'label' => $tab_name,
],
],
[
'id_element' => $id_agente,
'url' => 'godmode/agentes/configurar_agente&tab=main&id_agente='.$id_agente,
'label' => agents_get_alias($id_agente),
'section' => 'Agents',
]
);
}

5
pandora_console/godmode/groups/group_list.php
View File

@ -718,7 +718,7 @@ if ($is_management_allowed === true
'tfavmenu_user',
[
'id_element' => $id_group,
'section' => 'Tactic_group',
'section' => 'Groups',
'id_user' => $config['id_user'],
]
);
@ -906,7 +906,6 @@ if ($tab == 'tree') {
foreach ($groups as $key => $group) {
$url_edit = 'index.php?sec=gagente&sec2=godmode/groups/configure_group&id_group='.$group['id_grupo'];
$url_tactical = 'index.php?sec=gagente&sec2=godmode/groups/tactical&id_group='.$group['id_grupo'];
if (is_metaconsole()) {
$url_delete = 'index.php?sec=gagente&sec2=godmode/groups/group_list&delete_group=1&id_group='.$group['id_grupo'].'&tab=groups';
} else {
@ -915,7 +914,7 @@ if ($tab == 'tree') {
$table->data[$key][0] = $group['id_grupo'];
if ($is_management_allowed === true) {
$table->data[$key][1] = '<a href="'.$url_tactical.'">'.$group['nombre'].'</a>';
$table->data[$key][1] = '<a href="'.$url_edit.'">'.$group['nombre'].'</a>';
} else {
$table->data[$key][1] = $group['nombre'];
}

7
pandora_console/godmode/groups/tactical.php
View File

@ -72,14 +72,14 @@ if (is_metaconsole() === false) {
],
[
'link' => '',
'label' => __('Tactic group'),
'label' => __('Tactical group view'),
],
],
[
'id_element' => $id_group,
'url' => 'gagent&sec2=godmode/groups/tactical&id_group='.$id_group,
'label' => groups_get_name($id_group),
'section' => 'Tactic_group',
'section' => 'Groups',
]
);
}
@ -187,7 +187,7 @@ try {
[
'id' => 'list_agents_tactical',
'class' => 'info_table',
'style' => 'width: 100%',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columnNames,
'return' => true,
@ -196,6 +196,7 @@ try {
'method' => 'getAgentsByGroup',
'id_group' => $id_group,
],
'dom_elements' => 'lpfti',
'no_sortable_columns' => [-1],
'order' => [
'field' => 'alias',

54
pandora_console/godmode/reporting/reporting_builder.main.php
View File

@ -176,6 +176,31 @@ if (is_metaconsole() === true) {
);
}
if (is_metaconsole() === true) {
$table->data['description'][0] = __('Description');
$table->data['description'][1] = html_print_textarea(
'description',
2,
80,
$description,
'',
true
);
} else {
$table->colspan[1][0] = 2;
$table->data[1][0] = html_print_label_input_block(
__('Description'),
html_print_textarea(
'description',
2,
1,
$description,
'',
true
)
);
}
if ($report_id_user == $config['id_user']
|| is_user_admin($config['id_user'])
) {
@ -222,7 +247,7 @@ if ($report_id_user == $config['id_user']
$table->data['access'][1] .= '</div>';
$table->data['access'][1] .= '</span>';
} else {
$table->data[1][0] = html_print_label_input_block(
$table->data[2][0] = html_print_label_input_block(
__('Write Access').ui_print_help_tip(
__('For example, you want a report that the people of "All" groups can see but you want to edit only for you or your group.'),
true
@ -244,7 +269,7 @@ if ($report_id_user == $config['id_user']
$options['div_class'] = '';
}
$table->data[1][1] = html_print_label_input_block(
$table->data[2][1] = html_print_label_input_block(
__('Group'),
html_print_select_groups(
false,
@ -277,7 +302,7 @@ if ($enterpriseEnable) {
true
);
} else {
$table->data[2][0] = html_print_label_input_block(
$table->data[2][1] = html_print_label_input_block(
__('Non interactive report'),
html_print_checkbox_switch(
'non_interactive',
@ -289,29 +314,6 @@ if ($enterpriseEnable) {
}
}
if (is_metaconsole() === true) {
$table->data['description'][0] = __('Description');
$table->data['description'][1] = html_print_textarea(
'description',
2,
80,
$description,
'',
true
);
} else {
$table->data[2][1] = html_print_label_input_block(
__('Description'),
html_print_textarea(
'description',
2,
1,
$description,
'',
true
)
);
}
if (enterprise_installed() === true) {
if (is_metaconsole() === true) {

1086
pandora_console/godmode/setup/setup_general.php
View File

File diff suppressed because it is too large Load Diff

3470
pandora_console/godmode/setup/setup_visuals.php
View File

File diff suppressed because it is too large Load Diff

9
pandora_console/images/world@svg.svg Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
<title>Dark / 20 / web@svg</title>
<desc>Created with Sketch.</desc>
<g id="Dark-/-20-/-web" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M10,0 C4.4771525,0 0,4.4771525 0,10 C0,15.5228475 4.4771525,20 10,20 C15.5228475,20 20,15.5228475 20,10 C19.9945565,4.47940886 15.5205911,0.00544352451 10,0 Z M10.0288333,17.4971042 C10.0246667,17.4971042 10.0206042,17.4983125 10.0163333,17.4983125 C9.68185417,17.3901458 9.011375,16.3172917 8.56475,14.3237292 C9.04327083,14.3508125 9.52308333,14.375 10,14.375 C10.4774375,14.375 10.9581042,14.3508958 11.437375,14.3237292 C10.9950208,16.3143958 10.3361458,17.3863125 10.0288333,17.4971042 Z M10,11.875 C9.35577083,11.875 8.75960417,11.8472292 8.19702083,11.8032917 C8.15291667,11.2406875 8.125,10.6442292 8.125,10 C8.125,9.35577083 8.15277083,8.75960417 8.19670833,8.19702083 C8.7593125,8.15291667 9.35577083,8.125 10,8.125 C10.6442292,8.125 11.2403958,8.15277083 11.8029792,8.19670833 C11.8470833,8.7593125 11.875,9.35577083 11.875,10 C11.875,10.6442292 11.8472292,11.2403958 11.8032917,11.8029792 C11.2406875,11.8470833 10.6442292,11.875 10,11.875 Z M2.50289583,10.0288333 C2.50289583,10.0246667 2.5016875,10.0206042 2.5016875,10.0163333 C2.60985417,9.68185417 3.68270833,9.011375 5.67627083,8.56475 C5.64927083,9.04327083 5.625,9.52316667 5.625,10 C5.625,10.4774375 5.64910417,10.9581042 5.67627083,11.437375 C3.68560417,10.9950208 2.6136875,10.3361458 2.50289583,10.0288333 Z M9.97116667,2.50289583 C9.97533333,2.50289583 9.97939583,2.5016875 9.98366667,2.5016875 C10.3181458,2.60985417 10.988625,3.68270833 11.43525,5.67627083 C10.9567292,5.64927083 10.4768333,5.625 10,5.625 C9.5225625,5.625 9.04189583,5.64910417 8.562625,5.67627083 C9.00497917,3.68560417 9.66385417,2.6136875 9.97116667,2.50289583 Z M14.3237292,8.562625 C16.3143958,9.00497917 17.3862292,9.66385417 17.4971042,9.97116667 C17.4971042,9.97533333 17.4983125,9.97939583 17.4983125,9.98366667 C17.3901458,10.3181458 16.3172917,10.988625 14.3237292,11.43525 C14.3508125,10.9567292 14.375,10.4769167 14.375,10 C14.375,9.5225625 14.3508958,9.04189583 14.3237292,8.562625 Z M16.671,6.64397917 C15.8116964,6.34280615 14.9276165,6.11763659 14.0289375,5.9710625 C13.8823634,5.07238349 13.6571938,4.18830364 13.3560208,3.329 C14.7866526,4.05165344 15.9483466,5.21334744 16.671,6.64397917 L16.671,6.64397917 Z M6.64375,3.329 C6.34261768,4.18830554 6.11749674,5.07238609 5.97097917,5.9710625 C5.0723873,6.11755451 4.18838995,6.34264769 3.32916667,6.64375 C4.05172797,5.21324363 5.21327996,4.05163323 6.64375,3.329 L6.64375,3.329 Z M3.32916667,13.35625 C4.1884091,13.6574028 5.07243613,13.8825243 5.9710625,14.0290208 C6.11753664,14.9276164 6.34263021,15.8116153 6.64375,16.6708333 C5.21325958,15.948307 4.05169302,14.7867404 3.32916667,13.35625 Z M13.35625,16.6708333 C13.6573853,15.8115856 13.8825065,14.9275601 14.0290208,14.0289375 C14.9276665,13.8824423 15.8117189,13.6573493 16.671,13.35625 C15.9483668,14.78672 14.7867564,15.948272 13.35625,16.6708333 L13.35625,16.6708333 Z" id="Shape" fill="#3F3F3F"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

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

@ -1750,7 +1750,9 @@ if (check_login()) {
INNER JOIN tagente
ON tagente_modulo.id_agente = tagente.id_agente
INNER JOIN tagente_estado
ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo'
ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
WHERE %s',
$where
);
$recordsTotal = db_get_value_sql($sql_count);
@ -1795,6 +1797,32 @@ if (check_login()) {
}
}
if (in_array(0, $servers_ids) === true) {
$sql = sprintf(
'SELECT
tagente_modulo.nombre,
tagente.alias,
tagente.id_agente,
tagente_estado.last_status_change,
tagente_estado.estado
FROM tagente_modulo
INNER JOIN tagente
ON tagente_modulo.id_agente = tagente.id_agente
INNER JOIN tagente_estado
ON tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
WHERE %s',
$where
);
$res_sql = db_get_all_rows_sql($sql);
foreach ($res_sql as $row_sql) {
$row_sql['server_name'] = __('Metaconsole');
$row_sql['server_url'] = $config['homeurl'];
array_push($data, $row_sql);
}
}
// Drop temporary table if exist.
db_process_sql('DROP TEMPORARY TABLE IF EXISTS temp_modules_status;');
@ -1852,7 +1880,9 @@ if (check_login()) {
$sql_count = sprintf(
'SELECT COUNT(*) AS "total"
FROM temp_modules_status'
FROM temp_modules_status
WHERE %s',
$where
);
$recordsTotal = db_get_value_sql($sql_count);

159
pandora_console/include/class/ExternalTools.class.php
View File

@ -528,77 +528,103 @@ class ExternalTools extends HTML
// Form table.
$table = new StdClass();
$table->class = 'fixed_filter_bar';
$table->class = 'fixed_filter_bar filter-table-adv pdd_15px';
$table->id = 'externalToolTable';
$table->cellstyle['captions'][0] = 'width: 0';
$table->cellstyle['captions'][1] = 'width: 0';
$table->cellstyle['captions'][2] = 'width: 0';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
$table->colspan = [];
$table->colspan[1][0] = 4;
// $table->cellclass[0][2] = 'snmpcolumn';
// $table->cellclass[0][2] = 'snmpcolumn';
// $table->cellclass[0][3] = 'snmpcolumn';
// $table->cellclass[0][3] = 'snmpcolumn';
$table->data = [];
$table->data['captions'][0] = __('Operation');
$table->data['inputs'][0] = html_print_select(
$commandList,
'operation',
$this->operation,
'mostrarColumns(this.value)',
__('Please select'),
0,
true
$table->data[0][0] = html_print_label_input_block(
__('Operation'),
html_print_select(
$commandList,
'operation',
$this->operation,
'mostrarColumns(this.value)',
__('Please select'),
0,
true,
false,
true,
'w100p',
false,
'width: 100%;'
)
);
$table->data['captions'][1] = __('IP Adress');
$table->data['inputs'][1] = html_print_select(
$ipsSelect,
'select_ips',
$principal_ip,
'',
'',
0,
true
$table->data[0][1] = html_print_label_input_block(
__('IP Adress'),
html_print_select(
$ipsSelect,
'select_ips',
$principal_ip,
'',
'',
0,
true,
false,
true,
'w100p',
false,
'width: 100%;'
)
);
$table->cellclass['captions'][2] = 'snmpcolumn';
$table->cellclass['inputs'][2] = 'snmpcolumn';
$table->data['captions'][2] = __('SNMP Version');
$table->data['inputs'][2] = html_print_select(
$table->data[0][2] = html_print_label_input_block(
__('SNMP Version'),
html_print_select(
[
'1' => 'v1',
'2c' => 'v2c',
],
'select_version',
$this->snmp_version,
'',
'',
0,
true,
false,
true,
'w100p',
false,
'width: 100%;'
),
['div_class' => 'snmpcolumn']
);
$table->data[0][3] = html_print_label_input_block(
__('SNMP Community'),
html_print_input_text(
'community',
$this->community,
'',
50,
255,
true,
false,
false,
'',
'w100p'
),
['div_class' => 'snmpcolumn']
);
$table->data[1][0] = html_print_submit_button(
__('Execute'),
'submit',
false,
[
'1' => 'v1',
'2c' => 'v2c',
],
'select_version',
$this->snmp_version,
'',
'',
0,
true
);
$table->cellclass['captions'][3] = 'snmpcolumn';
$table->cellclass['inputs'][3] = 'snmpcolumn';
$table->data['captions'][3] = __('SNMP Community');
$table->data['inputs'][3] = html_print_input_text(
'community',
$this->community,
'',
50,
255,
true
);
$table->data['inputs'][4] = html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Execute'),
'submit',
false,
[
'icon' => 'cog',
'mode' => 'mini',
],
true
),
'icon' => 'cog',
'mode' => 'mini',
'class' => 'float-right mrgn_right_10px',
],
true
);
@ -716,7 +742,7 @@ class ExternalTools extends HTML
*/
private function performExecution(string $command='', string $caption='')
{
$output = '';
$output = '<div class="white_box max_floating_element_size no_border">';
try {
// If caption is not added, don't show anything.
@ -736,7 +762,7 @@ class ExternalTools extends HTML
$output .= __('Command not response');
}
$output .= '</pre>';
$output .= '</pre></div>';
if ($resultCode !== 0) {
throw new Exception(
@ -774,6 +800,8 @@ class ExternalTools extends HTML
{
$output = '';
echo '<div class="white_box max_floating_element_size no_border pdd_15px">';
if (validate_address($ip) === false) {
$output .= ui_print_error_message(
__('The ip or dns name entered cannot be resolved'),
@ -938,6 +966,7 @@ class ExternalTools extends HTML
}
}
echo '</div>';
return $output;
}

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

@ -259,7 +259,10 @@ class SnmpConsole extends HTML
'class' => 'snmp-td',
],
'alert',
'action',
[
'text' => 'action',
'class' => 'table_action_buttons w120px',
],
[
'text' => 'm',
'class' => 'mw60px pdd_0px',

11
pandora_console/include/class/TipsWindow.class.php
View File

@ -157,11 +157,12 @@ class TipsWindow
View::render(
'dashboard/tipsWindow',
[
'title' => $initialTip['title'],
'text' => $initialTip['text'],
'url' => $initialTip['url'],
'files' => $initialTip['files'],
'id' => $initialTip['id'],
'title' => $initialTip['title'],
'text' => $initialTip['text'],
'url' => $initialTip['url'],
'files' => $initialTip['files'],
'id' => $initialTip['id'],
'totalTips' => $this->getTotalTipsShowUser(),
]
);
}

4
pandora_console/include/functions_config.php
View File

@ -3218,7 +3218,7 @@ function config_process_config()
// Try to update user table in order to refresh skin inmediatly.
$is_user_updating = get_parameter('sec2', '');
if ($is_user_updating == 'operation/users/user_edit') {
if ($is_user_updating === 'godmode/users/configure_user') {
$id = get_parameter_get('id', $config['id_user']);
// ID given as parameter.
$user_info = get_user_info($id);
@ -3746,7 +3746,7 @@ function config_user_set_custom_config()
}
}
if (defined('METACONSOLE')) {
if (is_metaconsole() === true) {
$config['metaconsole_access'] = $userinfo['metaconsole_access'];
}
}

26
pandora_console/include/functions_ui.php
View File

@ -723,7 +723,23 @@ function ui_print_group_icon($id_group, $return=false, $path='', $style='', $lin
$output .= '<span title="'.groups_get_name($id_group, true).'">'.groups_get_name($id_group, true).'&nbsp;</span>';
} else {
if (empty($icon) === true) {
$output .= '<span title="'.groups_get_name($id_group, true).'">&nbsp;&nbsp;</span>';
$output .= '<span title="'.groups_get_name($id_group, true).'">';
$output .= '</span>';
$output .= html_print_image(
'images/unknown@groups.svg',
true,
[
'style' => $style,
'class' => 'main_menu_icon '.$class,
'alt' => groups_get_name($id_group, true),
'title' => groups_get_name($id_group, true),
],
false,
false,
false,
true
);
$output .= '</span>';
} else {
if (empty($class) === true) {
$class = 'bot';
@ -3879,8 +3895,8 @@ function ui_print_datatable(array $parameters)
}
$js .= 'if ($("#'.$table_id.' tr td").length == 1) {
$("div[id^=info_box_]").show();
$("div[id^=info_box_]").removeClass(\'invisible_important\');
$(".datatable-msg-info-'.$table_id.'").show();
$(".datatable-msg-info-'.$table_id.'").removeClass(\'invisible_important\');
$("table#'.$table_id.'").hide();
$("div.dataTables_paginate").hide();
$("div.dataTables_info").hide();
@ -3891,7 +3907,7 @@ function ui_print_datatable(array $parameters)
$(".dataTables_paginate.paging_simple_numbers").show()
}
} else {
$("div[id^=info_box_]").hide();
$(".datatable-msg-info-'.$table_id.'").hide();
$("table#'.$table_id.'").show();
$("div.dataTables_paginate").show();
$("div.dataTables_info").show();
@ -4028,7 +4044,7 @@ function ui_print_datatable(array $parameters)
// Order.
$info_msg_arr = [];
$info_msg_arr['message'] = $emptyTable;
$info_msg_arr['div_class'] = 'info_box_container invisible_important';
$info_msg_arr['div_class'] = 'info_box_container invisible_important datatable-msg-info-'.$table_id;
$info_msg = '<div>'.ui_print_info_message($info_msg_arr).'</div>';
$err_msg = '<div id="error-'.$table_id.'"></div>';

39
pandora_console/include/javascript/jquery.pandora.controls.js
View File

@ -296,7 +296,7 @@
$.extend({
pandoraSelectGroupIcon: new (function() {
this.defaults = {
alertSelect: "select#id_group",
alertSelect: "select#grupo",
spanPreview: "#group_preview",
debug: false
};
@ -315,25 +315,26 @@
$(this).change(function() {
var id_group = this.value;
let href = $("a", config.spanPreview).attr("href");
let hrefPosition = href.search("group_id=");
let hrefNew = href.slice(0, hrefPosition) + "group_id=" + id_group;
$(config.spanPreview).fadeOut("fast", function() {
$("img", config.spanPreview).remove();
jQuery.post(
"ajax.php",
{
page: "godmode/groups/group_list",
get_group_json: 1,
id_group: id_group
},
function(data) {
var img = $("<img />").attr("src", "images/" + data["icon"]);
$(config.spanPreview)
.append(img)
.fadeIn("fast");
},
"json"
);
});
jQuery.post(
"ajax.php",
{
page: "godmode/groups/group_list",
get_group_json: 1,
id_group: id_group
},
function(data) {
$("img", config.spanPreview).attr(
"src",
"images/" + data["icon"]
);
$("a", config.spanPreview).attr("href", hrefNew);
},
"json"
);
});
});
};

5
pandora_console/include/lib/ClusterViewer/ClusterWizard.php
View File

@ -1250,7 +1250,10 @@ class ClusterWizard extends \HTML
'name' => 'next',
'label' => $str,
'type' => 'submit',
'attributes' => 'class="sub next"',
'attributes' => [
'icon' => 'wand',
'mode' => 'primary',
],
'return' => true,
],
];

22
pandora_console/include/lib/Dashboard/Widgets/AvgSumMaxMinModule.php
View File

@ -316,8 +316,8 @@ class AvgSumMaxMinModule extends Widget
$values['unit'] = $decoder['unit'];
}
if (isset($decoder['layout']) === true) {
$values['layout'] = $decoder['layout'];
if (isset($decoder['horizontal']) === true) {
$values['horizontal'] = $decoder['horizontal'];
}
return $values;
@ -505,14 +505,14 @@ class AvgSumMaxMinModule extends Widget
],
];
// Layout.
// Horizontal.
$inputs[] = [
'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
'name' => 'layout',
'name' => 'horizontal',
'type' => 'switch',
'value' => $values['layout'],
'value' => $values['horizontal'],
'return' => true,
],
];
@ -541,7 +541,7 @@ class AvgSumMaxMinModule extends Widget
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['text_color'] = \get_parameter('text_color', 0);
$values['unit'] = \get_parameter_switch('unit');
$values['layout'] = \get_parameter_switch('layout');
$values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@ -643,8 +643,8 @@ class AvgSumMaxMinModule extends Widget
$output .= '<div class="container-center" id="container-'.$uuid.'">';
$orientation = '';
if ((int) $this->values['layout'] === 1) {
$orientation = 'flex';
if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
}
@ -653,7 +653,7 @@ class AvgSumMaxMinModule extends Widget
$output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
// Div value.
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="font-size:'.$sizeValue.'px;'.$text_color.'">';
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;'.$text_color.'">';
if (is_numeric($data) === true) {
$dataDatos = remove_right_zeros(
@ -679,7 +679,7 @@ class AvgSumMaxMinModule extends Widget
if (empty($label) === false) {
// Div Label.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="font-size:'.$sizeLabel.'px;'.$text_color.'">'.$label.'</div>';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;'.$text_color.'">'.$label.'</div>';
}
$output .= '</div>';

28
pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
View File

@ -179,7 +179,7 @@ class ModulesByStatus extends Widget
// This forces at least a first configuration.
// This forces at least a first configuration.
$this->configurationRequired = false;
if (empty($this->values['status']) === true) {
if (empty($this->values['status']) === true && $this->values['status'] !== '0') {
$this->configurationRequired = true;
}
@ -311,6 +311,8 @@ class ModulesByStatus extends Widget
$nodes_fields[$server['id']] = $server['server_name'];
}
$nodes_fields[0] = __('Metaconsola');
$nodes_selected = explode(',', $values['nodes']);
(isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : '';
@ -369,6 +371,8 @@ class ModulesByStatus extends Widget
{
$this->size = parent::getSize();
global $config;
$output = '';
if (is_metaconsole() === true) {
@ -413,7 +417,7 @@ class ModulesByStatus extends Widget
[
'id' => $tableId,
'class' => 'info_table align-left-important',
'style' => 'width: 100%',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $column_names,
'ajax_url' => 'include/ajax/module',
@ -430,6 +434,26 @@ class ModulesByStatus extends Widget
'direction' => 'desc',
],
'csv' => 0,
'pagination_options' => [
[
5,
10,
25,
100,
200,
500,
1000,
],
[
5,
10,
25,
100,
200,
500,
1000,
],
],
]
);
} catch (\Exception $e) {

11
pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
View File

@ -284,11 +284,16 @@ class AlertsFiredWidget extends Widget
if (isset($groups) === true && is_array($groups) === true) {
$table = new \StdClass();
$table->class = 'databox data';
$table->class = 'databox data centered';
$table->cellspacing = '0';
$table->width = '90%';
$table->width = '100%';
$table->data = [];
$table->size = [];
$table->style = [];
$table->style[0] = 'text-align: left;';
$table->style[1] = 'text-align: left;';
$table->style[2] = 'text-align: left;';
$table->style[3] = 'text-align: left;';
$url = $config['homeurl'];
$url .= 'index.php?sec=estado&sec2=operation/agentes/alerts_status';
@ -335,7 +340,7 @@ class AlertsFiredWidget extends Widget
if ($flag === true) {
$height = (count($table->data) * 30);
$style = 'min-width:300px; min-height:'.$height.'px;';
$output .= '<div class="container-center" style="'.$style.'">';
$output .= '<div class="" style="'.$style.'">';
$output .= html_print_table($table, true);
$output .= '</div>';
} else {

22
pandora_console/include/lib/Dashboard/Widgets/module_icon.php
View File

@ -305,8 +305,8 @@ class ModuleIconWidget extends Widget
$values['imageSrc'] = $decoder['imageSrc'];
}
if (isset($decoder['layout']) === true) {
$values['layout'] = $decoder['layout'];
if (isset($decoder['horizontal']) === true) {
$values['horizontal'] = $decoder['horizontal'];
}
return $values;
@ -486,14 +486,14 @@ class ModuleIconWidget extends Widget
],
];
// Layout.
// Horizontal.
$inputs[] = [
'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
'name' => 'layout',
'name' => 'horizontal',
'type' => 'switch',
'value' => $values['layout'],
'value' => $values['horizontal'],
'return' => true,
],
];
@ -520,7 +520,7 @@ class ModuleIconWidget extends Widget
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['sizeIcon'] = \get_parameter_switch('sizeIcon');
$values['layout'] = \get_parameter_switch('layout');
$values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@ -563,7 +563,7 @@ class ModuleIconWidget extends Widget
$output .= '<div class="container-center" id="container-'.$uuid.'">';
$orientation = '';
if ((int) $this->values['layout'] === 1) {
if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
@ -596,7 +596,7 @@ class ModuleIconWidget extends Widget
// Div image.
$style_icon = 'flex: 0 1 '.$sizeIcon.'px;';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 0 1 '.$sizeIcon.'px;">';
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_25px" style="flex: 0 1 '.$sizeIcon.'px; height: '.$sizeIcon.'px;">';
$output .= html_print_image(
'images/console/icons/'.$icon.$color_icon.'.png',
true,
@ -604,7 +604,7 @@ class ModuleIconWidget extends Widget
);
$output .= '</div>';
// Div value.
$output .= '<div class="mrgn_btn_15px" style="flex: 0 1 10px; font-size:'.$sizeValue.'px;">';
$output .= '<div class="mrgn_btn_15px" style="flex: 0 1 10px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
$output .= remove_right_zeros(
number_format($data_module, $config['graph_precision'], $config['decimal_separator'], $config['thousand_separator'])
).$unit;
@ -612,7 +612,7 @@ class ModuleIconWidget extends Widget
if (empty($label) === false) {
// Div Label.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
}
$output .= '</div>';

20
pandora_console/include/lib/Dashboard/Widgets/module_status.php
View File

@ -300,8 +300,8 @@ class ModuleStatusWidget extends Widget
$values['imageSrc'] = $decoder['imageSrc'];
}
if (isset($decoder['layout']) === true) {
$values['layout'] = $decoder['layout'];
if (isset($decoder['horizontal']) === true) {
$values['horizontal'] = $decoder['horizontal'];
}
return $values;
@ -465,14 +465,14 @@ class ModuleStatusWidget extends Widget
],
];
// Layout.
// Horizontal.
$inputs[] = [
'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
'name' => 'layout',
'name' => 'horizontal',
'type' => 'switch',
'value' => $values['layout'],
'value' => $values['horizontal'],
'return' => true,
],
];
@ -499,7 +499,7 @@ class ModuleStatusWidget extends Widget
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['sizeIcon'] = \get_parameter_switch('sizeIcon');
$values['layout'] = \get_parameter_switch('layout');
$values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@ -560,7 +560,7 @@ class ModuleStatusWidget extends Widget
$output .= '<div class="container-center" id="container-'.$uuid.'">';
$orientation = '';
if ((int) $this->values['layout'] === 1) {
if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
@ -570,7 +570,7 @@ class ModuleStatusWidget extends Widget
$output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
// Div image.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 0 1 '.$sizeIcon.'px;">';
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_25px" style="flex: 0 1 '.$sizeIcon.'px; height: '.$sizeIcon.'px;">';
$output .= html_print_image(
'images/console/icons/'.$icon,
true,
@ -580,7 +580,7 @@ class ModuleStatusWidget extends Widget
if (empty($label) === false) {
// Div Label.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
}
$output .= '</div>';

22
pandora_console/include/lib/Dashboard/Widgets/module_value.php
View File

@ -284,8 +284,8 @@ class ModuleValueWidget extends Widget
$values['sizeLabel'] = $decoder['sizeLabel'];
}
if (isset($decoder['layout']) === true) {
$values['layout'] = $decoder['layout'];
if (isset($decoder['horizontal']) === true) {
$values['horizontal'] = $decoder['horizontal'];
}
return $values;
@ -389,14 +389,14 @@ class ModuleValueWidget extends Widget
],
];
// Layout.
// Horizontal.
$inputs[] = [
'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
'name' => 'layout',
'name' => 'horizontal',
'type' => 'switch',
'value' => $values['layout'],
'value' => $values['horizontal'],
'return' => true,
],
];
@ -421,7 +421,7 @@ class ModuleValueWidget extends Widget
$values['moduleId'] = \get_parameter('moduleId', 0);
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['layout'] = \get_parameter_switch('layout');
$values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@ -471,8 +471,8 @@ class ModuleValueWidget extends Widget
$output .= '<div class="container-center" id="container-'.$uuid.'">';
$orientation = '';
if ((int) $this->values['layout'] === 1) {
$orientation = 'flex';
if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
}
@ -481,7 +481,7 @@ class ModuleValueWidget extends Widget
$output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
// Div value.
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px; color: '.$color.'">';
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px; color: '.$color.'">';
if (is_numeric($data_module) === true) {
$dataDatos = remove_right_zeros(
@ -502,7 +502,7 @@ class ModuleValueWidget extends Widget
if (empty($label) === false) {
// Div Label.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1 '.$sizeLabel.'px; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px;">'.$label.'</div>';
}
$output .= '</div>';

10
pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
View File

@ -300,18 +300,20 @@ class OsQuickReportWidget extends Widget
$table->style[1] = 'background-color: '.$values['background'].';';
$table->style[2] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
$table->style[3] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
$table->style[4] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
$table->style[5] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
$table->style[4] = 'background-color: '.$values['background'].';';
$table->style[5] = 'background-color: '.$values['background'].';';
foreach ($result as $id => $os) {
$data = [];
($os['critical'] > 0) ? $color_critical = 'color: '.COL_CRITICAL.';' : $color_critical = '';
($os['unknown'] > 0) ? $color_unknown = 'color: '.COL_UNKNOWN.';' : $color_unknown = '';
$data[0] = ui_print_os_icon($id, false, true);
$data[1] = $os['name'];
$data[2] = $os['total'];
$data[3] = $os['normal'];
$data[4] = $os['critical'];
$data[5] = $os['unknown'];
$data[4] = '<span class="widget-module-tabs-data" style="'.$color_critical.'">'.$os['critical'].'</span>';
$data[5] = '<span class="widget-module-tabs-data" style="'.$color_unknown.'">'.$os['unknown'].'</span>';
$table->data[] = $data;
}

22
pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
View File

@ -289,8 +289,8 @@ class SLAPercentWidget extends Widget
$values['period'] = $decoder['period'];
}
if (isset($decoder['layout']) === true) {
$values['layout'] = $decoder['layout'];
if (isset($decoder['horizontal']) === true) {
$values['horizontal'] = $decoder['horizontal'];
}
return $values;
@ -408,14 +408,14 @@ class SLAPercentWidget extends Widget
],
];
// Layout.
// Horizontal.
$inputs[] = [
'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
'name' => 'layout',
'name' => 'horizontal',
'type' => 'switch',
'value' => $values['layout'],
'value' => $values['horizontal'],
'return' => true,
],
];
@ -441,7 +441,7 @@ class SLAPercentWidget extends Widget
$values['period'] = \get_parameter('period', 0);
$values['sizeValue'] = \get_parameter('sizeValue', '');
$values['sizeLabel'] = \get_parameter('sizeLabel', '');
$values['layout'] = \get_parameter_switch('layout');
$values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@ -516,8 +516,8 @@ class SLAPercentWidget extends Widget
$output .= '<div class="container-center" id="container-'.$uuid.'">';
$orientation = '';
if ((int) $this->values['layout'] === 1) {
$orientation = 'flex';
if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
}
@ -525,13 +525,13 @@ class SLAPercentWidget extends Widget
// General div.
$output .= '<div class="'.$orientation.'" id="general-'.$uuid.'">';
// Div value.
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
$output .= '<div class="pdd_l_15px pdd_r_15px mrgn_btn_20px" style="flex: 0 1 '.$sizeValue.'px; line-height: '.$sizeValue.'px; font-size:'.$sizeValue.'px;">';
$output .= $sla_array['sla_fixed'].'%';
$output .= '</div>';
if (empty($label) === false) {
// Div Label.
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1; font-size:'.$sizeLabel.'px; text-align: left;">'.$label.'</div>';
$output .= '<div class="pdd_l_15px pdd_r_15px" style="flex: 1 1; line-height: '.$sizeLabel.'px; font-size:'.$sizeLabel.'px; text-align: left;">'.$label.'</div>';
}
$output .= '</div>';

8
pandora_console/include/styles/dashboards.css
View File

@ -843,3 +843,11 @@ div.widget-mrgn-0px > div.parent_graph {
div.widget-mrgn-0px > div.parent_graph > div[id^="graph_"] {
width: calc(100% + 14px) !important;
}
div.content-widget
> div.container-center
> div.centered.w90p
> div#container_show_stats
> canvas {
height: 310px;
}

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

@ -30,6 +30,7 @@
:root {
--primary-color: #14524f;
--secondary-color: #ffffff;
--input-border: #c0ccdc;
}
/*
@ -5822,7 +5823,7 @@ div.label_select_child_left > span {
width: 100%;
display: flex;
overflow: hidden;
height: 42px;
height: 48px;
}
.switch_radio_button input {
@ -5834,26 +5835,25 @@ div.label_select_child_left > span {
overflow: hidden;
}
div.switch_radio_button label {
background-color: #fff;
div.switch_radio_button > label {
background-color: var(--secondary-color);
color: rgba(0, 0, 0, 0.6);
line-height: 6px !important;
text-align: center;
padding: 14px 10px;
margin-right: -1px;
border: 1px solid #cbcbcb;
text-align: center !important;
padding: 8px 10px;
margin-right: -2px;
border: 2px solid var(--input-border);
transition: all 0.1s ease-in-out;
background: transparent;
}
div.switch_radio_button label:first-of-type {
border-top-left-radius: 4px !important;
border-bottom-left-radius: 4px !important;
border-top-left-radius: 6px !important;
border-bottom-left-radius: 6px !important;
}
div.switch_radio_button label:last-of-type {
border-top-right-radius: 4px !important;
border-bottom-right-radius: 4px !important;
border-top-right-radius: 6px !important;
border-bottom-right-radius: 6px !important;
margin-right: 0px;
}
@ -5863,9 +5863,9 @@ div.switch_radio_button label:last-of-type {
.switch_radio_button input:checked + label,
.switch_radio_button input:checked:has(.custom_checkbox) {
background-color: #1d7873;
background-color: var(--primary-color);
box-shadow: none;
color: #fff !important;
color: var(--secondary-color) !important;
}
/*
@ -8144,7 +8144,7 @@ div.graph div.legend table {
overflow: hidden;
background-color: var(--secondary-color);
min-height: calc(100vh - 200px);
border: 1px solid #cacaca;
/* border: 1px solid #cacaca; */
}
/*
@ -10465,6 +10465,10 @@ button div.upd {
-webkit-mask: url(../../images/validate.svg) no-repeat center / contain;
}
button div.mail {
mask: url(../../images/mail@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/mail@svg.svg) no-repeat center / contain;
}
button div.sound {
mask: url(../../images/sound_console@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/sound_console@svg.svg) no-repeat center /
@ -11256,6 +11260,15 @@ input.main_menu_icon[src$=".svg"] {
.main_menu_icon.arrow_down {
transform: rotate(270deg);
}
.main_menu_icon.arrow_left {
transform: rotate(0deg);
}
.main_menu_icon.arrow_right {
transform: rotate(180deg);
}
.after_input_icon {
width: 32px;
margin-left: 10px;
@ -11517,6 +11530,12 @@ div[role="dialog"] {
margin: 0 auto;
}
.policy_background_state {
mask: url(../../images/policy@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/policy@svg.svg) no-repeat center / contain;
margin: 0 auto;
}
.filter-list-adv .wizard li {
display: grid;
}
@ -11668,3 +11687,11 @@ div.ui-dialog-buttonset > button.ui-button.ui-corner-all.ui-widget:active {
div#menu_full > div#menu_tabs > ul.tabs_ul {
margin-bottom: 0px;
}
.filter-adapted-table-adv {
}
.filter-adapted-table-adv tr {
display: flex;
flex-direction: column;
}

8
pandora_console/include/styles/pandoraPDF.css
View File

@ -28,6 +28,10 @@
* ============================================================================
*/
body {
background-color: white !important;
}
table.header_table {
width: 100%;
}
@ -211,3 +215,7 @@ table tbody td.cellBorder1 {
table tbody td.cellBig {
font-size: 18px;
}
table.info_table > tbody > tr:nth-child(even) {
background-color: #e5e9ed !important;
}

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

@ -575,6 +575,10 @@ table.filter-table-adv td input[type="radio"] {
height: 20px;
}
table.filter-table-adv div.select-with-sibling {
display: flex;
align-items: center;
}
table.databox.filter-table-adv {
padding: 10px;
}
@ -806,3 +810,7 @@ div[id^="auto-os-"] > img {
.dataTables_paginate.paging_simple_numbers {
margin-right: 0;
}
.w22px {
width: 22px;
}

3
pandora_console/include/styles/tactical_groups.css
View File

@ -29,3 +29,6 @@ rect {
.graph-distribution-so {
margin-top: 55px;
}
#list_agents_tactical_wrapper .dataTables_length {
margin-bottom: 10px;
}

9
pandora_console/include/styles/tips_window.css
View File

@ -12,7 +12,7 @@
padding: 0px;
}
.window {
background-image: linear-gradient(180deg, #fffce8 0%, #ffffff 100%);
background-image: white;
width: 640px;
width: 100%;
border-radius: 5px;
@ -145,9 +145,6 @@
color: #14524f;
font-weight: 600;
}
#url_tip .arrow_tips {
font-size: 20px;
}
span.count-round-tip {
width: 6px !important;
height: 6px !important;
@ -211,3 +208,7 @@ span.disable {
.buttons_actions input {
width: 32px;
}
.hide-button {
opacity: 0;
pointer-events: none;
}

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

@ -497,9 +497,9 @@ if ($agent_view_page === true) {
!$alerts_defined,
false,
true,
'box-flat agent_details_col',
'white-box-content',
'width_available'
'',
'',
'box-flat white_table_graph w100p'
),
],
);

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

@ -710,7 +710,7 @@ if ((bool) $config['agentaccess'] === true && $access_agent > 0) {
$agentAccessRate = html_print_div(
[
'class' => 'box-flat agent_details_col mrgn_lft_20px',
'class' => 'box-flat agent_details_col mrgn_lft_20px w50p',
'id' => 'table_access_rate',
'content' => $agentAccessRateHeader.$agentAccessRateContent,
],
@ -1038,7 +1038,7 @@ $agentEventsGraph = html_print_div(
$agentEvents = html_print_div(
[
'class' => 'box-flat agent_details_col',
'class' => 'box-flat agent_details_col w50p',
'content' => $agentEventsHeader.$agentEventsGraph,
],
true

142
pandora_console/operation/agentes/estado_monitores.php
View File

@ -187,7 +187,7 @@ html_print_div(
'class' => 'agent_details_line',
'content' => ui_toggle(
$html_toggle,
'<span class="subsection_header_title">'.__('List of modules').'</span>'.$help_not_init.ui_print_help_tip(
__('List of modules').' '.$help_not_init.ui_print_help_tip(
__('To see the list of modules paginated, enable this option in the Styles Configuration.'),
true
).reporting_tiny_stats(
@ -201,9 +201,9 @@ html_print_div(
false,
false,
true,
'box-flat agent_details_col',
'',
'white-box-content',
'width_available'
'box-flat white_table_graph w100p'
),
],
);
@ -543,58 +543,83 @@ function print_form_filter_monitors(
$form_text = '';
$table = new stdClass();
$table->class = 'filter-table-adv';
$table->id = 'module_filter_agent_view';
$table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
// $table->id = 'module_filter_agent_view';
// $table->styleTable = 'border-radius: 0;padding: 0;margin: 0 0 10px;';
$table->width = '100%';
$table->cellstyle[0][0] = 'width: 0';
$table->cellstyle[0][1] = 'width: 0';
$table->cellstyle[0][2] = 'width: 0';
$table->size[0] = '25%';
$table->size[1] = '25%';
$table->size[2] = '25%';
$table->size[3] = '25%';
// Captions.
$table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true);
$table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true);
$table->data[0][0] .= __('Status:');
$table->data[0][1] = __('Free text for search (*):').ui_print_help_tip(
__('Search by module name, list matches.'),
true
$table->data[0][0] = html_print_label_input_block(
html_print_input_hidden('filter_monitors', 1, true).html_print_input_hidden(
'monitors_change_filter',
1,
true
).__('Status:'),
html_print_select(
$status_list,
'status_filter_monitor',
$status_filter_monitor,
'',
'',
0,
true,
false,
true,
'w100p',
false,
'width:100%'
)
);
$table->data[0][2] = __('Module group');
$table->data[0][3] = __('Show in hierachy mode');
// Inputs.
$table->data[1][0] = html_print_select(
$status_list,
'status_filter_monitor',
$status_filter_monitor,
'',
'',
0,
true
$table->data[0][1] = html_print_label_input_block(
__('Free text for search (*):').ui_print_help_tip(
__('Search by module name, list matches.'),
true
),
html_print_input_text(
'status_text_monitor',
$status_text_monitor,
'',
'',
100,
true
)
);
$table->data[1][1] = html_print_input_text(
'status_text_monitor',
$status_text_monitor,
'',
'',
100,
true
$table->data[0][2] = html_print_label_input_block(
__('Module group'),
html_print_select(
$rows_select,
'status_module_group',
$status_module_group,
'',
'',
0,
true,
false,
true,
'w100p',
false,
'width:100%'
)
);
$table->data[1][2] = html_print_select(
$rows_select,
'status_module_group',
$status_module_group,
'',
'',
0,
true
);
$table->data[1][3] = html_print_switch(
[
'name' => 'status_hierachy_mode',
'value' => $all_events_24h,
'onchange' => 'change_module_filter()',
'id' => 'checkbox-status_hierachy_mode',
]
$table->data[0][3] = html_print_label_input_block(
__('Show in hierachy mode'),
html_print_switch(
[
'name' => 'status_hierachy_mode',
'value' => $all_events_24h,
'onchange' => 'change_module_filter()',
'id' => 'checkbox-status_hierachy_mode',
]
)
);
$form_text = html_print_table($table, true);
$filtersButtons = [];
$filtersButtons[] = html_print_button(
@ -603,8 +628,9 @@ function print_form_filter_monitors(
false,
'filter_modules();',
[
'icon' => 'search',
'mode' => 'secondary mini',
'icon' => 'search',
'mode' => 'secondary mini',
'style' => 'margin-left: 15px',
],
true
);
@ -621,16 +647,6 @@ function print_form_filter_monitors(
true
);
$table->data[1][4] = html_print_div(
[
'class' => 'action-buttons',
'content' => implode('', $filtersButtons),
],
true
);
$form_text .= html_print_table($table, true);
// TODO. Unused code.
if ($status_filter_monitor === -1 && empty($status_text_monitor) === true && $status_module_group === -1) {
$filter_hidden = true;
@ -639,4 +655,10 @@ function print_form_filter_monitors(
}
echo $form_text;
html_print_div(
[
'class' => 'action-buttons-right-forced',
'content' => implode('', $filtersButtons),
]
);
}

2
pandora_console/operation/agentes/group_view.php
View File

@ -321,7 +321,7 @@ if (empty($result_groups) === false) {
$link = "<a href='index.php?sec=monitoring&sec2=operation/tree&tag_id=".$data['_id_']."'>";
} else {
$deep = groups_get_group_deep($data['_id_']);
$link = "<a href='index.php?sec=view&sec2=operation/agentes/estado_agente&group_id=".$data['_id_']."'>";
$link = "<a href='index.php?sec=view&sec2=godmode/groups/tactical&id_group=".$data['_id_']."'>";
}
$group_name = '<b><span>'.ui_print_truncate_text($data['_name_'], 50).'</span></b>';

38
pandora_console/operation/agentes/interface_view.functions.php
View File

@ -146,35 +146,35 @@ function print_filters($sec)
$filters .= '</form>';
} else {
$table->style[0] = 'font-weight: bold;';
$table->data[0][0] = '<b>'.__('Interfaces').'</b>';
$table->data[0][1] = html_print_select(
[],
'selected_interfaces[]',
'',
'',
'',
0,
true,
true,
true,
'',
false,
'min-width: 180px; max-width: 200px;'
$table->data[0][0] = html_print_label_input_block(
__('Interfaces'),
html_print_select(
[],
'selected_interfaces[]',
'',
'',
'',
0,
true,
true,
true,
'',
false,
'min-width: 200px; max-width: 250px; min-height: 70px;'
)
);
$filters = '<form method="post" action="'.ui_get_url_refresh().'">';
$filters .= html_print_table($table, true);
$filters .= "<div class='height_100p right'>".html_print_submit_button(
$filters .= html_print_submit_button(
__('Show'),
'uptbutton',
false,
'class="sub search mgn_tp_0"',
['class' => 'float-right mini'],
true
).'</div>';
);
$filters .= '</form>';
}

25
pandora_console/operation/agentes/log_sources_status.php
View File

@ -94,6 +94,19 @@ if (!empty($table->data)) {
echo '<div id="log_sources_status" class="w100p">';
html_print_table($table);
echo '</div>';
$html_content = ob_get_clean();
// Create controlled toggle content.
ui_toggle(
$html_content,
__('Log sources status'),
'log_sources_status',
!$log_sources_defined,
false,
'',
'white_table_graph_content no-padding-imp',
'white-box-content',
'box-flat white_thable_graph mrgn_top_30px'
);
} else {
ui_print_info_message(['no_close' => true, 'message' => __('No log sources found') ]);
$log_sources_defined = false;
@ -109,18 +122,6 @@ html_print_input_hidden('redirect_search', 1, false);
echo '</form>';
$html_content = ob_get_clean();
// Create controlled toggle content.
ui_toggle(
$html_content,
__('Log sources status'),
'log_sources_status',
!$log_sources_defined,
false,
'',
'white_table_graph_content no-padding-imp'
);
?>

6
pandora_console/operation/agentes/status_events.php
View File

@ -32,9 +32,9 @@ html_print_div(
'latest_events_agent',
false,
true,
'box-flat agent_details_col',
'white-box-content',
'width_available'
'',
'box-flat white-box-content no_border',
'box-flat white_table_graph w100p'
),
],
);

13
pandora_console/operation/agentes/status_monitor.php
View File

@ -152,6 +152,13 @@ if ($ag_freestring !== '' || $moduletype !== '' || $datatype !== ''
$autosearch = true;
}
// The execution has not been done manually.
$userRequest = (bool) get_parameter('uptbutton');
if ($userRequest === false) {
$autosearch = true;
$status = AGENT_MODULE_STATUS_NOT_NORMAL;
}
if (is_metaconsole() === false) {
$ag_group = (int) get_parameter('ag_group', 0);
} else {
@ -2270,11 +2277,7 @@ if (empty($result) === false) {
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
}
} else {
if ($first_interaction) {
ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]);
} else {
ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]);
}
ui_print_info_message(['no_close' => true, 'message' => __('Sorry no search parameters')]);
}
if (is_metaconsole() !== true) {

6
pandora_console/operation/agentes/ver_agente.php
View File

@ -1940,6 +1940,12 @@ if ((bool) $config['pure'] === false) {
'link' => '',
'label' => $tab_name,
],
],
[
'id_element' => $id_agente,
'url' => 'operation/agentes/ver_agente&id_agente='.$id_agente,
'label' => agents_get_alias($id_agente),
'section' => 'Agents',
]
);
}

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

@ -127,3 +127,33 @@ if (empty($form) === false) {
// Print always go back button.
HTML::printForm($wizard->getGoBackForm(), false);
html_print_action_buttons(
'',
[]
);
?>
<script type="text/javascript">
$(document).ready(function() {
var buttonnext = $('#button-next').parent().html();
$('#button-next').hide();
var buttonnext = buttonnext.replace('button-next','button-next_copy');
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 style = $('#principal_action_buttons').attr('style');
$('#principal_action_buttons').attr('style',style+' justify-content: unset;');
// Button next/finish on action buttons.
$('#button-next_copy').click(function(){
$('#button-next').trigger('click');
});
// Button back on action buttons.
$('#button-submit_copy').click(function(){
$('#button-submit').trigger('click');
});
});
</script>

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

@ -50,7 +50,7 @@ try {
'known_status',
[
'text' => 'options',
'class' => 'action_buttons',
'class' => 'table_action_buttons',
],
];
@ -102,6 +102,7 @@ try {
],
],
],
'filter_main_class' => 'box-flat white_table_graph fixed_filter_bar',
]
);
} catch (Exception $e) {
@ -109,24 +110,20 @@ try {
}
if (check_acl($config['id_user'], 0, 'AW')) {
HTML::printForm(
$buttons[] = html_print_submit_button(
__('New cluster'),
'submit',
false,
[
'form' => [
'method' => 'POST',
'action' => ui_get_full_url($model->url.'&op=new'),
],
'inputs' => [
[
'class' => 'w100p',
'arguments' => [
'name' => 'submit',
'label' => __('New cluster'),
'type' => 'submit',
'attributes' => 'class="sub next"',
'return' => true,
],
],
],
]
'class' => 'sub ok',
'icon' => 'next',
],
true
);
echo '<form action="'.ui_get_full_url($model->url.'&op=new').'" method="POST">';
html_print_action_buttons(
implode('', $buttons),
['type' => 'form_action']
);
echo '</form>';
}

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

@ -358,17 +358,13 @@ $map_manager = new NetworkMap(
*
*/
$table_events = '<div class="white_table_graph" id="table_events">';
$table_events .= '<div class="white_table_graph_header">';
$table_events .= html_print_image(
'images/arrow_down_green.png',
true
);
$table_events .= '<span>';
$table_events = '<div class="white_table_graph" id="table_events" style="width:100%">';
$table_events .= '<div class="agent_details_header">';
$table_events .= '<b><span style="font-size: medium;font-weight:bold">';
$table_events .= __('Events (Last 24h)');
$table_events .= '</span>';
$table_events .= '</span></b>';
$table_events .= '</div>';
$table_events .= '<div class="white_table_graph_content white-table-graph-content">';
$table_events .= '<div class="white-table-graph-content">';
$table_events .= graph_graphic_agentevents(
$cluster->agent()->id_agente(),
95,
@ -384,29 +380,34 @@ $table_events .= '</div>';
?>
<div id="agent_details_first_row" class="w100p cluster-agent-data">
<div class="box-flat agent_details_col agent_details_col_left">
<div class="agent_details_header">
<?php echo $table_agent_header; ?>
</div>
<div class="agent_details_content">
<div class="agent_details_graph">
<?php echo $table_agent_graph; ?>
<div class="agent_details_bullets">
<?php echo $table_agent_count_modules; ?>
<div class="flex">
<div class="box-flat agent_details_col agent_details_col_left" style="width:50%">
<div class="agent_details_header">
<?php echo $table_agent_header; ?>
</div>
<div class="agent_details_content">
<div class="agent_details_graph">
<?php echo $table_agent_graph; ?>
<div class="agent_details_bullets">
<?php echo $table_agent_count_modules; ?>
</div>
</div>
<div class="agent_details_info">
<?php
echo $alive_animation;
echo $table_agent_os;
echo $table_agent_ip;
echo $table_agent_version;
echo $table_agent_description;
?>
</div>
</div>
<div class="agent_details_info">
<?php
echo $alive_animation;
echo $table_agent_os;
echo $table_agent_ip;
echo $table_agent_version;
echo $table_agent_description;
?>
</div>
</div>
<div class="box-flat agent_details_col" style="width:50%">
<?php echo $table_events; ?>
</div>
</div>
<div class="box-flat agent_details_col agent_details_col_right">
<div class="cluster-map">
<?php $map_manager->printMap(); ?>
@ -414,10 +415,6 @@ $table_events .= '</div>';
</div>
</div>
<div class="w100p cluster-events-graph">
<?php echo $table_events; ?>
</div>
<div id='cluster-modules' class="w100p modules">
<?php
$id_agente = $cluster->agent()->id_agente();
@ -427,28 +424,22 @@ require_once $config['homedir'].'/operation/agentes/estado_monitores.php';
<?php
HTML::printForm(
$buttons[] = html_print_submit_button(
__('Reload'),
'submit',
false,
[
'form' => [
'action' => $model->url.'&op=view&id='.$cluster->id(),
'method' => 'POST',
],
'inputs' => [
[
'arguments' => [
'name' => 'submit',
'label' => __('Reload'),
'type' => 'submit',
'attributes' => 'class="sub cancel"',
'return' => true,
],
],
],
'class' => 'sub ok',
'icon' => 'next',
],
false
true
);
echo '<br/>';
echo '<form action="'.$model->url.'&op=view&id='.$cluster->id().'" method="POST">';
html_print_action_buttons(
implode('', $buttons),
['type' => 'form_action']
);
echo '</form>';
// Print always go back button.
HTML::printForm($model->getGoBackForm(), false);

7
pandora_console/views/dashboard/tipsWindow.php
View File

@ -73,10 +73,13 @@ $output .= '<p id="text_tip">';
$output .= $text;
$output .= '</p>';
$link_class = 'invisible';
if (empty($url) === false && $url !== '') {
$output .= '<a href="'.$url.'" target="_blank" id="url_tip">'.__('See more info').'<span class="arrow_tips">→</span></a>';
$link_class = '';
}
$output .= '<a href="'.$url.'" class="'.$link_class.'" target="_blank" id="url_tip">'.__('See more info').'</a>';
$output .= '</div>';
$output .= '<div class="ui-dialog-buttonset">';
@ -116,7 +119,7 @@ if ($preview === true) {
'',
[
'onclick' => 'next_tip()',
'class' => 'mini',
'class' => ($totalTips === '1') ? 'mini hide-button' : 'mini',
],
true
);