Merge branch 'develop' into ent-13616-elementos-sql-graph-de-informes-tienen-textos-oscuros-en-tema-oscuro

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.776-240422
+Version: 7.0NG.776-240424
 Architecture: all
 Priority: optional
 Section: admin

pandora_agents/unix/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.776-240422"
+pandora_version="7.0NG.776-240424"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

pandora_agents/unix/pandora_agent

@@ -1039,7 +1039,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.776';
-use constant AGENT_BUILD => '240422';
+use constant AGENT_BUILD => '240424';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;

pandora_agents/unix/pandora_agent.redhat.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.redhat_bin.el8.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

pandora_agents/unix/pandora_agent.redhat_bin.el9.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 %define debug_package %{nil}
 
 Summary:            Pandora FMS Linux agent, binary version

pandora_agents/unix/pandora_agent.redhat_bin.spec

@@ -5,7 +5,7 @@
 %define name        pandorafms_agent_linux_bin
 %define source_name pandorafms_agent_linux
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 Summary:            Pandora FMS Linux agent, binary version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_agent_linux
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.776"
-PI_BUILD="240422"
+PI_BUILD="240424"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{240422}
+{240424}
 
 ViewReadme
 {Yes}

pandora_agents/win32/pandora.cc

@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.776 Build 240422")
+#define PANDORA_VERSION ("7.0NG.776 Build 240424")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Pandora FMS"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.776(Build 240422))"
+      VALUE "ProductVersion", "(7.0NG.776(Build 240424))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.776-240422
+Version: 7.0NG.776-240424
 Architecture: all
 Priority: optional
 Section: admin

pandora_console/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.776-240422"
+pandora_version="7.0NG.776-240424"
 
 package_pear=0
 package_pandora=1

pandora_console/extensions/realtime_graphs/ajax.php

