From eed7ff8aba616d89f7e0067e0d0169a15b0dd2b3 Mon Sep 17 00:00:00 2001
From: miguel angel rasteu <miguelangel.rasteu@pandorafms.com>
Date: Tue, 19 Sep 2023 16:18:58 +0200
Subject: [PATCH 01/10] #11436 Fix notif access stastics performance

---
 pandora_console/include/class/ConsoleSupervisor.php | 4 +++-
 pandora_console/include/styles/tables.css           | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index a434a30e7f..f6acd528e5 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -716,7 +716,7 @@ class ConsoleSupervisor
 
         $total_agents = db_get_value('count(*)', 'tagente');
 
-        if ($total_agents >= 200) {
+        if ($total_agents >= 1) {
             if ((int) $config['agentaccess'] !== 0) {
                 db_process_sql_update('tconfig', ['value' => 0], ['token' => 'agentaccess']);
                 $this->notify(
@@ -729,6 +729,8 @@ class ConsoleSupervisor
                         'url'     => '__url__/index.php?sec=general&sec2=godmode/setup/setup&section=perf',
                     ]
                 );
+            } else {
+                $this->cleanNotifications('NOTIF.ACCESSSTASTICS.PERFORMANCE');
             }
         } else {
             $this->cleanNotifications('NOTIF.ACCESSSTASTICS.PERFORMANCE');
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 7d93624dbb..dde75e8627 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -233,6 +233,10 @@
   vertical-align: middle;
 }
 
+#audit_logs > tbody > tr > td > img {
+  padding-right: 10px;
+}
+
 .table_action_buttons > a,
 .table_action_buttons > img,
 .table_action_buttons > button,

From 746b9e48d032bd2e5f5cdaa6ab1af826188acb47 Mon Sep 17 00:00:00 2001
From: miguel angel rasteu <miguelangel.rasteu@pandorafms.com>
Date: Tue, 19 Sep 2023 17:50:04 +0200
Subject: [PATCH 02/10] #11436 Fix total agents

---
 pandora_console/include/class/ConsoleSupervisor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php
index f6acd528e5..0c0de4a09a 100644
--- a/pandora_console/include/class/ConsoleSupervisor.php
+++ b/pandora_console/include/class/ConsoleSupervisor.php
@@ -716,7 +716,7 @@ class ConsoleSupervisor
 
         $total_agents = db_get_value('count(*)', 'tagente');
 
