From d68daca985cd5ed8d393bb9e82ba8285e95fe7be Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Tue, 19 Dec 2023 16:50:36 +0100
Subject: [PATCH] #11900 counter items
---
.../godmode/alerts/alert_actions.php | 7 ++++++-
.../godmode/alerts/alert_commands.php | 7 ++++++-
.../godmode/alerts/alert_templates.php | 7 ++++++-
.../godmode/reporting/reporting_builder.php | 6 +++++-
pandora_console/godmode/users/user_list.php | 7 ++++++-
.../operation/agentes/status_monitor.php | 19 ++++++++++++++++---
6 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index e8915b05eb..7ba527b61e 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -497,7 +497,12 @@ foreach ($actions as $action) {
$pagination = '';
if (isset($data)) {
html_print_table($table);
- $pagination = ui_pagination($total_actions, $url, 0, 0, true, 'offset', false, '');
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
+
+ $pagination = ui_pagination($total_actions, $url, 0, 0, true, 'offset', $show_count, '');
} else {
ui_print_info_message(['no_close' => true, 'message' => __('No alert actions configured') ]);
}
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index a59de7f5e2..a5b4de7c80 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -1080,7 +1080,12 @@ foreach ($commands as $command) {
if (isset($data) === true && count($table->data) > 0) {
html_print_table($table);
- $pagination = ui_pagination($total_commands, $url, 0, 0, true, 'offset', false, '');
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
+
+ $pagination = ui_pagination($total_commands, $url, 0, 0, true, 'offset', $show_count, '');
} else {
ui_print_info_message(
[
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 8236d1e69c..537c346bac 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -493,6 +493,11 @@ foreach ($templates as $template) {
$pagination = '';
if (isset($data) === true) {
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
+
html_print_table($table);
$pagination = ui_pagination(
$total_templates,
@@ -501,7 +506,7 @@ if (isset($data) === true) {
0,
true,
'offset',
- false,
+ $show_count,
''
);
} else {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 842e05147d..8ad15c98f8 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1259,6 +1259,10 @@ switch ($action) {
$reports_table .= html_print_table($table, true);
$reports_table .= '<br></div>';
echo $reports_table;
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
$tablePagination = ui_pagination(
$total_reports,
@@ -1267,7 +1271,7 @@ switch ($action) {
$pagination,
true,
'offset',
- false
+ $show_count
);
} else {
ui_print_info_message(
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index d488b4faad..99c96fdf6d 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -1023,8 +1023,13 @@ foreach ($info as $user_id => $user_info) {
array_push($table->data, $data);
}
+$show_count = false;
+if (is_metaconsole() === true) {
+ $show_count = true;
+}
+
html_print_table($table);
-$tablePagination = ui_pagination(count($info), false, 0, 0, true, 'offset', false, 'dataTables_paginate paging_simple_numbers');
+$tablePagination = ui_pagination(count($info), false, 0, 0, true, 'offset', $show_count, 'dataTables_paginate paging_simple_numbers');
unset($table);
if ($is_management_allowed === true) {
if ($config['admin_can_add_user'] !== false) {
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 4ceb7681fe..23a8beae23 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1455,7 +1455,12 @@ if ($autosearch) {
}
if ($count_modules > $config['block_size']) {
- $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
+
+ $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
}
// Get number of elements of the pagination.
@@ -2351,11 +2356,19 @@ if (empty($result) === false) {
array_push($table->data, $data);
}
- echo '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
+ if (!defined('METACONSOLE')) {
+ echo '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
+ }
+
html_print_table($table);
if ($count_modules > $config['block_size']) {
- $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
+ $show_count = false;
+ if (is_metaconsole() === true) {
+ $show_count = true;
+ }
+
+ $tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
}
} else {
ui_print_info_message(['no_close' => true, 'message' => __('Please apply a filter to display the data')]);