@@ -27,7 +27,7 @@ switch ($graph) {
         if ($os == 'windows') {
             $data = exec('wmic cpu get loadpercentage|find /I /V "Loadpercentage" | findstr /r "[0-9]" ');
         } else {
-            $data = exec("top -bn 2 -d 0.01 | grep '^Cpu' | tail -n 1 | awk '{ print $2+$4+$6 }'");
+            $data = exec("top -bn 2 -d 0.01 | grep 'Cpu' | tail -n 1 | awk '{ print $2+$4+$6 }'");
         }
     break;
 
@@ -55,7 +55,8 @@ switch ($graph) {
         if ($os == 'windows') {
             $data = exec('(FOR /F "skip=2 tokens=2 delims=\," %P IN (\'typeperf "\\Process(httpd)\\% processor time" -sc 1\') DO @echo %P)|find /V /I "..."');
         } else {
-            $data = exec("ps aux | grep apache2 | grep -v safe | grep -v grep | awk '{ sum+=$3 } END { print sum }'");
+            $apache = exec("ps aux | grep apache2 | grep -v safe | grep -v grep && echo 1 || echo 0") == 1 ? "apache2" : "apache";
+            $data = exec("ps aux | grep $apache | grep -v safe | grep -v grep | awk '{ sum+=$3 } END { print sum }'");
         }
     break;
 
@@ -63,7 +64,7 @@ switch ($graph) {
         if ($os == 'windows') {
             $data = exec('(FOR /F "skip=2 tokens=2 delims=\," %P IN (\'typeperf "\\Process(pandora_server)\\% processor time" -sc 1\') DO @echo %P)|find /V /I "..."');
         } else {
-            $data = exec("ps aux | grep pandora_server | grep -v grep | awk '{ print $3 }'");
+            $data = exec("ps aux | grep pandora_server | grep -v grep | awk '{ sum+=$3 } END { print sum }'");
         }
     break;
 

pandora_console/extras/discovery/DiscoveryApplicationsMigrateCodes.ini

@@ -1,4 +1,4 @@
-pandorafms.vmware=a272ee00a9b5f201bb708bef72bbe276
+pandorafms.vmware=3d1785e1baa07db0a40b9e47bb30472c
 pandorafms.mysql=33d470c7492214d4b384ed307e81adf4
 pandorafms.vmware=1deafce1d55d3574645d8b136104e9ad
 pandorafms.mysql=ca7dd8b80a1a03a25eb0fb077818ad63

pandora_console/extras/mr/68.sql

@@ -64,7 +64,7 @@ ALTER TABLE `tmerge_queries` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_09
 -- Update version for plugin oracle
 UPDATE `tdiscovery_apps` SET `version` = '1.2' WHERE `short_name` = 'pandorafms.oracle';
 -- Update version for plugin oracle
-UPDATE `tdiscovery_apps` SET `version` = '1.3' WHERE `short_name` = 'pandorafms.vmware';
+UPDATE `tdiscovery_apps` SET `version` = '1.4' WHERE `short_name` = 'pandorafms.vmware';
 
 ALTER TABLE `tevent_sound` MODIFY COLUMN `name` text NULL;
 ALTER TABLE `tevent_sound` MODIFY COLUMN `sound` text NULL;

pandora_console/godmode/reporting/reporting_builder.php

@@ -2426,7 +2426,7 @@ switch ($action) {
                             $values['top_n_value'] = get_parameter('max_items');
                             $values['server_name'] = get_parameter('combo_server_sql');
 
-                            if ($sql !== '') {
+                            if ($sql !== '' && $sql !== null) {
                                 // Replaces possible macros to check the validity of the query
                                 $macros_sql = $sql;
                                 $macros_sql = str_replace('_start_date_', '0', $macros_sql);
@@ -3376,7 +3376,7 @@ switch ($action) {
                             $values['server_name'] = get_parameter('combo_server_sql');
 
 
-                            if ($sql !== '') {
+                            if ($sql !== '' && $sql !== null) {
                                 // Replaces possible macros to check the validity of the query
                                 $macros_sql = $sql;
                                 $macros_sql = str_replace('_start_date_', '0', $macros_sql);

pandora_console/include/class/SnmpConsole.class.php

@@ -554,6 +554,10 @@ class SnmpConsole extends HTML
         $filters = get_parameter('filter', []);
 
         // Build ranges.
+        if (empty($filters['filter_hours_ago']) === true) {
+            $filters['filter_hours_ago'] = 8;
+        }
+
         $now_timestamp = time();
         $interval_seconds = ($filters['filter_hours_ago'] * 3600);
         $ago_timestamp = ($now_timestamp - $interval_seconds);
@@ -637,42 +641,25 @@ class SnmpConsole extends HTML
                 $whereSubquery .= ' AND alerted = '.$filters['filter_alert'];
             }
 
+            $filters['filter_severity'] = (int) $filters['filter_severity'];
             if ($filters['filter_severity'] != -1) {
                 // There are two special severity values aimed to match two different trap standard severities
                 // in database: warning/critical and critical/normal.
-                if ($filters['filter_severity'] != EVENT_CRIT_OR_NORMAL
+                if ($filters['filter_severity'] !== EVENT_CRIT_OR_NORMAL
-                    && $filters['filter_severity'] != EVENT_CRIT_WARNING_OR_CRITICAL
+                    && $filters['filter_severity'] !== EVENT_CRIT_WARNING_OR_CRITICAL
+                    && $filters['filter_severity'] !== EVENT_CRIT_NOT_NORMAL
                 ) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND severity = '.$filters['filter_severity'];
-                        $whereSubquery .= ' AND (
-                            (alerted = 0 AND severity = '.$filters['filter_severity'].') OR
-                            (alerted = 1 AND priority = '.$filters['filter_severity'].'))';
-                    } else {
-                        $whereSubquery .= ' AND (
-                            (alerted = 0 AND 1 = '.$filters['filter_severity'].') OR
-                            (alerted = 1 AND priority = '.$filters['filter_severity'].'))';
-                    }
                 } else if ($filters['filter_severity'] === EVENT_CRIT_WARNING_OR_CRITICAL) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_WARNING_OR_CRITICAL.')';
-                        $whereSubquery .= ' AND (
-                        (alerted = 0 AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    } else {
-                        $whereSubquery .= ' AND (
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    }
                 } else if ($filters['filter_severity'] === EVENT_CRIT_OR_NORMAL) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_OR_NORMAL.')';
-                        $whereSubquery .= ' AND (
+                } else if ($filters['filter_severity'] === EVENT_CRIT_NOT_NORMAL) {
-                        (alerted = 0 AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR
+                    // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_NOT_NORMAL.')';
-                    } else {
-                        $whereSubquery .= ' AND (
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    }
                 }
             }
 
@@ -1142,42 +1129,25 @@ class SnmpConsole extends HTML
                 $whereSubquery .= ' AND alerted = '.$$alert;
             }
 
-            if ($severity != -1) {
+            $severity = (int) $severity;
+            if ($severity !== -1) {
                 // There are two special severity values aimed to match two different trap standard severities
                 // in database: warning/critical and critical/normal.
-                if ($severity != EVENT_CRIT_OR_NORMAL
+                if ($severity !== EVENT_CRIT_OR_NORMAL
-                    && $severity != EVENT_CRIT_WARNING_OR_CRITICAL
+                    && $severity !== EVENT_CRIT_WARNING_OR_CRITICAL
+                    && $severity !== EVENT_CRIT_NOT_NORMAL
                 ) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND severity = '.$severity;
-                        $whereSubquery .= ' AND (
-                            (alerted = 0 AND severity = '.$severity.') OR
-                            (alerted = 1 AND priority = '.$severity.'))';
-                    } else {
-                        $whereSubquery .= ' AND (
-                            (alerted = 0 AND 1 = '.$severity.') OR
-                            (alerted = 1 AND priority = '.$severity.'))';
-                    }
                 } else if ($severity === EVENT_CRIT_WARNING_OR_CRITICAL) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_WARNING_OR_CRITICAL.')';
-                        $whereSubquery .= ' AND (
-                        (alerted = 0 AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    } else {
-                        $whereSubquery .= ' AND (
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_WARNING.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    }
                 } else if ($severity === EVENT_CRIT_OR_NORMAL) {
                     // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                    if ($config['enterprise_installed']) {
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_OR_NORMAL.')';
-                        $whereSubquery .= ' AND (
+                } else if ($severity === EVENT_CRIT_NOT_NORMAL) {
-                        (alerted = 0 AND (severity = '.EVENT_CRIT_NORMAL.' OR severity = '.EVENT_CRIT_CRITICAL.')) OR
+                    // Test if enterprise is installed to search oid in text or oid field in ttrap.
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
+                    $whereSubquery .= ' AND (severity = '.EVENT_CRIT_WARNING.' OR severity = '.EVENT_CRIT_CRITICAL.' OR severity = '.EVENT_CRIT_NOT_NORMAL.')';
-                    } else {
-                        $whereSubquery .= ' AND (
-                        (alerted = 1 AND (priority = '.EVENT_CRIT_NORMAL.' OR priority = '.EVENT_CRIT_CRITICAL.')))';
-                    }
                 }
             }
 

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@ use DI\ContainerBuilder;
 /*
  * Pandora build version and version
  */
-$build_version = 'PC240422';
+$build_version = 'PC240424';
 $pandora_version = 'v7.0NG.776';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/functions_api.php

@@ -13175,10 +13175,12 @@ function api_set_create_event($id, $trash1, $other, $returnType)
             $values['id_extra'] = '';
         }
 
-        if ($other['data'][21] != '') {
+        if (empty($values['event_custom_id']) === true) {
-            $values['event_custom_id'] = $other['data'][21];
+            if ($other['data'][21] != '') {
-        } else {
+                $values['event_custom_id'] = $other['data'][21];
-            $values['event_custom_id'] = '';
+            } else {
+                $values['event_custom_id'] = '';
+            }
         }
 
         $custom_data = base64_decode($values['custom_data']);

pandora_console/include/functions_html.php

@@ -3535,7 +3535,8 @@ function html_print_input_text(
     $disabled=false,
     $list='',
     $placeholder=null,
-    $pattern=null
+    $pattern=null,
+    $id=false
 ) {
     if ($maxlength == 0) {
         $maxlength = 255;
@@ -3593,7 +3594,7 @@ function html_print_input_text(
     return html_print_input_text_extended(
         $name,
         $value,
-        'text-'.$name,
+        (($id === false) ? 'text-'.$name : $id),
         $alt,
         $size,
         $maxlength,
@@ -6861,6 +6862,11 @@ function html_print_input($data, $wrapper='div', $input_only=false)
                 (isset($data['time_end']) === true) ? $data['time_end'] : '',
                 (isset($data['date_text']) === true) ? $data['date_text'] : SECONDS_1DAY,
                 (isset($data['class']) === true) ? $data['class'] : 'w100p',
+                (isset($data['date_format_php']) === true) ? $data['date_format_php'] : 'Y/m/d',
+                (isset($data['time_format_php']) === true) ? $data['time_format_php'] : 'H:i:s',
+                (isset($data['date_format_js']) === true) ? $data['date_format_js'] : 'yy/mm/dd',
+                (isset($data['time_format_js']) === true) ? $data['time_format_js'] : 'HH/mm/ss',
+                (isset($data['id']) === true) ? $data['id'] : '',
             );
         break;
 
@@ -7843,7 +7849,8 @@ function html_print_select_date_range(
     $date_format_php='Y/m/d',
     $time_format_php='H:i:s',
     $date_format_js='yy/mm/dd',
-    $time_format_js='HH:mm:ss'
+    $time_format_js='HH:mm:ss',
+    $id='',
 ) {
     global $config;
 
@@ -7894,7 +7901,7 @@ function html_print_select_date_range(
     $fields['chose_range'] = __('Chose start/end date period');
     $fields['none'] = __('None');
 
-    $output = html_print_input_hidden('custom_date', $custom_date, true);
+    $output = html_print_input_hidden('custom_date', $custom_date, true, false, false, 'hidden-custom_date'.$id);
     $output .= '<div id="'.$name.'_default" class="wauto inline_flex" '.$display_default.'>';
         $output .= html_print_select(
             $fields,
@@ -7914,13 +7921,101 @@ function html_print_select_date_range(
         $table->data = [];
         $table->class = 'table-adv-filter';
         $table->data[0][0] = '<div><div><div><span class="font-title-font">'.__('From').':</span></div>';
-            $table->data[0][0] .= html_print_input_text('date_init', $date_init, '', 12, 10, true).' ';
+            $table->data[0][0] .= html_print_input_text(
-            $table->data[0][0] .= html_print_input_text('time_init', $time_init, '', 10, 7, true).' ';
+                'date_init',
+                $date_init,
+                '',
+                12,
+                10,
+                true,
+                false,
+                false,
+                '',
+                '',
+                '',
+                'off',
+                false,
+                '',
+                '',
+                '',
+                false,
+                '',
+                null,
+                null,
+                (empty($id) === false) ? 'text-date_init'.$id : false,
+            ).' ';
+            $table->data[0][0] .= html_print_input_text(
+                'time_init',
+                $time_init,
+                '',
+                10,
+                7,
+                true,
+                false,
+                false,
+                '',
+                '',
+                '',
+                'off',
+                false,
+                '',
+                '',
+                '',
+                false,
+                '',
+                null,
+                null,
+                (empty($id) === false) ? 'text-time_init'.$id : false,
+            ).' ';
         $table->data[0][0] .= '</div>';
         $table->data[0][0] .= '<div><div><span class="font-title-font">'.__('to').':</span></div>';
-            $table->data[0][0] .= html_print_input_text('date_end', $date_end, '', 12, 10, true).' ';
+            $table->data[0][0] .= html_print_input_text(
+                'date_end',
+                $date_end,
+                '',
+                12,
+                10,
+                true,
+                false,
+                false,
+                '',
+                '',
+                '',
+                'off',
+                false,
+                '',
+                '',
+                '',
+                false,
+                '',
+                null,
+                null,
+                (empty($id) === false) ? 'text-date_end'.$id : false,
+            ).' ';
         $table->data[0][0] .= '<div id="'.$name.'_manual" class="w100p inline_line">';
-            $table->data[0][0] .= html_print_input_text('time_end', $time_end, '', 10, 7, true).' ';
+            $table->data[0][0] .= html_print_input_text(
+                'time_end',
+                $time_end,
+                '',
+                10,
+                7,
+                true,
+                false,
+                false,
+                '',
+                '',
+                '',
+                'off',
+                false,
+                '',
+                '',
+                '',
+                false,
+                '',
+                null,
+                null,
+                (empty($id) === false) ? 'text-time_end'.$id : false,
+            ).' ';
             $table->data[0][0] .= ' <a href="javascript:">'.html_print_image(
                 'images/logs@svg.svg',
                 true,
@@ -7991,13 +8086,13 @@ function html_print_select_date_range(
                     $('#".$name."_range').show();
                     $('#".$name."_default').hide();
                     $('#".$name."_extend').hide();
-                    $('#hidden-custom_date').val('1');
+                    $('#hidden-custom_date".$id."').val('1');
                     $('.filter_label_position_before').addClass('filter_label_position_after');
                 } else if ($(this).val() === 'custom') {
                     $('#".$name."_range').hide();
                     $('#".$name."_default').hide();
                     $('#".$name."_extend').show();
-                    $('#hidden-custom_date').val('2');
+                    $('#hidden-custom_date".$id."').val('2');
                     $('.filter_label_position_before').removeClass('filter_label_position_after');
                 } else {
                     $('.filter_label_position_before').removeClass('filter_label_position_after');
@@ -8015,8 +8110,8 @@ function html_print_select_date_range(
             $('#".$name."_range').show();
             $('#".$name."_default').hide();
             $('#".$name."_extend').hide();
-            position_top_init = $('#text-date_init').offset().top + $('#text-date_init').outerHeight();
+            position_top_init = $('[id^=text-date_init".$id."]').offset().top + $('[id^=text-date_init".$id."]').outerHeight();
-            position_top_end = $('#text-date_end').offset().top + $('#text-date_end').outerHeight();
+            position_top_end = $('[id^=text-date_end".$id."]').offset().top + $('[id^=text-date_end".$id."]').outerHeight();
             if(def_state_range){
                 $('#".$name."_range').show();
             } else {
@@ -8042,7 +8137,7 @@ function html_print_select_date_range(
             $('#".$name."_range').hide();
             $('#".$name."_extend').hide();
             $('#".$name."').val('".SECONDS_1DAY."').trigger('change');
-            $('#hidden-custom_date').val('0');
+            $('#hidden-custom_date".$id."').val('0');
         }
 
         $('#text-date').datepicker({
@@ -8052,7 +8147,7 @@ function html_print_select_date_range(
             showAnim: 'slideDown'
         });
 
-        $('[id^=text-time_init]').timepicker({
+        $('[id^=text-time_init".$id."]').timepicker({
             showSecond: true,
             timeFormat: '".$time_format_js."',
             timeOnlyTitle: '".__('Choose time')."',
@@ -8064,7 +8159,7 @@ function html_print_select_date_range(
             closeText: '".__('Close')."'
         });
 
-        $('[id^=text-date_init]').datepicker ({
+        $('[id^=text-date_init".$id."]').datepicker ({
             dateFormat: '".$date_format_js."',
             changeMonth: true,
             changeYear: true,
@@ -8073,9 +8168,9 @@ function html_print_select_date_range(
             beforeShowDay: function (date) {
                 show_datepicker = 'date_init';
                 var date_now = date.getTime();
-                var date_ini_split = $('[id^=text-date_init]').val().split('/');
+                var date_ini_split = $('[id^=text-date_init".$id."]').val().split('/');
                 var date_ini = new Date(date_ini_split[1]+'/'+date_ini_split[2]+'/'+date_ini_split[0]).getTime();
-                var date_end_split = $('[id^=text-date_end]').val().split('/');
+                var date_end_split = $('[id^=text-date_end".$id."]').val().split('/');
                 var date_end = new Date(date_end_split[1]+'/'+date_end_split[2]+'/'+date_end_split[0]).getTime();
                 if (date_now > date_ini && date_now < date_end) {
                     return [true, 'ui-date-range-in', 'prueba'];
@@ -8086,7 +8181,7 @@ function html_print_select_date_range(
             }
         });
 
-        $('[id^=text-date_end]').datepicker ({
+        $('[id^=text-date_end".$id."]').datepicker ({
             dateFormat: '".$date_format_js."',
             changeMonth: true,
             changeYear: true,
@@ -8095,9 +8190,9 @@ function html_print_select_date_range(
             beforeShowDay: function (date) {
                 show_datepicker = 'date_end';
                 var date_now = date.getTime();
-                var date_ini_split = $('[id^=text-date_init]').val().split('/');
+                var date_ini_split = $('[id^=text-date_init".$id."]').val().split('/');
                 var date_ini = new Date(date_ini_split[1]+'/'+date_ini_split[2]+'/'+date_ini_split[0]).getTime();
-                var date_end_split = $('[id^=text-date_end]').val().split('/');
+                var date_end_split = $('[id^=text-date_end".$id."]').val().split('/');
                 var date_end = new Date(date_end_split[1]+'/'+date_end_split[2]+'/'+date_end_split[0]).getTime();
                 if (date_now > date_ini && date_now < date_end) {
                     return [true, 'ui-date-range-in', 'prueba'];
@@ -8105,10 +8200,10 @@ function html_print_select_date_range(
                     return [true, 'ui-datepicker-current-day', ''];
                 }
                 return [true, '', ''];
-            }
+            },
         });
 
-        $('[id^=text-time_end]').timepicker({
+        $('[id^=text-time_end".$id."]').timepicker({
             showSecond: true,
             timeFormat: '".$time_format_js."',
             timeOnlyTitle: '".__('Choose time')."',

pandora_console/include/functions_reporting_html.php

@@ -112,8 +112,8 @@ function reporting_html_header(
         }
 
         $data[] = $title.$sizhfin;
-        $data[] = $sizh.$subtitle.$sizhfin;
+        $data[] = $sizh.__('Group').': '.$subtitle.$sizhfin;
-        $data[] = "<div class='right'>".$sizh.$date_text.$sizhfin.'</div>';
+        $data[] = '<div class="flex-content-right flex-items-center">'.$sizh.__('Data time').': '.$sizhfin."<div class='right mrgn_lft_15px'>".$sizh.$date_text.$sizhfin.'</div></div>';
     }
 
     array_push($table->data, $data);
@@ -194,6 +194,9 @@ function reporting_html_print_report($report, $mini=false, $report_info=1, $cust
         $table->head = [];
         $table->colspan = [];
         $table->rowstyle = ['background-color: #686868'];
+        $table->size[0] = '33%';
+        $table->size[1] = '33%';
+        $table->size[2] = '33%';
 
         if (isset($item['label']) && $item['label'] != '') {
             $id_agent = $item['id_agent'];
@@ -3606,7 +3609,7 @@ function reporting_html_group_report($table, $item, $pdf=0)
     }
 
     $graph_width = 280;
-    $graph_height = 250;
+    $graph_height = 300;
 
     $out = '<table width="100%" class="info_table">';
     $out .= '<tbody>';
@@ -3688,7 +3691,7 @@ function reporting_html_group_report($table, $item, $pdf=0)
 
     $out .= '<div id="events_per_agent_pie" style="height: '.$graph_height.'px">';
     if ((int) $ttl === 2) {
-        $out .= '<img src="data:image/png;base64,';
+        $out .= '<img width="350" src="data:image/png;base64,';
     } else {
         $out .= '<div id="status_pie" style="margin: auto;">';
     }
@@ -3730,7 +3733,7 @@ function reporting_html_group_report($table, $item, $pdf=0)
 
     $out .= '<div id="group_os_pie" style="height: '.$graph_height.'px">';
     if ((int) $ttl === 2) {
-        $out .= '<img src="data:image/png;base64,';
+        $out .= '<img width="350" src="data:image/png;base64,';
     } else {
         $out .= '<div id="status_pie" style="margin: auto;">';
     }

pandora_console/include/javascript/pandora_dashboards.js

@@ -24,12 +24,6 @@ function show_option_dialog(settings) {
       method: "updateDashboard",
       dataType: "json"
     },
-    oncancel: {
-      reload: true
-    },
-    onclose: {
-      reload: true
-    },
     ajax_callback: update_dashboard
   });
 }
@@ -483,10 +477,6 @@ function initialiceLayout(data) {
   function configurationWidget(cellId, widgetId, size) {
     var reload = 0;
     var overlay = false;
-    if (widgetId == 46) {
-      reload = 1;
-      overlay = true;
-    }
     title = $("#hidden-widget_name_" + cellId).val();
     load_modal({
       target: $("#modal-config-widget"),

pandora_console/include/javascript/pandora_events.js

@@ -1338,7 +1338,6 @@ function listen_event_sound(settings) {
   );
 }
 
-let sound_listener;
 function check_event_sound(settings) {
   // Update elements time.
   $(".elements-discovered-alerts ul li").each(function() {
@@ -1382,7 +1381,7 @@ function check_event_sound(settings) {
     },
     function(data) {
       if (data != false) {
-        clearTimeout(sound_listener);
+        clearTimeout(window.sound_listener);
         // Hide empty.
         $("#tabs-sound-modal .empty-discovered-alerts").addClass(
           "invisible_important"
@@ -1434,7 +1433,7 @@ function check_event_sound(settings) {
         });
 
         // -100 delay sound.
-        sound_listener = setTimeout(
+        window.sound_listener = setTimeout(
           remove_audio,
           parseInt($("#tabs-sound-modal #time_sound").val()) * 1000 - 100
         );

pandora_console/include/lib/Dashboard/Widgets/security_hardening.php

@@ -270,8 +270,8 @@ class SecurityHardening extends Widget
             'id'        => 'row_date',
             'class'     => 'row_input',
             'arguments' => [
-                'id'        => 'range',
+                'id'        => '_range_vulnerability',
-                'name'      => 'range',
+                'name'      => 'range_vulnerability',
                 'type'      => 'date_range',
                 'selected'  => 'chose_range',
                 'date_init' => date('Y/m/d', $values['date_init']),
@@ -301,7 +301,7 @@ class SecurityHardening extends Widget
         $values['limit'] = \get_parameter('limit', 10);
         $values['category'] = \get_parameter('category', 6);
         $values['ignore_skipped'] = \get_parameter_switch('ignore_skipped', 0);
-        $date = $this->getDateParameter();
+        $date = \get_parameter_date('range_vulnerability', '', 'U');
         $values['date_init'] = $date['date_init'];
         $values['date_end'] = $date['date_end'];
         return $values;
@@ -366,75 +366,6 @@ class SecurityHardening extends Widget
     }
 
 
-    /**
-     * Returns the date in an object obtained by parameter.
-     *
-     * @return object Object with date_init, date_end and period.
-     */
-    private function getDateParameter()
-    {
-        $date_end = get_parameter('date_end', 0);
-        $time_end = get_parameter('time_end');
-        $datetime_end = strtotime($date_end.' '.$time_end);
-
-        $custom_date = get_parameter('custom_date', 0);
-        $range = get_parameter('range', SECONDS_1DAY);
-        $date_text = get_parameter('range_text', SECONDS_1DAY);
-        $date_init_less = (strtotime(date('Y/m/d')) - SECONDS_1DAY);
-        $date_init = get_parameter('date_init', date(DATE_FORMAT, $date_init_less));
-        $time_init = get_parameter('time_init', date(TIME_FORMAT, $date_init_less));
-        $datetime_init = strtotime($date_init.' '.$time_init);
-        if ($custom_date === '1') {
-            if ($datetime_init >= $datetime_end) {
-                $datetime_init = $date_init_less;
-            }
-
-            $date_init = date('Y/m/d H:i:s', $datetime_init);
-            $date_end = date('Y/m/d H:i:s', $datetime_end);
-            $period = ($datetime_end - $datetime_init);
-        } else if ($custom_date === '2') {
-            $date_units = get_parameter('range_units');
-            $date_end = date('Y/m/d H:i:s');
-            $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - ((int) $date_text * (int) $date_units)));
-            $period = (strtotime($date_end) - strtotime($date_init));
-        } else if (in_array($range, ['this_week', 'this_month', 'past_week', 'past_month'])) {
-            if ($range === 'this_week') {
-                $monday = date('Y/m/d', strtotime('last monday'));
-
-                $sunday = date('Y/m/d', strtotime($monday.' +6 days'));
-                $period = (strtotime($sunday) - strtotime($monday));
-                $date_init = $monday;
-                $date_end = $sunday;
-            } else if ($range === 'this_month') {
-                $date_end = date('Y/m/d', strtotime('last day of this month'));
-                $first_of_month = date('Y/m/d', strtotime('first day of this month'));
-                $date_init = $first_of_month;
-                $period = (strtotime($date_end) - strtotime($first_of_month));
-            } else if ($range === 'past_month') {
-                $date_end = date('Y/m/d', strtotime('last day of previous month'));
-                $first_of_month = date('Y/m/d', strtotime('first day of previous month'));
-                $date_init = $first_of_month;
-                $period = (strtotime($date_end) - strtotime($first_of_month));
-            } else if ($range === 'past_week') {
-                $date_end = date('Y/m/d', strtotime('sunday', strtotime('last week')));
-                $first_of_week = date('Y/m/d', strtotime('monday', strtotime('last week')));
-                $date_init = $first_of_week;
-                $period = (strtotime($date_end) - strtotime($first_of_week));
-            }
-        } else {
-            $date_end = date('Y/m/d H:i:s');
-            $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - $range));
-            $period = (strtotime($date_end) - strtotime($date_init));
-        }
-
-        return [
-            'date_init' => strtotime($date_init),
-            'date_end'  => strtotime($date_end),
-            'period'    => $period,
-        ];
-    }
-
-
     /**
      * Check user's acl using group.
      *
@@ -692,6 +623,7 @@ class SecurityHardening extends Widget
      */
     private function vulnerabilitiesByCategory($group, $category, $ignore_skipped=true)
     {
+        global $config;
         $labels = [
             __('Passed'),
             __('Failed'),
@@ -749,7 +681,7 @@ class SecurityHardening extends Widget
 
             $total = (count($vulnerabilities['pass']) + count($vulnerabilities['fail']));
 
-            if ($ignore_skipped === false) {
+            if ($ignore_skipped === false && isset($vulnerabilities['skipped']) === true) {
                 $data[] = count($vulnerabilities['skipped']);
                 $total += count($vulnerabilities['skipped']);
                 $labels[] = __('Skipped');
@@ -763,18 +695,19 @@ class SecurityHardening extends Widget
                     'display'  => true,
                     'position' => 'right',
                     'align'    => 'center',
+                    'fonts'    => [ 'size' => '12' ],
                 ],
                 'elements' => [
                     'center' => [
                         'text'  => $total,
-                        'color' => '#2c3e50',
+                        'color' => ($config['style'] === 'pandora_black') ? '#ffffff' : '#2c3e50',
                     ],
                 ],
                 'labels'   => $labels,
                 'colors'   => [
                     '#82b92e',
                     '#e63c52',
-                    '#E4E4E4',
+                    ($config['style'] === 'pandora_black') ? '#666' : '#E4E4E4',
                 ],
             ]
         );

pandora_console/include/styles/pandora_black.css

@@ -814,7 +814,7 @@ form ul.form_flex {
 
 .container-layout {
   border-radius: 5px;
-  border: 3px dashed #fff;
+  border: 3px dashed var(--border-color);
   background: #222;
   padding: 10px 0px 10px 0px;
 }
@@ -1585,7 +1585,7 @@ a.autorefresh_txt,
 }
 
 .grid-stack-item-content {
-  box-shadow: 0px 0px 15px -10px #888;
+  box-shadow: 0px 0px 7px 1px #8888882b;
   border-radius: 0px 0px 0px 0px;
 }
 
@@ -2095,6 +2095,14 @@ select option:checked {
   filter: invert(1);
 }
 
+.grid-stack-item-content {
+  background-color: var(--secondary-color);
+}
+
+#result_order .show_result_interpreter #result_items li.active {
+  background-color: var(--secondary-color);
+}
+
 .color_666 {
   color: var(--text-color);
 }

pandora_console/install.php

@@ -131,7 +131,7 @@
         <div style='padding-bottom: 50px'>
             <?php
             $version = '7.0NG.776';
-            $build = '240422';
+            $build = '240424';
             $banner = "v$version Build $build";
             error_reporting(0);
 

pandora_console/pandora_console.redhat.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -6,7 +6,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb_data.sql

@@ -2863,7 +2863,7 @@ SET @short_name = 'pandorafms.vmware';
 SET @name = 'VMware';
 SET @section = 'app';
 SET @description = 'Monitor ESXi hosts, datastores and VMs from a specific datacenter';
-SET @version = '1.3';
+SET @version = '1.4';
 INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
 SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.776-240422
+Version: 7.0NG.776-240424
 Architecture: all
 Priority: optional
 Section: admin

pandora_server/DEBIAN/make_deb_package.sh

@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.776-240422"
+pandora_version="7.0NG.776-240424"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -46,7 +46,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.776";
-my $pandora_build = "240422";
+my $pandora_build = "240424";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/PluginTools.pm

@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.776";
-my $pandora_build = "240422";
+my $pandora_build = "240424";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/pandora_server.redhat.spec

@@ -7,7 +7,7 @@
 %define debug_package %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -4,7 +4,7 @@
 %global __os_install_post %{nil}
 %define name        pandorafms_server
 %define version     7.0NG.776
-%define release     240422
+%define release     240424
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.776"
-PI_BUILD="240422"
+PI_BUILD="240424"
 
 MODE=$1
 if [ $# -gt 1 ]; then

pandora_server/util/pandora_db.pl

@@ -38,7 +38,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.776 Build 240422";
+my $version = "7.0NG.776 Build 240424";
 
 # Pandora server configuration
 my %conf;

pandora_server/util/pandora_manage.pl

@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.776 Build 240422";
+my $version = "7.0NG.776 Build 240424";
 
 # save program name for logging
 my $progname = basename($0);