-        if ($total_agents >= 1) {
+        if ($total_agents >= 200) {
             if ((int) $config['agentaccess'] !== 0) {
                 db_process_sql_update('tconfig', ['value' => 0], ['token' => 'agentaccess']);
                 $this->notify(

From 2e6354655094c7a2d8cfeeb28b1c6cf7fb9139eb Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 25 Sep 2023 11:29:38 +0200
Subject: [PATCH 03/10] add new type search status events not in process
 pandora_enterprise#11760

---
 pandora_console/include/constants.php         |  1 +
 pandora_console/include/functions_events.php  | 23 +++++++++++++++++++
 .../lib/Dashboard/Widgets/events_list.php     |  1 +
 pandora_console/operation/events/events.php   |  4 ++++
 4 files changed, 29 insertions(+)

diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index 889e32f693..c9644eafcb 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -45,6 +45,7 @@ define('EVENT_NEW', 0);
 define('EVENT_VALIDATE', 1);
 define('EVENT_PROCESS', 2);
 define('EVENT_NO_VALIDATED', 3);
+define('EVENT_NO_PROCESS', 4);
 
 // Events group by constants.
 define('EVENT_GROUP_REP_ALL', 0);
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 7068d554e6..87c945ffe0 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -982,6 +982,9 @@ function events_get_all(
 
                     case EVENT_NO_VALIDATED:
                         $filter['status'][$key] = (EVENT_NEW.', '.EVENT_PROCESS);
+
+                    case EVENT_NO_PROCESS:
+                            $filter['status'][$key] = (EVENT_NEW.', '.EVENT_VALIDATE);
                     default:
                         // Ignore.
                     break;
@@ -1027,6 +1030,24 @@ function events_get_all(
                         $validatedState
                     );
                 break;
+
+                case EVENT_NO_PROCESS:
+                    // Show comments in validated events.
+                    $validatedState = '';
+                    if ($validatedEvents === true) {
+                        $validatedState = sprintf(
+                            'OR estado = %d',
+                            EVENT_VALIDATE
+                        );
+                    }
+
+                    $sql_filters[] = sprintf(
+                        ' AND (estado = %d OR estado = %d %s)',
+                        EVENT_NEW,
+                        EVENT_VALIDATE,
+                        $validatedState
+                    );
+                break;
             }
         }
     }
@@ -3211,12 +3232,14 @@ function events_get_all_status($report=false)
         $fields[1]  = __('Only validated');
         $fields[2]  = __('Only in process');
         $fields[3]  = __('Only not validated');
+        $fields[4]  = __('Only not in process');
     } else {
         $fields[-1] = __('All event');
         $fields[0]  = __('New');
         $fields[1]  = __('Validated');
         $fields[2]  = __('In process');
         $fields[3]  = __('Not Validated');
+        $fields[4]  = __('Not in process');
     }
 
     return $fields;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index b7ad581dc0..7e050d3ee8 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -396,6 +396,7 @@ class EventsListWidget extends Widget
             0  => \__('Only pending'),
             2  => \__('Only in process'),
             3  => \__('Only not validated'),
+            4  => \__('Only not process'),
         ];
 
         $inputs['inputs']['row1'][] = [
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 059c8f90ec..f3fefbddf4 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -2650,6 +2650,10 @@ try {
         case EVENT_NO_VALIDATED:
             $active_filters_div .= __('Not validated.');
         break;
+
+        case EVENT_NO_PROCESS:
+            $active_filters_div .= __('Not in process.');
+        break;
     }
 
     $active_filters_div .= '</div>';

From c20ca271ba430de34e7917fdbfd870a4afaf8b4a Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Fri, 6 Oct 2023 13:05:42 +0200
Subject: [PATCH 04/10] fix translate pandora_enterprise#11760

---
 pandora_console/include/lib/Dashboard/Widgets/events_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index 7e050d3ee8..3706c33d5e 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -396,7 +396,7 @@ class EventsListWidget extends Widget
             0  => \__('Only pending'),
             2  => \__('Only in process'),
             3  => \__('Only not validated'),
-            4  => \__('Only not process'),
+            4  => \__('Only not in process'),
         ];
 
         $inputs['inputs']['row1'][] = [

From 1c609374a83becb228e92bd716704d2579c153e4 Mon Sep 17 00:00:00 2001
From: miguel angel rasteu <miguelangel.rasteu@pandorafms.com>
Date: Tue, 17 Oct 2023 09:27:53 +0200
Subject: [PATCH 05/10] #12134 Count total modules

---
 pandora_console/operation/agentes/status_monitor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 046fbc5222..825fbb01df 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -2348,6 +2348,7 @@ if (empty($result) === false) {
         array_push($table->data, $data);
     }
 
+    echo '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
     html_print_table($table);
 
     if ($count_modules > $config['block_size']) {

From 325b0a758ac2e30e1aae3448fc50d79341eca726 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Tue, 31 Oct 2023 11:33:48 +0100
Subject: [PATCH 06/10] Added name and master server column to servers view

---
 .../godmode/servers/servers.build_table.php   | 111 +++++++++---------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 101a99d955..80b9ff9c6b 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -64,32 +64,33 @@ $table->style = [];
 // $table->style[0] = 'font-weight: bold';
 $table->align = [];
 $table->align[1] = 'center';
-$table->align[3] = 'center';
-$table->align[8] = 'right';
+$table->align[4] = 'center';
+$table->align[9] = 'right';
 
 $table->headstyle[1] = 'text-align:center';
-$table->headstyle[3] = 'text-align:center';
-$table->headstyle[8] = 'text-align:right;width: 120px;';
+$table->headstyle[4] = 'text-align:center';
+$table->headstyle[9] = 'text-align:right;width: 120px;';
 
 $table->titleclass = 'tabletitle';
 $table->titlestyle = 'text-transform:uppercase;';
 
-$table->style[6] = 'display: flex;align-items: center;';
+$table->style[7] = 'display: flex;align-items: center;';
 
 $table->head = [];
 $table->head[0] = __('Name');
 $table->head[1] = __('Status');
 $table->head[2] = __('Type');
-$table->head[3] = __('Version');
-$table->head[4] = __('Modules');
-$table->head[5] = __('Lag').ui_print_help_tip(__('Avg. Delay(sec)/Modules delayed'), true);
-$table->head[6] = __('T/Q').ui_print_help_tip(__('Threads / Queued modules currently'), true);
+$table->head[3] = __('Master');
+$table->head[4] = __('Version');
+$table->head[5] = __('Modules');
+$table->head[6] = __('Lag').ui_print_help_tip(__('Avg. Delay(sec)/Modules delayed'), true);
+$table->head[7] = __('T/Q').ui_print_help_tip(__('Threads / Queued modules currently'), true);
 // This will have a column of data such as "6 hours".
-$table->head[7] = __('Updated');
+$table->head[8] = __('Updated');
 
 // Only Pandora Administrator can delete servers.
 if ((bool) check_acl($config['id_user'], 0, 'PM') === true) {
-    $table->head[8] = '<span title="Operations">'.__('Op.').'</span>';
+    $table->head[9] = '<span title="Operations">'.__('Op.').'</span>';
 }
 
 $table->data = [];
@@ -143,9 +144,11 @@ foreach ($servers as $server) {
     }
 
     // Type.
-    $data[2] = '<span class="nowrap">'.$server['img'];
+    $data[2] = '<span class="nowrap">'.$server['img'].' '.ucfirst($server['type']).' server';
     if ($server['master'] == $master) {
-        $data[2] .= ui_print_help_tip(__('This is a master server'), true);
+        $data[3] .= __('Yes', true);
+    } else {
+        $data[3] .= __('-');
     }
 
     if ((int) $server['exec_proxy'] === 1) {
@@ -157,27 +160,27 @@ foreach ($servers as $server) {
         case 'event':
         case 'autoprovision':
         case 'migration':
-            $data[3] = $server['version'];
-            $data[4] = __('N/A');
+            $data[4] = $server['version'];
             $data[5] = __('N/A');
+            $data[6] = __('N/A');
         break;
 
         case 'export':
-            $data[3] = $server['version'];
-            $data[4] = $server['modules'].' '.__('of').' '.$server['modules_total'];
-            $data[5] = __('N/A');
+            $data[4] = $server['version'];
+            $data[5] = $server['modules'].' '.__('of').' '.$server['modules_total'];
+            $data[6] = __('N/A');
         break;
 
         default:
-            $data[3] = $server['version'];
-            $data[4] = $server['modules'].' '.__('of').' '.$server['modules_total'];
-            $data[5] = '<span class="nowrap">'.$server['lag_txt'].'</span>';
+            $data[4] = $server['version'];
+            $data[5] = $server['modules'].' '.__('of').' '.$server['modules_total'];
+            $data[6] = '<span class="nowrap">'.$server['lag_txt'].'</span>';
         break;
     }
 
-    $data[6] = '';
+    $data[7] = '';
     if ($server['queued_modules'] > 500) {
-        $data[6] .= '<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
+        $data[7] .= '<div class="inline"><a onclick="show_dialog();" >'.html_print_image(
             'images/info-warning.svg',
             true,
             [
@@ -189,9 +192,9 @@ foreach ($servers as $server) {
         ).'</a></div>&nbsp;&nbsp;';
     }
 
-    $data[6] .= $server['threads'].' : '.$server['queued_modules'];
+    $data[7] .= $server['threads'].' : '.$server['queued_modules'];
 
-    $data[7] = ui_print_timestamp($server['keepalive'], true);
+    $data[8] = ui_print_timestamp($server['keepalive'], true);
 
     if ($server['type'] === 'data') {
         $ext = '_server';
@@ -208,11 +211,11 @@ foreach ($servers as $server) {
 
     // Only Pandora Administrator can delete servers.
     if ((bool) check_acl($config['id_user'], 0, 'PM') === true) {
-         $data[8] = '';
+         $data[9] = '';
 
         if ($server['type'] === 'recon') {
-            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist').'">';
-            $data[8] .= html_print_image(
+            $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/discovery&wiz=tasklist').'">';
+            $data[9] .= html_print_image(
                 'images/snmp-trap@svg.svg',
                 true,
                 [
@@ -221,12 +224,12 @@ foreach ($servers as $server) {
 
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
         }
 
         if ($server['type'] === 'data') {
-            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
-            $data[8] .= html_print_image(
+            $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_counts='.$server['id_server']).'">';
+            $data[9] .= html_print_image(
                 'images/force@svg.svg',
                 true,
                 [
@@ -234,10 +237,10 @@ foreach ($servers as $server) {
                     'class' => 'main_menu_icon invert_filter',
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
         } else if ($server['type'] === 'enterprise snmp') {
-            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
-            $data[8] .= html_print_image(
+            $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server']).'">';
+            $data[9] .= html_print_image(
                 'images/force@svg.svg',
                 true,
                 [
@@ -245,12 +248,12 @@ foreach ($servers as $server) {
                     'class' => 'main_menu_icon invert_filter',
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
         }
 
         if ($server['type'] === 'event' && (bool) check_acl($config['id_user'], 0, 'LM') === true) {
-            $data[8] .= '<a class="open-alerts-list-modal" href="">';
-            $data[8] .= html_print_image(
+            $data[9] .= '<a class="open-alerts-list-modal" href="">';
+            $data[9] .= html_print_image(
                 'images/alert@svg.svg',
                 true,
                 [
@@ -258,11 +261,11 @@ foreach ($servers as $server) {
                     'class' => 'main_menu_icon invert_filter',
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
         }
 
-        $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server['id_server']).'">';
-        $data[8] .= html_print_image(
+        $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server['id_server']).'">';
+        $data[9] .= html_print_image(
             'images/edit.svg',
             true,
             [
@@ -270,11 +273,11 @@ foreach ($servers as $server) {
                 'class' => 'main_menu_icon invert_filter',
             ]
         );
-        $data[8] .= '</a>';
+        $data[9] .= '</a>';
 
         if (($names_servers[$safe_server_name] === true) && ($ext === '_server' || $server['type'] === 'enterprise satellite')) {
-            $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext.'&tab=agent_editor').'">';
-            $data[8] .= html_print_image(
+            $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext.'&tab=agent_editor').'">';
+            $data[9] .= html_print_image(
                 'images/agents@svg.svg',
                 true,
                 [
@@ -282,10 +285,10 @@ foreach ($servers as $server) {
                     'class' => 'main_menu_icon invert_filter',
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
 
-            $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(
+            $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_remote='.$server['id_server'].'&ext='.$ext).'">';
+            $data[9] .= html_print_image(
                 'images/remote-configuration@svg.svg',
                 true,
                 [
@@ -293,12 +296,12 @@ foreach ($servers as $server) {
                     'class' => 'main_menu_icon invert_filter',
                 ]
             );
-            $data[8] .= '</a>';
+            $data[9] .= '</a>';
             $names_servers[$safe_server_name] = false;
         }
 
-        $data[8] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1').'">';
-        $data[8] .= html_print_image(
+        $data[9] .= '<a href="'.ui_get_full_url('index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1').'">';
+        $data[9] .= html_print_image(
             'images/delete.svg',
             true,
             [
@@ -307,14 +310,14 @@ foreach ($servers as $server) {
                 'class'   => 'main_menu_icon invert_filter',
             ]
         );
-        $data[8] .= '</a>';
+        $data[9] .= '</a>';
     }
 
     if ($tiny) {
-        unset($data[4]);
-        unset($data[6]);
+        unset($data[5]);
         unset($data[7]);
         unset($data[8]);
+        unset($data[9]);
     }
 
     $ext = '';
@@ -323,10 +326,10 @@ foreach ($servers as $server) {
 }
 
 if ($tiny) {
-    unset($table->head[4]);
-    unset($table->head[6]);
+    unset($table->head[5]);
     unset($table->head[7]);
     unset($table->head[8]);
+    unset($table->head[9]);
 }
 
 if ($tiny) {

From 161b0e8a34782a36397e14590b2c7dc7cb2e7635 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Wed, 8 Nov 2023 10:31:42 +0100
Subject: [PATCH 07/10] Add filter eventcardboard pandora_enterprise#11760

---
 pandora_console/include/functions_events.php  | 40 ++++++++++++++++---
 .../lib/Dashboard/Widgets/EventCardboard.php  |  6 +--
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index abfee036cb..c814e137eb 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -6016,17 +6016,47 @@ function get_count_event_criticity(
         $type = 'AND event_type = "'.$eventType.'"';
     }
 
-        $groups = ' ';
+    $groups = ' ';
     if ((int) $groupId !== 0) {
         $groups = 'AND id_grupo IN ('.$groupId.')';
     }
 
-        $status = ' ';
-    if ((int) $eventStatus !== -1) {
-        $status = 'AND estado = '.$eventStatus;
+    $status = ' ';
+    if (empty($eventStatus) === false) {
+        switch ($eventStatus) {
+            case EVENT_ALL:
+            default:
+                // Do not filter.
+            break;
+
+            case EVENT_NEW:
+            case EVENT_VALIDATE:
+            case EVENT_PROCESS:
+                $status = sprintf(
+                    ' AND estado = %d',
+                    $eventStatus
+                );
+            break;
+
+            case EVENT_NO_VALIDATED:
+                $status = sprintf(
+                    ' AND (estado = %d OR estado = %d)',
+                    EVENT_NEW,
+                    EVENT_PROCESS
+                );
+            break;
+
+            case EVENT_NO_PROCESS:
+                $status = sprintf(
+                    ' AND (estado = %d OR estado = %d)',
+                    EVENT_NEW,
+                    EVENT_VALIDATE
+                );
+            break;
+        }
     }
 
-        $criticity = ' ';
+    $criticity = ' ';
     if (empty($criticityId) === false) {
         $criticity = 'AND criticity IN ('.$criticityId.')';
     }
diff --git a/pandora_console/include/lib/Dashboard/Widgets/EventCardboard.php b/pandora_console/include/lib/Dashboard/Widgets/EventCardboard.php
index fa2f8bb023..8ca7571790 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/EventCardboard.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/EventCardboard.php
@@ -296,11 +296,7 @@ class EventCardboard extends Widget
         ];
 
         // Event status.
-        $fields = [
-            -1 => __('All event'),
-            1  => __('Only validated'),
-            0  => __('Only pending'),
-        ];
+        $fields = events_get_all_status(true);
 
         $inputs['inputs']['row1'][] = [
             'label'     => __('Event status'),

From 35447154aa97f3704a9796ae262ba87b99f86389 Mon Sep 17 00:00:00 2001
From: Daniel Cebrian <daniel.cebrian@pandorafms.com>
Date: Thu, 16 Nov 2023 16:34:06 +0100
Subject: [PATCH 08/10] #12473 fixed status and group in export csv

---
 .../include/lib/ClusterViewer/ClusterManager.php   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pandora_console/include/lib/ClusterViewer/ClusterManager.php b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
index 7ee9a96ba1..4f47ca0d42 100644
--- a/pandora_console/include/lib/ClusterViewer/ClusterManager.php
+++ b/pandora_console/include/lib/ClusterViewer/ClusterManager.php
@@ -620,9 +620,16 @@ class ClusterManager
                         if (empty($tmp->group) === true) {
                             $tmp->group = __('Not set');
                         } else {
+                            // Html div part for csv export.
                             $tmp->group = ui_print_group_icon(
                                 $tmp->group,
                                 true
+                            ).html_print_div(
+                                [
+                                    'content' => groups_get_name($tmp->group),
+                                    'class'   => 'invisible',
+                                ],
+                                true
                             );
                         }
 
@@ -636,9 +643,16 @@ class ClusterManager
                         }
 
                         // Status.
+                        // Html div part for csv export.
                         $tmp->known_status = ui_print_module_status(
                             $tmp->known_status,
                             true
+                        ).html_print_div(
+                            [
+                                'content' => $tmp->known_status,
+                                'class'   => 'invisible',
+                            ],
+                            true
                         );
 
                         // Options. View.

From 0eea4788bf0126820c378c82ec8e52ddaaca056f Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Fri, 17 Nov 2023 13:24:44 +0100
Subject: [PATCH 09/10] Added blankspaces in server view

---
 pandora_console/godmode/servers/servers.build_table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 80b9ff9c6b..f482883786 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -144,7 +144,7 @@ foreach ($servers as $server) {
     }
 
     // Type.
-    $data[2] = '<span class="nowrap">'.$server['img'].' '.ucfirst($server['type']).' server';
+    $data[2] = '<span class="nowrap">'.$server['img'].'&nbsp;&nbsp;&nbsp;&nbsp;'.ucfirst($server['type']).' server';
     if ($server['master'] == $master) {
         $data[3] .= __('Yes', true);
     } else {

From 50406748bf211618fe14bf19e7c382cb2752c149 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Mon, 20 Nov 2023 12:04:25 +0100
Subject: [PATCH 10/10] Fix server names uppercases on server list

---
 .../godmode/servers/servers.build_table.php   |  2 +-
 pandora_console/include/functions_servers.php | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index f482883786..95b831b86c 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -144,7 +144,7 @@ foreach ($servers as $server) {
     }
 
     // Type.
-    $data[2] = '<span class="nowrap">'.$server['img'].'&nbsp;&nbsp;&nbsp;&nbsp;'.ucfirst($server['type']).' server';
+    $data[2] = '<span class="nowrap">'.$server['img'].'&nbsp;&nbsp;&nbsp;&nbsp;'.$server['name'];
     if ($server['master'] == $master) {
         $data[3] .= __('Yes', true);
     } else {
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 75e034ce3c..ff6fab73c6 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -665,6 +665,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'data';
                 $id_modulo = 1;
+                $server['name'] = __('Data server');
             break;
 
             case SERVER_TYPE_NETWORK:
@@ -678,6 +679,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'network';
                 $id_modulo = 2;
+                $server['name'] = __('Network server');
             break;
 
             case SERVER_TYPE_SNMP:
@@ -691,6 +693,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'snmp';
                 $id_modulo = 0;
+                $server['name'] = __('SNMP Trap server');
             break;
 
             case SERVER_TYPE_DISCOVERY:
@@ -704,6 +707,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'recon';
                 $id_modulo = 0;
+                $server['name'] = __('Discovery server');
             break;
 
             case SERVER_TYPE_PLUGIN:
@@ -717,6 +721,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'plugin';
                 $id_modulo = 4;
+                $server['name'] = __('Plugin server');
             break;
 
             case SERVER_TYPE_PREDICTION:
@@ -730,6 +735,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'prediction';
                 $id_modulo = 5;
+                $server['name'] = __('Prediction server');
             break;
 
             case SERVER_TYPE_WMI:
@@ -743,6 +749,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'wmi';
                 $id_modulo = 6;
+                $server['name'] = __('WMI server');
             break;
 
             case SERVER_TYPE_EXPORT:
@@ -756,6 +763,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'export';
                 $id_modulo = 0;
+                $server['name'] = __('Export server');
             break;
 
             case SERVER_TYPE_INVENTORY:
@@ -769,6 +777,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'inventory';
                 $id_modulo = 0;
+                $server['name'] = __('Inventory server');
             break;
 
             case SERVER_TYPE_WEB:
@@ -782,6 +791,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'web';
                 $id_modulo = 0;
+                $server['name'] = __('Web server');
             break;
 
             case SERVER_TYPE_EVENT:
@@ -795,6 +805,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'event';
                 $id_modulo = 2;
+                $server['name'] = __('Event server');
             break;
 
             case SERVER_TYPE_CORRELATION:
@@ -808,6 +819,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'correlation';
                 $id_modulo = 0;
+                $server['name'] = __('Correlation server');
             break;
 
             case SERVER_TYPE_ENTERPRISE_ICMP:
@@ -821,6 +833,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'enterprise icmp';
                 $id_modulo = 2;
+                $server['name'] = __('Enterprise ICMP server');
             break;
 
             case SERVER_TYPE_ENTERPRISE_SNMP:
@@ -834,6 +847,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'enterprise snmp';
                 $id_modulo = 2;
+                $server['name'] = __('Enterprise SNMP server');
             break;
 
             case SERVER_TYPE_ENTERPRISE_SATELLITE:
@@ -847,6 +861,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'enterprise satellite';
                 $id_modulo = 0;
+                $server['name'] = __('Enterprise Satellite server');
             break;
 
             case SERVER_TYPE_ENTERPRISE_TRANSACTIONAL:
@@ -860,6 +875,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'enterprise transactional';
                 $id_modulo = 0;
+                $server['name'] = __('Enterprise Transactional server');
             break;
 
             case SERVER_TYPE_MAINFRAME:
@@ -873,6 +889,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'mainframe';
                 $id_modulo = 0;
+                $server['name'] = __('Mainframe server');
             break;
 
             case SERVER_TYPE_SYNC:
@@ -886,6 +903,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'sync';
                 $id_modulo = 0;
+                $server['name'] = __('Sync server');
             break;
 
             case SERVER_TYPE_WUX:
@@ -899,6 +917,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'wux';
                 $id_modulo = 0;
+                $server['name'] = __('Wux server');
             break;
 
             case SERVER_TYPE_SYSLOG:
@@ -912,6 +931,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'syslog';
                 $id_modulo = 0;
+                $server['name'] = __('Syslog server');
             break;
 
             case SERVER_TYPE_NCM:
@@ -925,6 +945,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'ncm';
                 $id_modulo = 0;
+                $server['name'] = __('NCM server');
             break;
 
             case SERVER_TYPE_AUTOPROVISION:
@@ -938,6 +959,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'autoprovision';
                 $id_modulo = 0;
+                $server['name'] = __('Autoprovision server');
             break;
 
             case SERVER_TYPE_MIGRATION:
@@ -951,6 +973,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'migration';
                 $id_modulo = 0;
+                $server['name'] = __('Migration server');
             break;
 
             case SERVER_TYPE_ALERT:
@@ -964,6 +987,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'alert';
                 $id_modulo = 0;
+                $server['name'] = __('Alert server');
             break;
 
             case SERVER_TYPE_NETFLOW:
@@ -977,6 +1001,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'netflow';
                 $id_modulo = 0;
+                $server['name'] = __('Netflow server');
             break;
 
             case SERVER_TYPE_LOG:
@@ -990,6 +1015,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'log';
                 $id_modulo = 0;
+                $server['name'] = __('Log server');
             break;
 
             case SERVER_TYPE_MADE:
@@ -1003,6 +1029,7 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
                 );
                 $server['type'] = 'made';
                 $id_modulo = 0;
+                $server['name'] = __('MADE server');
             break;
 
             default: