Merge branch 'develop' into 'ent-6030-Problema-de-codificacion'

# Conflicts:
#   pandora_console/include/functions_config.php

pandora_agents/unix/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.746-200611
+Version: 7.0NG.746-200623
 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.746-200611"
+pandora_version="7.0NG.746-200623"
 
 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

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

pandora_agents/unix/pandora_agent.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.746"
-PI_BUILD="200611"
+PI_BUILD="200623"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{200611}
+{200623}
 
 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.746(Build 200611)")
+#define PANDORA_VERSION ("7.0NG.746(Build 200623)")
 
 string pandora_path;
 string pandora_dir;

pandora_agents/win32/versioninfo.rc

@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.746(Build 200611))"
+      VALUE "ProductVersion", "(7.0NG.746(Build 200623))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.746-200611
+Version: 7.0NG.746-200623
 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.746-200611"
+pandora_version="7.0NG.746-200623"
 
 package_pear=0
 package_pandora=1

pandora_console/extras/mr/39.sql

@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE `tmensajes` ADD COLUMN `hidden_sent` TINYINT(1) UNSIGNED DEFAULT 0;
+
+COMMIT;

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -2314,6 +2314,7 @@ ALTER TABLE `tmensajes` ADD COLUMN `response_mode` VARCHAR(200) DEFAULT NULL;
 ALTER TABLE `tmensajes` ADD COLUMN `citicity` INT(10) UNSIGNED DEFAULT '0';
 ALTER TABLE `tmensajes` ADD COLUMN `id_source` BIGINT(20) UNSIGNED NOT NULL;
 ALTER TABLE `tmensajes` ADD COLUMN `subtype` VARCHAR(255) DEFAULT '';
+ALTER TABLE `tmensajes` ADD COLUMN `hidden_sent` TINYINT(1) UNSIGNED DEFAULT 0;
 ALTER TABLE `tmensajes` ADD CONSTRAINT `tsource_fk` FOREIGN KEY (`id_source`) REFERENCES `tnotification_source` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
 ALTER TABLE `tmensajes` DROP COLUMN `id_usuario_destino`,
 	ADD UNIQUE INDEX `id_mensaje` (`id_mensaje`);

pandora_console/godmode/agentes/module_manager_editor_wmi.php

@@ -43,7 +43,47 @@ if (empty($update_module_id)) {
 
 $data = [];
 $data[0] = __('Target IP').' '.ui_print_help_icon('wmi_module_tab', true);
-$data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
+
+if ($page == 'enterprise/godmode/policies/policy_modules') {
+    if ($ip_target != 'auto' && $ip_target != '') {
+        $custom_ip_target = $ip_target;
+        $ip_target = 'custom';
+    } else if ($ip_target == '') {
+        $ip_target = 'force_pri';
+        $custom_ip_target = '';
+    } else {
+        $custom_ip_target = '';
+    }
+
+    $target_ip_values = [];
+    $target_ip_values['auto']      = __('Auto');
+    $target_ip_values['force_pri'] = __('Force primary key');
+    $target_ip_values['custom']    = __('Custom');
+
+    $data[1] = html_print_select(
+        $target_ip_values,
+        'ip_target',
+        $ip_target,
+        '',
+        '',
+        '',
+        true,
+        false,
+        false,
+        '',
+        false,
+        'width:200px;'
+    );
+
+    $data[1] .= html_print_input_text('custom_ip_target', $custom_ip_target, '', 15, 60, true);
+} else {
+    if ($ip_target == 'auto') {
+        $ip_target = agents_get_address($id_agente);
+    }
+
+    $data[1] = html_print_input_text('ip_target', $ip_target, '', 15, 60, true);
+}
+
 $data[2] = __('Namespace').ui_print_help_tip(__('Optional. WMI namespace. If unsure leave blank.'), true);
 $data[3] = html_print_input_text(
     'tcp_send',
@@ -136,3 +176,21 @@ $data[3] = html_print_input_text(
 );
 
 push_table_simple($data, 'key_field');
+?>
+<script type="text/javascript">
+$(document).ready (function () {
+    var custom_ip_target = "<?php echo $custom_ip_target; ?>";
+    if(custom_ip_target == ''){
+        $("#text-custom_ip_target").hide();
+    }
+    $('#ip_target').change(function() {
+        if($(this).val() == 'custom') {
+            $("#text-custom_ip_target").show();
+        }
+        else{
+            $("#text-custom_ip_target").hide();
+        }
+    });
+});
+
+</script>

pandora_console/godmode/alerts/alert_special_days.php

@@ -118,6 +118,10 @@ if ($create_special_day) {
     $values['id_group'] = (string) get_parameter('id_group');
     $values['description'] = (string) get_parameter('description');
 
+    $aviable_description = true;
+    if (preg_match('/script/i', $values['description'])) {
+        $aviable_description = false;
+    }
 
     $array_date = explode('-', $date);
 
@@ -142,8 +146,12 @@ if ($create_special_day) {
             $result = '';
             $messageAction = __('Could not be created, it already exists');
         } else {
-            $result = alerts_create_alert_special_day($date, $same_day, $values);
+            if ($aviable_description) {
-            $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$values['description'].'"}';
+                $result = alerts_create_alert_special_day($date, $same_day, $values);
+                $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$values['description'].'"}';
+            } else {
+                $result = false;
+            }
         }
     }
 
@@ -176,6 +184,11 @@ if ($update_special_day) {
     $id_group = (string) get_parameter('id_group');
     $id_group_orig = (string) get_parameter('id_group_orig');
 
+    $aviable_description = true;
+    if (preg_match('/script/i', $description)) {
+        $aviable_description = false;
+    }
+
     $array_date = explode('-', $date);
 
     $year  = $array_date[0];
@@ -206,12 +219,16 @@ if ($update_special_day) {
                 $result = '';
                 $messageAction = __('Could not be updated, it already exists');
             } else {
+                if ($aviable_description !== false) {
+                    $result = alerts_update_alert_special_day($id, $values);
+                    $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}';
+                }
+            }
+        } else {
+            if ($aviable_description !== false) {
                 $result = alerts_update_alert_special_day($id, $values);
                 $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}';
             }
-        } else {
-            $result = alerts_update_alert_special_day($id, $values);
-            $info = '{"Date":"'.$date.'","Same day of the week":"'.$same_day.'","Description":"'.$description.'"}';
         }
     }
 

pandora_console/godmode/groups/group_list.php

@@ -347,24 +347,32 @@ if (($create_group) && (check_acl($config['id_user'], 0, 'PM'))) {
     $check = db_get_value('nombre', 'tgrupo', 'nombre', $name);
     $propagate = (bool) get_parameter('propagate');
 
+    $aviable_name = true;
+    if (preg_match('/script/i', $name)) {
+        $aviable_name = false;
+    }
+
     // Check if name field is empty.
     if ($name != '') {
         if (!$check) {
-            $values = [
+            if ($aviable_name === true) {
-                'nombre'      => $name,
+                $values = [
-                'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
+                    'nombre'      => $name,
-                'parent'      => $id_parent,
+                    'icon'        => empty($icon) ? '' : substr($icon, 0, -4),
-                'disabled'    => $alerts_disabled,
+                    'parent'      => $id_parent,
-                'custom_id'   => $custom_id,
+                    'disabled'    => $alerts_disabled,
-                'id_skin'     => $skin,
+                    'custom_id'   => $custom_id,
-                'description' => $description,
+                    'id_skin'     => $skin,
-                'contact'     => $contact,
+                    'description' => $description,
-                'propagate'   => $propagate,
+                    'contact'     => $contact,
-                'other'       => $other,
+                    'propagate'   => $propagate,
-                'password'    => io_safe_input($group_pass),
+                    'other'       => $other,
-            ];
+                    'password'    => io_safe_input($group_pass),
+                ];
+
+                $result = db_process_sql_insert('tgrupo', $values);
+            }
 
-            $result = db_process_sql_insert('tgrupo', $values);
             if ($result) {
                 ui_print_success_message(__('Group successfully created'));
             } else {
@@ -394,8 +402,13 @@ if ($update_group) {
     $contact = (string) get_parameter('contact');
     $other = (string) get_parameter('other');
 
+    $aviable_name = true;
+    if (preg_match('/script/i', $name)) {
+        $aviable_name = false;
+    }
+
     // Check if name field is empty.
-    if ($name != '') {
+    if ($name != '' && $aviable_name === true) {
         $sql = sprintf(
             'UPDATE tgrupo
              SET nombre = "%s",
@@ -711,8 +724,8 @@ if ($tab == 'tree') {
                     [
                         'style' => '',
                         'class' => 'bot',
-                        'alt'   => $group['nombre'],
+                        'alt'   => io_safe_input($group['nombre']),
-                        'title' => $group['nombre'],
+                        'title' => io_safe_input($group['nombre']),
                     ],
                     false,
                     false,

pandora_console/godmode/massive/massive_operations.php

@@ -271,7 +271,7 @@ ui_print_page_header(
     $help_header,
     true,
     $onheader,
-    true,
+    false,
     'massivemodal'
 );
 

pandora_console/godmode/reporting/reporting_builder.list_items.php

@@ -471,7 +471,7 @@ foreach ($items as $item) {
             if ($is_inventory_item) {
                 $external_source = json_decode($item['external_source'], true);
                 $agents = $external_source['id_agents'];
-                $modules = $external_source['inventory_modules'];
+                $modules = io_safe_output($external_source['inventory_modules']);
 
                 $agent_name_db = [];
                 foreach ($agents as $a) {

pandora_console/godmode/reporting/reporting_builder.php

@@ -767,9 +767,14 @@ switch ($action) {
             )
         );
 
-
         if (count($reports)) {
+            $filters = [
+                'search'   => $search,
+                'id_group' => $id_group,
+            ];
+            $filtersStr = http_build_query($filters, '', '&');
             $url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder';
+            $url .= '&'.$filtersStr;
             ui_pagination($total_reports, $url, $offset, $pagination);
 
             $table = new stdClass();

pandora_console/godmode/tag/edit_tag.php

@@ -31,11 +31,10 @@ $id_tag = (int) get_parameter('id_tag', 0);
 $update_tag = (int) get_parameter('update_tag', 0);
 $create_tag = (int) get_parameter('create_tag', 0);
 $name_tag = (string) get_parameter('name_tag', '');
-$description_tag = (string) get_parameter('description_tag', '');
+$description_tag = io_safe_input(strip_tags(io_safe_output((string) get_parameter('description_tag'))));
-$description_tag = io_safe_input(strip_tags(io_safe_output($description_tag)));
 $url_tag = (string) get_parameter('url_tag', '');
-$email_tag = (string) get_parameter('email_tag', '');
+$email_tag = io_safe_input(strip_tags(io_safe_output(((string) get_parameter('email_tag')))));
-$phone_tag = (string) get_parameter('phone_tag', '');
+$phone_tag = io_safe_input(strip_tags(io_safe_output(((string) get_parameter('phone_tag')))));
 $tab = (string) get_parameter('tab', 'list');
 
 if (defined('METACONSOLE')) {

pandora_console/godmode/users/user_list.php

@@ -367,11 +367,11 @@ if ($search) {
         $found = false;
 
         if (!empty($filter_search)) {
-            if (preg_match('/.*'.$filter_search.'.*/', $user_info['fullname']) != 0) {
+            if (preg_match('/.*'.strtolower($filter_search).'.*/', strtolower($user_info['fullname'])) != 0) {
                 $found = true;
             }
 
-            if (preg_match('/.*'.$filter_search.'.*/', $user_info['id_user']) != 0) {
+            if (preg_match('/.*'.strtolower($filter_search).'.*/', strtolower($user_info['id_user'])) != 0) {
                 $found = true;
             }
 

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -629,6 +629,16 @@ class DiscoveryTaskList extends HTML
                         $data[6] .= __('Discovery.App.Oracle');
                     break;
 
+                    case DISCOVERY_APP_DB2:
+                        // Discovery Applications DB2.
+                        $data[6] = html_print_image(
+                            'images/network.png',
+                            true,
+                            ['title' => __('Discovery Applications DB2')]
+                        ).'  ';
+                        $data[6] .= __('Discovery.App.DB2');
+                    break;
+
                     case DISCOVERY_DEPLOY_AGENTS:
                         // Internal deployment task.
                         $no_operations = true;
@@ -722,6 +732,8 @@ class DiscoveryTaskList extends HTML
                     if ($task['disabled'] != 2 && $task['utimestamp'] > 0
                         && $task['type'] != DISCOVERY_APP_MYSQL
                         && $task['type'] != DISCOVERY_APP_ORACLE
+                        && $task['type'] != DISCOVERY_APP_DB2
+                        && $task['type'] != DISCOVERY_APP_SAP
                         && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
                     ) {
                         if (check_acl($config['id_user'], 0, 'MR')) {
@@ -879,6 +891,9 @@ class DiscoveryTaskList extends HTML
             case DISCOVERY_APP_ORACLE:
             return 'wiz=app&mode=oracle&page=0';
 
+            case DISCOVERY_APP_DB2:
+            return 'wiz=app&mode=DB2&page=0';
+
             case DISCOVERY_CLOUD_AWS:
             case DISCOVERY_CLOUD_AWS_EC2:
             return 'wiz=cloud&mode=amazonws&ki='.$task['auth_strings'].'&page=1';

pandora_console/godmode/wizards/HostDevices.class.php

@@ -692,9 +692,7 @@ class HostDevices extends Wizard
             if ($this->page == 1) {
                 $title = __(
                     '"%s" features',
-                    io_safe_output(
+                    $this->task['name']
-                        $this->task['name']
-                    )
                 );
             }
 

pandora_console/godmode/wizards/Wizard.main.php

@@ -832,7 +832,7 @@ class Wizard
                     $first_block_printed = true;
                 }
 
-                $output .= '<div class="edit_discovery_info '.$row['class'].'" style="'.$row['style'].'">';
+                $row_output = '<div class="edit_discovery_info '.$row['class'].'" style="'.$row['style'].'">';
 
                 foreach ($row['columns'] as $column) {
                     $width = isset($column['width']) ? 'width: '.$column['width'].';' : 'width: 100%;';
@@ -841,23 +841,36 @@ class Wizard
                     $extra_styles = isset($column['style']) ? $column['style'] : '';
                     $class = isset($column['class']) ? $column['class'] : '';
 
-                    $output .= '<div class="'.$class.'" ';
+                    $row_output .= '<div class="'.$class.'" ';
-                    $output .= ' style="'.$width.$padding_left.$padding_right;
+                    $row_output .= ' style="'.$width.$padding_left.$padding_right;
-                    $output .= $extra_styles.'">';
+                    $row_output .= $extra_styles.'">';
 
                     foreach ($column['inputs'] as $input) {
                         if (is_array($input)) {
                             if ($input['arguments']['type'] != 'submit') {
-                                $output .= $this->printBlockAsGrid($input, true);
+                                $row_output .= $this->printBlockAsGrid($input, true);
                             } else {
                                 $output_submit .= $this->printBlockAsGrid($input, true);
                             }
                         } else {
-                            $output .= $input;
+                            $row_output .= $input;
                         }
                     }
 
-                    $output .= '</div>';
+                    $row_output .= '</div>';
+                }
+
+                if (isset($row['toggle'])) {
+                    $output .= ui_print_toggle(
+                        [
+                            'content'        => $row_output,
+                            'name'           => $row['toggle_label'],
+                            'hidden_default' => ! (bool) $row['toggle'],
+                            'return'         => true,
+                        ]
+                    );
+                } else {
+                    $output .= $row_output;
                 }
 
                 $output .= '</div>';

pandora_console/include/ajax/events.php

@@ -1088,10 +1088,18 @@ if ($dialogue_event_response) {
 }
 
 if ($add_comment) {
+    $aviability_comment = true;
     $comment = get_parameter('comment');
+    if (preg_match('/script/i', io_safe_output($comment))) {
+        $aviability_comment = false;
+        $return = false;
+    }
+
     $event_id = get_parameter('event_id');
 
-    $return = events_comment($event_id, $comment, 'Added comment', $meta, $history);
+    if ($aviability_comment !== false) {
+        $return = events_comment($event_id, $comment, 'Added comment', $meta, $history);
+    }
 
     if ($return) {
         echo 'comment_ok';

pandora_console/include/api.php

@@ -261,6 +261,13 @@ if ($correctLogin) {
                         }
                     break;
 
+                    case 'event':
+                        // Preventive check for users if not available write events
+                        if (! check_acl($config['id_user'], $event['id_grupo'], 'EW')) {
+                            return false;
+                        }
+                    break;
+
                     default:
                         // Ignore.
                     break;

pandora_console/include/auth/mysql.php

@@ -85,7 +85,7 @@ function process_user_login($login, $pass, $api=false)
         return process_user_login_local($login, $pass, $api);
     } else {
         $login_remote = process_user_login_remote($login, io_safe_output($pass), $api);
-        if ($login_remote == false) {
+        if ($login_remote == false && $config['fallback_local_auth']) {
             return process_user_login_local($login, $pass, $api);
         } else {
             return $login_remote;
@@ -258,27 +258,32 @@ function process_user_login_remote($login, $pass, $api=false)
             return false;
         }
 
-        if (($config['auth'] === 'ad')
+        if (($config['auth'] === 'ad')) {
-            && (isset($config['ad_advanced_config']) && $config['ad_advanced_config'])
+            // Check if autocreate  remote users is active.
-        ) {
+            if ($config['autocreate_remote_users'] == 1) {
-            $return = enterprise_hook(
+                change_local_user_pass_ldap($login, $pass);
-                'prepare_permissions_groups_of_user_ad',
+            }
-                [
-                    $login,
-                    $pass,
-                    false,
-                    true,
-                    defined('METACONSOLE'),
-                ]
-            );
 
-            if ($return === 'error_permissions') {
+            if (isset($config['ad_advanced_config']) && $config['ad_advanced_config']) {
-                $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
+                $return = enterprise_hook(
-                return false;
+                    'prepare_permissions_groups_of_user_ad',
-            } else {
+                    [
-                if ($return === 'permissions_changed') {
+                        $login,
-                    $config['auth_error'] = __('Your permissions have changed. Please, login again.');
+                        $pass,
+                        false,
+                        true,
+                        defined('METACONSOLE'),
+                    ]
+                );
+
+                if ($return === 'error_permissions') {
+                    $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
                     return false;
+                } else {
+                    if ($return === 'permissions_changed') {
+                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
+                        return false;
+                    }
                 }
             }
         } else if ($config['auth'] === 'ldap') {

pandora_console/include/chart_generator.php

@@ -277,7 +277,8 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
                 $params['ttl'],
                 $params['sizeForTicks'],
                 $params['show'],
-                $params['date_to']
+                $params['date_to'],
+                $params['server_id']
             );
         break;
 

pandora_console/include/class/CustomNetScan.class.php

@@ -105,7 +105,7 @@ class CustomNetScan extends Wizard
         // from 'validation' page.
         if (isset($this->page) === true && $this->page === 1) {
             $task_id = get_parameter('task', null);
-            $taskname = get_parameter('taskname', '');
+            $taskname = io_safe_input(strip_tags(io_safe_output(get_parameter('taskname'))));
             $comment = get_parameter('comment', '');
             $server_id = get_parameter('id_recon_server', '');
             $id_group = get_parameter('id_group', '');

pandora_console/include/config_process.php

@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC200611';
+$build_version = 'PC200623';
 $pandora_version = 'v7.0NG.746';
 
 // Do not overwrite default timezone set if defined.

pandora_console/include/constants.php

@@ -149,8 +149,8 @@ define('COL_IGNORED', '#DDD');
 define('COL_ALERTFIRED', '#F36201');
 define('COL_MINOR', '#F099A2');
 define('COL_MAJOR', '#C97A4A');
-define('COL_INFORMATIONAL', '#E4E4E4');
+define('COL_INFORMATIONAL', '#4a83f3');
-define('COL_MAINTENANCE', '#4a83f3');
+define('COL_MAINTENANCE', '#E4E4E4');
 
 define('COL_GRAPH1', '#C397F2');
 define('COL_GRAPH2', '#FFE66C');
@@ -601,6 +601,7 @@ define('DISCOVERY_CLOUD_AWS_RDS', 7);
 define('DISCOVERY_CLOUD_AZURE_COMPUTE', 8);
 define('DISCOVERY_DEPLOY_AGENTS', 9);
 define('DISCOVERY_APP_SAP', 10);
+define('DISCOVERY_APP_DB2', 11);
 
 
 // Force task build tmp results.

pandora_console/include/functions.php

@@ -477,7 +477,8 @@ function set_user_language()
 
 
 /**
- * INTERNAL (use ui_print_timestamp for output): Transform an amount of time in seconds into a human readable
+ * INTERNAL (use ui_print_timestamp for output):
+ * Transform an amount of time in seconds into a human readable
  * strings of minutes, hours or days.
  *
  * @param integer $seconds Seconds elapsed time
@@ -488,17 +489,11 @@ function set_user_language()
  */
 function human_time_description_raw($seconds, $exactly=false, $units='large')
 {
-    switch ($units) {
+    if (isset($units) === false || empty($units) === true) {
-        case 'large':
+        $units = 'large';
-            $secondsString = __('seconds');
+    }
-            $daysString = __('days');
-            $monthsString = __('months');
-            $yearsString = __('years');
-            $minutesString = __('minutes');
-            $hoursString = __('hours');
-            $nowString = __('Now');
-        break;
 
+    switch ($units) {
         case 'tiny':
             $secondsString = __('s');
             $daysString = __('d');
@@ -508,6 +503,17 @@ function human_time_description_raw($seconds, $exactly=false, $units='large')
             $hoursString = __('h');
             $nowString = __('N');
         break;
+
+        default:
+        case 'large':
+            $secondsString = __('seconds');
+            $daysString = __('days');
+            $monthsString = __('months');
+            $yearsString = __('years');
+            $minutesString = __('minutes');
+            $hoursString = __('hours');
+            $nowString = __('Now');
+        break;
     }
 
     if (empty($seconds)) {
@@ -2136,7 +2142,7 @@ function check_sql($sql)
 {
     // We remove "*" to avoid things like SELECT * FROM tusuario
     // Check that it not delete_ as "delete_pending" (this is a common field in pandora tables).
-    if (preg_match('/\*|delete[^_]|drop|alter|modify|password|pass|insert|update/i', $sql)) {
+    if (preg_match('/([ ]*(delete|drop|alter|modify|password|pass|insert|update)\b[ \\]+)/i', $sql)) {
         return '';
     }
 
@@ -3718,6 +3724,14 @@ function series_type_graph_array($data, $show_elements_graph)
                     }
                 }
 
+                if ((int) $value['min'] === PHP_INT_MAX) {
+                    $value['min'] = 0;
+                }
+
+                if ((int) $value['max'] === (-PHP_INT_MAX)) {
+                    $value['max'] = 0;
+                }
+
                 $data_return['legend'][$key] .= __('Min:').remove_right_zeros(
                     number_format(
                         $value['min'],

pandora_console/include/functions_api.php

@@ -1506,6 +1506,12 @@ function api_set_new_agent($thrash1, $thrash2, $other, $thrash3)
         return;
     }
 
+    if ((int) $other['data'][3] == 0) {
+        $agent_creation_error = __('The agent could not be created, for security reasons use a group another than 0');
+        returnError('generic error', $agent_creation_error);
+        return;
+    }
+
     $alias                     = io_safe_input(trim(preg_replace('/[\/\\\|%#&$]/', '', $other['data'][0])));
     $direccion_agente          = io_safe_input($other['data'][1]);
     $nombre_agente             = hash('sha256', $direccion_agente.'|'.$direccion_agente.'|'.time().'|'.sprintf('%04d', rand(0, 10000)));
@@ -2048,31 +2054,31 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType)
                     // Filter by status
                     switch ($other['data'][2]) {
                         case 'warning':
-                            if ($status == 2) {
+                            if ($status == AGENT_MODULE_STATUS_WARNING || $status == AGENT_MODULE_STATUS_WARNING_ALERT) {
                                 $result_agents[] = $agent;
                             }
                         break;
 
                         case 'critical':
-                            if ($status == 1) {
+                            if ($status == AGENT_MODULE_STATUS_CRITICAL_BAD || $status == AGENT_MODULE_STATUS_CRITICAL_ALERT) {
                                 $result_agents[] = $agent;
                             }
                         break;
 
                         case 'unknown':
-                            if ($status == 3) {
+                            if ($status == AGENT_MODULE_STATUS_UNKNOWN) {
                                 $result_agents[] = $agent;
                             }
                         break;
 
                         case 'normal':
-                            if ($status == 0) {
+                            if ($status == AGENT_MODULE_STATUS_NORMAL || $status == AGENT_MODULE_STATUS_NORMAL_ALERT) {
                                 $result_agents[] = $agent;
                             }
                         break;
 
                         case 'alert_fired':
-                            if ($status == 4) {
+                            if ($status == AGENT_STATUS_ALERT_FIRED || $status == AGENT_MODULE_STATUS_WARNING_ALERT || $status == AGENT_MODULE_STATUS_CRITICAL_ALERT || $status == AGENT_MODULE_STATUS_NORMAL_ALERT) {
                                 $result_agents[] = $agent;
                             }
                         break;
@@ -8790,6 +8796,11 @@ function otherParameter2Filter($other, $return_as_array=false, $use_agent_name=f
         }
     }
 
+    // Esto es extraño, hablar con Tati
+    /*
+        $filter['1'] = $filter['sql'];
+    unset($filter['sql']); */
+
     if (isset($other['data'][4]) && $other['data'][4] != '') {
         $idTemplate = db_get_value_filter('id', 'talert_templates', ['name' => $other['data'][4]]);
         if ($idTemplate !== false) {
@@ -10721,6 +10732,83 @@ function get_events_with_user($trash1, $trash2, $other, $returnType, $user_in_db
 }
 
 
+/**
+ * Update an event
+ *
+ * @param string $id_event Id of the event for change.
+ * @param string $unused1  Without use.
+ * @param array  $params   Dictionary with field,value format with the data for update.
+ * @param string $unused2  Without use.
+ * @param string $unused3  Without use.
+ *
+ * @return void
+ */
+function api_set_event($id_event, $unused1, $params, $unused2, $unused3)
+{
+    // Get the event
+    $event = events_get_event($id_event, false, is_metaconsole());
+    // If event not exists, end the execution.
+    if ($event === false) {
+        returnError(
+            'event_not_exists',
+            'Event not exists'
+        );
+        return false;
+    }
+
+    $paramsSerialize = [];
+    // Serialize the data for update
+    if ($params['type'] === 'array') {
+        // Keys that is not available to change
+        $invalidKeys = [
+            'id_evento',
+            'id_agente',
+            'id_grupo',
+            'timestamp',
+            'utimestamp',
+            'id_agentmodule',
+            'ack_utimestamp',
+            'data',
+        ];
+
+        foreach ($params['data'] as $key_value) {
+            list($key, $value) = explode(',', $key_value, 2);
+            if (in_array($key, $invalidKeys) == false) {
+                $paramsSerialize[$key] = $value;
+            }
+        }
+    }
+
+    // In meta or node.
+    if (is_metaconsole() === true) {
+        $table = 'tmetaconsole_event';
+    } else {
+        $table = 'tevento';
+    }
+
+    // TODO. Stablish security for prevent sql injection?
+    // Update the row
+    $result = db_process_sql_update(
+        $table,
+        $paramsSerialize,
+        [ 'id_evento' => $id_event ]
+    );
+
+    // If update results failed
+    if (empty($result) === true || $result === false) {
+        returnError(
+            'failed_event_update',
+            __('Failed event update')
+        );
+        return false;
+    } else {
+        returnData('string', ['data' => 'Event updated']);
+    }
+
+    return;
+}
+
+
 /**
  *
  * @param $trash1

pandora_console/include/functions_clippy.php

@@ -285,7 +285,7 @@ function clippy_context_help($help=null)
 
     $return = '';
 
-    include_once 'include/help/clippy/'.$help.'.php';
+    include_once $config['homedir'].'/include/help/clippy/'.$help.'.php';
 
     ob_start();
     $function = 'clippy_'.$help;

pandora_console/include/functions_config.php

@@ -291,7 +291,7 @@ function config_update_config()
                         $error_update[] = __('Use custom encoding');
                     }
 
-                    if (!config_update_value('server_log_dir', get_parameter('server_log_dir'))) {
+                    if (!config_update_value('server_log_dir', io_safe_input(strip_tags(io_safe_output(get_parameter('server_log_dir')))))) {
                         $error_update[] = __('Server logs directory');
                     }
 
@@ -1204,8 +1204,8 @@ function config_update_config()
                     // --------------------------------------------------
                     // CUSTOM VALUES POST PROCESS
                     // --------------------------------------------------
-                    $custom_value = get_parameter('custom_value');
+                    $custom_value = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_value'))));
-                    $custom_text = get_parameter('custom_text');
+                    $custom_text = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_text'))));
                     $custom_value_add = (bool) get_parameter('custom_value_add', 0);
                     $custom_value_to_delete = get_parameter('custom_value_to_delete', 0);
 
@@ -1276,8 +1276,8 @@ function config_update_config()
                     // --------------------------------------------------
                     // MODULE CUSTOM UNITS
                     // --------------------------------------------------
-                    $custom_unit = get_parameter('custom_module_unit');
+                    $custom_unit = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_module_unit'))));
-                    $custom_unit_to_delete = get_parameter('custom_module_unit_to_delete', '');
+                    $custom_unit_to_delete = io_safe_input(strip_tags(io_safe_output(get_parameter('custom_module_unit_to_delete', ''))));
 
                     if (!empty($custom_unit)) {
                         if (!add_custom_module_unit(

pandora_console/include/functions_events.php

@@ -633,6 +633,14 @@ function events_update_status($id_evento, $status, $filter=null, $history=false)
             break;
 
             case EVENT_STATUS_VALIDATED:
+                events_change_owner(
+                    $id_evento,
+                    $config['id_user'],
+                    false,
+                    is_metaconsole() ? true : false,
+                    $history
+                );
+
                 $status_string = 'Validated';
             break;
 
@@ -1870,6 +1878,16 @@ function events_change_status(
         return false;
     }
 
+    if ($new_status == EVENT_STATUS_VALIDATED) {
+        events_change_owner(
+            $id_event,
+            $config['id_user'],
+            false,
+            $meta,
+            $history
+        );
+    }
+
     events_comment(
         $id_event,
         '',

pandora_console/include/functions_filemanager.php

@@ -369,11 +369,21 @@ if ($delete_file) {
         $config['filemanager']['message'] = ui_print_success_message(__('Deleted'), '', true);
 
         if (is_dir($filename)) {
-            rmdir($filename);
+            if (rmdir($filename)) {
-            $config['filemanager']['delete'] = 1;
+                $config['filemanager']['delete'] = 1;
+            } else {
+                $config['filemanager']['delete'] = 0;
+            }
         } else {
-            unlink($filename);
+            if (unlink($filename)) {
-            $config['filemanager']['delete'] = 1;
+                    $config['filemanager']['delete'] = 1;
+            } else {
+                $config['filemanager']['delete'] = 0;
+            }
+        }
+
+        if ($config['filemanager']['delete'] == 0) {
+            $config['filemanager']['message'] = ui_print_error_message(__('Deleted'), '', true);
         }
     }
 }
@@ -743,7 +753,7 @@ function filemanager_file_explorer(
 
             if (($editor) && (!$readOnly)) {
                 if (($typefile != 'bin') && ($typefile != 'pdf') && ($typefile != 'png') && ($typefile != 'jpg')
-                    && ($typefile != 'iso') && ($typefile != 'docx') && ($typefile != 'doc')
+                    && ($typefile != 'iso') && ($typefile != 'docx') && ($typefile != 'doc') && ($fileinfo['mime'] != MIME_DIR)
                 ) {
                     $hash = md5($fileinfo['realpath'].$config['dbpass']);
                     $data[4] .= "<a style='vertical-align: top;' href='$url&edit_file=1&hash=".$hash.'&location_file='.$fileinfo['realpath']."' style='float: left;'>".html_print_image('images/edit.png', true, ['style' => 'margin-top: 2px;', 'title' => __('Edit file')]).'</a>';

pandora_console/include/functions_html.php

@@ -1448,8 +1448,8 @@ function html_print_extended_select_for_time(
     }
 
     ob_start();
-    // Use the no_meta parameter because this image is only in the base console
+    // Use the no_meta parameter because this image is only in the base console.
-    echo '<div id="'.$uniq_name.'_default" style="width:100%;display:flex;align-items: baseline;">';
+    echo '<div id="'.$uniq_name.'_default" style="width:100%;display:inline">';
         html_print_select(
             $fields,
             $uniq_name.'_select',
@@ -1464,7 +1464,7 @@ function html_print_extended_select_for_time(
             $readonly,
             'font-size: xx-small;'.$select_style
         );
-        // The advanced control is only for admins
+        // The advanced control is only for admins.
     if ($admin) {
         echo ' <a href="javascript:">'.html_print_image(
             'images/pencil.png',
@@ -1483,7 +1483,7 @@ function html_print_extended_select_for_time(
 
     echo '</div>';
 
-    echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:flex;">';
+    echo '<div id="'.$uniq_name.'_manual" style="width:100%;display:inline;">';
         html_print_input_text($uniq_name.'_text', $selected, '', $size, 255, false, $readonly, false, '', $class);
 
         html_print_input_hidden($name, $selected, false, $uniq_name);
@@ -1514,15 +1514,15 @@ function html_print_extended_select_for_time(
     echo '</div>';
     echo "<script type='text/javascript'>
 		$(document).ready (function () {
-			period_select_init('$uniq_name', $allow_zero);
+			period_select_init('".$uniq_name."', ".(($allow_zero) ? 'true' : 'null').");
-			period_select_events('$uniq_name');
+			period_select_events('".$uniq_name."');
 		});
 		function period_select_".$name."_update(seconds) {
 			$('#text-".$uniq_name."_text').val(seconds);
 			adjustTextUnits('".$uniq_name."');
 			calculateSeconds('".$uniq_name."');
-			$('#".$uniq_name."_manual').css('display', 'flex');
+			$('#".$uniq_name."_manual').show();
-			$('#".$uniq_name."_default').css('display', 'none');
+			$('#".$uniq_name."_default').hide();
 		}
 	</script>";
     $returnString = ob_get_clean();
@@ -2123,13 +2123,6 @@ function html_print_input_number(array $settings):string
                 $settings['maxlength'] = 255;
             }
 
-            // Check Size.
-            if (isset($settings['size']) === false
-                || $settings['size'] === 0
-            ) {
-                $settings['size'] = 255;
-            }
-
             foreach ($settings as $attribute => $attr_value) {
                 // Check valid attribute.
                 if (in_array($attribute, $valid_attrs) === false) {

pandora_console/include/functions_messages.php

@@ -311,7 +311,7 @@ function messages_get_message_sent(int $message_id)
     $sql = sprintf(
         "SELECT id_usuario_origen, subject, mensaje, timestamp
         FROM tmensajes
-        WHERE id_usuario_origen='%s' AND id_mensaje=%d",
+        WHERE id_usuario_origen='%s' AND id_mensaje=%d AND hidden_sent = 0",
         $config['id_user'],
         $message_id
     );
@@ -431,7 +431,7 @@ function messages_get_count_sent(string $user='')
 
     $sql = sprintf(
         "SELECT COUNT(*)
-        FROM tmensajes WHERE id_usuario_origen='%s'",
+        FROM tmensajes WHERE id_usuario_origen='%s' AND hidden_sent = 0",
         $user
     );
 
@@ -579,6 +579,17 @@ function messages_get_overview_sent(
         $order .= ' DESC';
     }
 
+    $filter = [
+        'id_usuario_origen' => $config['id_user'],
+        'hidden_sent'       => 0,
+        'order'             => $order,
+    ];
+
+    return db_get_all_rows_filter(
+        'tmensajes',
+        $filter
+    );
+
     return db_get_all_rows_field_filter(
         'tmensajes',
         'id_usuario_origen',
@@ -661,3 +672,27 @@ function messages_get_url($message_id)
     // Return the message direction.
     return ui_get_full_url('index.php?sec=message_list&sec2=operation/messages/message_edit&read_message=1&id_message='.$message_id);
 }
+
+
+/**
+ * Deletes sent message
+ *
+ * @param integer $message_id Message id to get URL.
+ *
+ * @return boolean true when deleted, false in case of error
+ */
+function messages_delete_message_sent($id_message)
+{
+    global $config;
+
+    $ret = db_process_sql_update(
+        'tmensajes',
+        ['hidden_sent' => 1],
+        [
+            'id_mensaje'        => $id_message,
+            'id_usuario_origen' => $config['id_user'],
+        ]
+    );
+
+    return $ret;
+}

pandora_console/include/functions_reporting.php

@@ -160,7 +160,7 @@ function reporting_make_reporting_data(
 
     $return = [];
     if (!empty($report)) {
-        $contents = $report['contents'];
+        $contents = io_safe_output($report['contents']);
     } else {
         $report = io_safe_output(db_get_row('treport', 'id_report', $id_report));
         $contents = io_safe_output(
@@ -2236,7 +2236,7 @@ function reporting_inventory($report, $content, $type)
     $es = json_decode($content['external_source'], true);
 
     $id_agent = $es['id_agents'];
-    $module_name = $es['inventory_modules'];
+    $module_name = io_safe_input($es['inventory_modules']);
     if (empty($module_name)) {
         $module_name = [0 => 0];
     }
@@ -6147,7 +6147,13 @@ function reporting_advanced_sla(
                             $time_total += $time_interval;
 
                             if ($time_interval > 0) {
-                                $total_checks++;
+                                if (isset($current_data['type']) === false
+                                    || ((int) $current_data['type'] === 0
+                                    && $i !== 0)
+                                ) {
+                                    $total_checks++;
+                                }
+
                                 if ((isset($current_data['datos']))
                                     && ($current_data['datos'] !== false)
                                 ) {
@@ -6159,7 +6165,7 @@ function reporting_advanced_sla(
                                             $match = preg_match('/'.$max_value.'/', $current_data['datos']);
                                         }
 
-                                        // Take notice of $inverse_interval value,
+                                        // Take notice of $inverse_interval value.
                                         if ($inverse_interval == 0) {
                                             $sla_check_value = $match;
                                         } else {
@@ -6176,19 +6182,41 @@ function reporting_advanced_sla(
 
                                     // Not unknown nor not init values.
                                     if ($sla_check_value) {
-                                        $ok_checks++;
+                                        if (isset($current_data['type']) === false
+                                            || ((int) $current_data['type'] === 0
+                                            && $i !== 0)
+                                        ) {
+                                            $ok_checks++;
+                                        }
+
                                         $time_in_ok += $time_interval;
                                     } else {
-                                        $bad_checks++;
+                                        if (isset($current_data['type']) === false
+                                            || ((int) $current_data['type'] === 0
+                                            && $i !== 0)
+                                        ) {
+                                            $bad_checks++;
+                                        }
+
                                         $time_in_error += $time_interval;
                                     }
                                 } else {
                                     if ($current_data['datos'] === null) {
                                         $time_in_unknown += $time_interval;
-                                        $unknown_checks++;
+                                        if (isset($current_data['type']) === false
+                                            || ((int) $current_data['type'] === 0
+                                            && $i !== 0)
+                                        ) {
+                                            $unknown_checks++;
+                                        }
                                     } else if ($current_data['datos'] === false) {
                                         $time_in_not_init += $time_interval;
-                                        $not_init_checks++;
+                                        if (isset($current_data['type']) === false
+                                            || ((int) $current_data['type'] === 0
+                                            && $i !== 0)
+                                        ) {
+                                            $not_init_checks++;
+                                        }
                                     }
                                 }
                             }

pandora_console/include/functions_reporting_html.php

@@ -2142,10 +2142,24 @@ function reporting_html_historical_data($table, $item, $pdf=0)
     $table1->data = [];
     foreach ($item['data'] as $data) {
         if (!is_numeric($data[__('Data')])) {
-            $row = [
+            if (is_snapshot_data($data[__('Data')])) {
-                $data[__('Date')],
+                if ($config['command_snapshot']) {
-                $data[__('Data')],
+                    $row = [
-            ];
+                        $data[__('Date')],
+                        '<img style="width:300px" src="'.io_safe_input($data[__('Data')]).'"></a>',
+                    ];
+                } else {
+                    $row = [
+                        $data[__('Date')],
+                        wordwrap(io_safe_input($data[__('Data')]), 60, "<br>\n", true),
+                    ];
+                }
+            } else {
+                $row = [
+                    $data[__('Date')],
+                    $data[__('Data')],
+                ];
+            }
         } else {
             $row = [
                 $data[__('Date')],
@@ -2191,6 +2205,8 @@ function reporting_html_historical_data($table, $item, $pdf=0)
  */
 function reporting_html_database_serialized($table, $item, $pdf=0)
 {
+    global $config;
+
     $table1 = new stdClass();
     $table1->width = '100%';
     $table1->head = [
@@ -2205,9 +2221,19 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
 
     $table1->data = [];
     foreach ($item['data'] as $data) {
-        foreach ($data['data'] as $data_unserialied) {
+        foreach ($data['data'] as $data_unserialized) {
             $row = [$data['date']];
-            $row = array_merge($row, $data_unserialied);
+            foreach ($data_unserialized as $key => $data_value) {
+                if (is_snapshot_data($data_unserialized[$key])) {
+                    if ($config['command_snapshot']) {
+                        $data_unserialized[$key] = '<img style="width:300px" src="'.io_safe_input($data_value).'"></a>';
+                    } else {
+                        $data_unserialized[$key] = wordwrap(io_safe_input($data_value), 60, "<br>\n", true);
+                    }
+                }
+            }
+
+            $row = array_merge($row, $data_unserialized);
             $table1->data[] = $row;
         }
     }

pandora_console/include/functions_snmp_browser.php

@@ -159,7 +159,7 @@ function snmp_browser_get_html_tree(
         $status = (!empty($checked) && isset($checked[$level]));
         $output .= html_print_checkbox($checkbox_name, 0, $status, true, false, '').'&nbsp;<span>'.$level.'</span>';
         if (isset($sub_level['__VALUE__'])) {
-            $output .= '<span class="value" style="display: none;">&nbsp;=&nbsp;'.$sub_level['__VALUE__'].'</span>';
+            $output .= '<span class="value" style="display: none;">&nbsp;=&nbsp;'.io_safe_input($sub_level['__VALUE__']).'</span>';
         }
 
         $output .= '</li>';

pandora_console/include/graphs/flot/jquery.flot.exportdata.pandora.js

@@ -1,227 +1,19 @@
 (function ($) {
 	var options = {
-        export: {
+		export: {
-            export_data: false, // or true
+			export_data: false, // or true
-            labels_long: null,
+			labels_long: null,
-            homeurl: ''
+			homeurl: "",
-        }
+		},
-    };
+	};
-    
+
 	function init(plot) {
 		plot.exportDataCSV = function (args) {
 			//amount = plot.getOptions().export.type,
 			//options = options || {};
 
 			// Options
-			var type = 'csv';
+			var type = "csv";
-			type = type.toLowerCase().trim();
-
-			var graphData,
-				dataObject,
-				dataObjects = plot.getData(),
-				result = [];
-
-			// Throw errors
-			var retrieveDataOject = function (dataObjects, custom) {
-				var result;
-				if (typeof dataObjects === 'undefined')
-					throw new Error('Empty parameter');
-
-				// Try to retrieve the avg set (not 100% reliable, I know)
-				if (dataObjects.length == 1) {
-					result = dataObjects.shift();
-				}
-				if (dataObjects.length > 1) {
-					dataObjects.forEach(function (element) {
-						if(custom){
-							if (/^Avg.:/i.test(element.label)){
-								result = element;
-							}
-						} else {
-							result = element;
-						}
-					});
-
-					// If the avg set is missing, retrieve the first set
-					if (typeof result === 'undefined')
-						result = dataObjects.shift();
-				}
-
-				if (typeof result === 'undefined')
-					throw new Error('Empty result');
-
-				return result;
-			}
-
-			// Throw errors
-			var processDataObject = function (dataObject) {
-				var result;
-
-				if (typeof dataObject === 'undefined')
-					throw new Error('Empty parameter');
-
-				if (typeof dataObject.data === 'undefined'
-						|| !(dataObject.data instanceof Array))
-					throw new Error('Object malformed');
-
-				/* {
-				 *   head: [<column>,<column>,...,<column>],
-				 *   data: [
-				 *     [<data>,<data>,...,<data>],
-				 *     [<data>,<data>,...,<data>],
-				 *     ...,
-				 *     [<data>,<data>,...,<data>],
-				 *   ]
-				 * }
-				 */
-				if (type === 'csv') {
-					result = {
-						head: ['timestap', 'date', 'value', 'label'],
-						data: []
-					};
-
-					dataObject.data.forEach(function (item, index) {
-						var timestap = item[0];
-
-						var d = new Date(item[0]);
-						var monthNames = [
-							"Jan", "Feb", "Mar",
-							"Apr", "May", "Jun",
-							"Jul", "Aug", "Sep",
-							"Oct", "Nov", "Dec"
-						];
-
-						date_format = 	(d.getDate() <10?'0':'') + d.getDate() + " " +
-										monthNames[d.getMonth()] + " " +
-										d.getFullYear() + " " +
-										(d.getHours()<10?'0':'') + d.getHours() + ":" +
-										(d.getMinutes()<10?'0':'') + d.getMinutes() + ":" +
-										(d.getSeconds()<10?'0':'') + d.getSeconds();
-
-						var date  = date_format;
-
-						var value = item[1];
-
-						var clean_label = plot.getOptions().export.labels_long[dataObject.label];
-						clean_label = clean_label.replace( new RegExp("&#x20;", "g"), " ");
-						result.data.push([timestap, date, value, clean_label]);
-					});
-				}
-				/* [
-				 *   {
-				 *     'date': <date>,
-				 *     'value': <value>
-				 *   }
-				 * ],
-				 * [
-				 *   {
-				 *     'date': <date>,
-				 *     'value': <value>
-				 *   }
-				 * ],
-				 * ...,
-				 * [
-				 *   {
-				 *     'date': <date>,
-				 *     'value': <value>
-				 *   }
-				 * ]
-				 */
-				else if (type === 'json') {
-					result = [];
-
-					dataObject.data.forEach(function (item, index) {
-						var date = '', value = item[1];
-
-						// Long labels are preferred
-						if (typeof labels_long[index] !== 'undefined')
-							date = labels_long[index];
-						else if (typeof labels[index] !== 'undefined')
-							date = labels[index];
-
-						result.push({
-							'date': date,
-							'value': value,
-							'label': dataObject.label
-						});
-					});
-				}
-
-				if (typeof result === 'undefined')
-					throw new Error('Empty result');
-
-				return result;
-			}
-
-			try {
-				var elements = [];
-				var custom_graph = $('#hidden-custom_graph').val();
-
-				if (custom_graph) {
-					dataObject = retrieveDataOject(dataObjects,0);
-					dataObjects.forEach(function (element) {
-						elements.push(processDataObject(element));					
-					});
-					graphData = elements;
-				}
-				else {
-					dataObject = retrieveDataOject(dataObjects,1);
-					elements.push(processDataObject(dataObject));
-					graphData = elements;
-				}
-
-				// Transform the object data into a string
-				// cause PHP has limitations in the number
-				// of POST params received.
-				var graphDataStr = JSON.stringify(graphData);
-
-				// Build form
-				var $form = $('<form></form>'),
-					$dataInput = $('<input>'),
-					$typeInput = $('<input>'),
-					$separatorInput = $('<input>'),
-					$excelInput = $('<input>');
-
-				$dataInput
-					.prop('name', 'data')
-					.prop('type', 'text')
-					.prop('value', graphDataStr);
-
-				$typeInput
-					.prop('name', 'type')
-					.prop('type', 'text')
-					.prop('value', type);
-
-				$separatorInput
-					.prop('name', 'separator')
-					.prop('type', 'text')
-					.prop('value', ';');
-
-				$excelInput
-					.prop('name', 'excel_encoding')
-					.prop('type', 'text')
-					.prop('value', 0);
-
-				$form
-					.prop('method', 'POST')
-					.prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php')
-					.append($dataInput, $typeInput, $separatorInput, $excelInput)
-					.hide()
-					// Firefox made me write into the DOM for this :(
-					.appendTo('body')
-					.submit();
-			}
-			catch (e) {
-				alert('There was an error exporting the data');
-			}
-		}
-
-		plot.exportDataJSON = function (args) {
-			//amount = plot.getOptions().export.type,
-			//options = options || {};
-
-			// Options
-			var type = 'json';
 			type = type.toLowerCase().trim();
 
 			var graphData,
@@ -233,8 +25,8 @@
 			var retrieveDataOject = function (dataObjects) {
 				var result;
 
-				if (typeof dataObjects === 'undefined')
+				if (typeof dataObjects === "undefined")
-					throw new Error('Empty parameter');
+					throw new Error("Empty parameter");
 
 				// Try to retrieve the avg set (not 100% reliable, I know)
 				if (dataObjects.length == 1) {
@@ -242,31 +34,30 @@
 				}
 				if (dataObjects.length > 1) {
 					dataObjects.forEach(function (element) {
-						if (/^Avg.:/i.test(element.label))
+						if (/^Avg.:/i.test(element.label)) result = element;
-							result = element;
 					});
 
 					// If the avg set is missing, retrieve the first set
-					if (typeof result === 'undefined')
+					if (typeof result === "undefined") result = dataObjects.shift();
-						result = dataObjects.shift();
 				}
 
-				if (typeof result === 'undefined')
+				if (typeof result === "undefined") throw new Error("Empty result");
-					throw new Error('Empty result');
 
 				return result;
-			}
+			};
 
 			// Throw errors
 			var processDataObject = function (dataObject) {
 				var result;
 
-				if (typeof dataObject === 'undefined')
+				if (typeof dataObject === "undefined")
-					throw new Error('Empty parameter');
+					throw new Error("Empty parameter");
 
-				if (typeof dataObject.data === 'undefined'
+				if (
-						|| !(dataObject.data instanceof Array))
+					typeof dataObject.data === "undefined" ||
-					throw new Error('Object malformed');
+					!(dataObject.data instanceof Array)
+				)
+					throw new Error("Object malformed");
 
 				/* {
 				 *   head: [<column>,<column>,...,<column>],
@@ -278,74 +69,291 @@
 				 *   ]
 				 * }
 				 */
-				if (type === 'csv') {
+				if (type === "csv") {
-
 					result = {
-						head: ['date', 'value','label'],
+						head: ["timestap", "date", "value", "label"],
-						data: []
+						data: [],
 					};
 
 					dataObject.data.forEach(function (item, index) {
-						var date = '', value = item[1];
+						var timestap = item[0];
 
-						// Long labels are preferred
+						var d = new Date(item[0]);
-						if (typeof  plot.getOptions().export.labels_long[index] !== 'undefined')
+						var monthNames = [
-							date =  plot.getOptions().export.labels_long[index];
+							"Jan",
-						else if (typeof labels[index] !== 'undefined')
+							"Feb",
-							date = labels[index];
+							"Mar",
+							"Apr",
+							"May",
+							"Jun",
+							"Jul",
+							"Aug",
+							"Sep",
+							"Oct",
+							"Nov",
+							"Dec",
+						];
 
-						result.data.push([date, value,dataObject.label]);
+						date_format =
+							(d.getDate() < 10 ? "0" : "") +
+							d.getDate() +
+							" " +
+							monthNames[d.getMonth()] +
+							" " +
+							d.getFullYear() +
+							" " +
+							(d.getHours() < 10 ? "0" : "") +
+							d.getHours() +
+							":" +
+							(d.getMinutes() < 10 ? "0" : "") +
+							d.getMinutes() +
+							":" +
+							(d.getSeconds() < 10 ? "0" : "") +
+							d.getSeconds();
+
+						var date = date_format;
+
+						var value = item[1];
+
+						var clean_label = plot.getOptions().export.labels_long[
+							dataObject.label
+						];
+						clean_label = clean_label.replace(new RegExp("&#x20;", "g"), " ");
+						result.data.push([timestap, date, value, clean_label]);
 					});
-				}
+				} else if (type === "json") {
-				/* [
+					/* [
-				 *   {
+					 *   {
-				 *     'date': <date>,
+					 *     'date': <date>,
-				 *     'value': <value>
+					 *     'value': <value>
-				 *   }
+					 *   }
-				 * ],
+					 * ],
-				 * [
+					 * [
-				 *   {
+					 *   {
-				 *     'date': <date>,
+					 *     'date': <date>,
-				 *     'value': <value>
+					 *     'value': <value>
-				 *   }
+					 *   }
-				 * ],
+					 * ],
-				 * ...,
+					 * ...,
-				 * [
+					 * [
-				 *   {
+					 *   {
-				 *     'date': <date>,
+					 *     'date': <date>,
-				 *     'value': <value>
+					 *     'value': <value>
-				 *   }
+					 *   }
-				 * ]
+					 * ]
-				 */
+					 */
-				else if (type === 'json') {
 					result = [];
 
 					dataObject.data.forEach(function (item, index) {
-						var date = '', value = item[1];
+						var date = "",
+							value = item[1];
 
 						// Long labels are preferred
-						if (typeof labels_long[index] !== 'undefined')
+						if (typeof labels_long[index] !== "undefined")
 							date = labels_long[index];
-						else if (typeof labels[index] !== 'undefined')
+						else if (typeof labels[index] !== "undefined") date = labels[index];
-							date = labels[index];
 
 						result.push({
-							'date': date,
+							date: date,
-							'value': value,
+							value: value,
-							'label': dataObject.label
+							label: dataObject.label,
 						});
 					});
 				}
 
-				if (typeof result === 'undefined')
+				if (typeof result === "undefined") throw new Error("Empty result");
-					throw new Error('Empty result');
 
 				return result;
-			}
+			};
 
 			try {
 				var elements = [];
-				var custom_graph = $('input:hidden[name=custom_graph]').value;
+				dataObject = retrieveDataOject(dataObjects);
+				if (dataObject) {
+					elements.push(processDataObject(dataObject));
+				}
+				dataObjects.forEach(function (element) {
+					elements.push(processDataObject(element));
+				});
+				graphData = elements;
+
+
+				// Transform the object data into a string
+				// cause PHP has limitations in the number
+				// of POST params received.
+				var graphDataStr = JSON.stringify(graphData);
+
+				// Build form
+				var $form = $("<form></form>"),
+					$dataInput = $("<input>"),
+					$typeInput = $("<input>"),
+					$separatorInput = $("<input>"),
+					$excelInput = $("<input>");
+
+				$dataInput
+					.prop("name", "data")
+					.prop("type", "text")
+					.prop("value", graphDataStr);
+
+				$typeInput
+					.prop("name", "type")
+					.prop("type", "text")
+					.prop("value", type);
+
+				$separatorInput
+					.prop("name", "separator")
+					.prop("type", "text")
+					.prop("value", ";");
+
+				$excelInput
+					.prop("name", "excel_encoding")
+					.prop("type", "text")
+					.prop("value", 0);
+
+				$form
+					.prop("method", "POST")
+					.prop(
+						"action",
+						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+					)
+					.append($dataInput, $typeInput, $separatorInput, $excelInput)
+					.hide()
+					// Firefox made me write into the DOM for this :(
+					.appendTo("body")
+					.submit();
+			} catch (e) {
+				alert("There was an error exporting the data");
+			}
+		};
+
+		plot.exportDataJSON = function (args) {
+			//amount = plot.getOptions().export.type,
+			//options = options || {};
+
+			// Options
+			var type = "json";
+			type = type.toLowerCase().trim();
+
+			var graphData,
+				dataObject,
+				dataObjects = plot.getData(),
+				result = [];
+
+			// Throw errors
+			var retrieveDataOject = function (dataObjects) {
+				var result;
+
+				if (typeof dataObjects === "undefined")
+					throw new Error("Empty parameter");
+
+				// Try to retrieve the avg set (not 100% reliable, I know)
+				if (dataObjects.length == 1) {
+					result = dataObjects.shift();
+				}
+				if (dataObjects.length > 1) {
+					dataObjects.forEach(function (element) {
+						if (/^Avg.:/i.test(element.label)) result = element;
+					});
+
+					// If the avg set is missing, retrieve the first set
+					if (typeof result === "undefined") result = dataObjects.shift();
+				}
+
+				if (typeof result === "undefined") throw new Error("Empty result");
+
+				return result;
+			};
+
+			// Throw errors
+			var processDataObject = function (dataObject) {
+				var result;
+
+				if (typeof dataObject === "undefined")
+					throw new Error("Empty parameter");
+
+				if (
+					typeof dataObject.data === "undefined" ||
+					!(dataObject.data instanceof Array)
+				)
+					throw new Error("Object malformed");
+
+				/* {
+				 *   head: [<column>,<column>,...,<column>],
+				 *   data: [
+				 *     [<data>,<data>,...,<data>],
+				 *     [<data>,<data>,...,<data>],
+				 *     ...,
+				 *     [<data>,<data>,...,<data>],
+				 *   ]
+				 * }
+				 */
+				if (type === "csv") {
+					result = {
+						head: ["date", "value", "label"],
+						data: [],
+					};
+
+					dataObject.data.forEach(function (item, index) {
+						var date = "",
+							value = item[1];
+
+						// Long labels are preferred
+						if (
+							typeof plot.getOptions().export.labels_long[index] !== "undefined"
+						)
+							date = plot.getOptions().export.labels_long[index];
+						else if (typeof labels[index] !== "undefined") date = labels[index];
+
+						result.data.push([date, value, dataObject.label]);
+					});
+				} else if (type === "json") {
+					/* [
+					 *   {
+					 *     'date': <date>,
+					 *     'value': <value>
+					 *   }
+					 * ],
+					 * [
+					 *   {
+					 *     'date': <date>,
+					 *     'value': <value>
+					 *   }
+					 * ],
+					 * ...,
+					 * [
+					 *   {
+					 *     'date': <date>,
+					 *     'value': <value>
+					 *   }
+					 * ]
+					 */
+					result = [];
+
+					dataObject.data.forEach(function (item, index) {
+						var date = "",
+							value = item[1];
+
+						// Long labels are preferred
+						if (typeof labels_long[index] !== "undefined")
+							date = labels_long[index];
+						else if (typeof labels[index] !== "undefined") date = labels[index];
+
+						result.push({
+							date: date,
+							value: value,
+							label: dataObject.label,
+						});
+					});
+				}
+
+				if (typeof result === "undefined") throw new Error("Empty result");
+
+				return result;
+			};
+
+			try {
+				var elements = [];
+				var custom_graph = $("input:hidden[name=custom_graph]").value;
 
 				if (custom_graph) {
 					dataObject = retrieveDataOject(dataObjects);
@@ -353,8 +361,7 @@
 						elements.push(processDataObject(element));
 					});
 					graphData = elements;
-				}
+				} else {
-				else {
 					dataObject = retrieveDataOject(dataObjects);
 					elements.push(processDataObject(dataObject));
 					graphData = elements;
@@ -366,51 +373,53 @@
 				var graphDataStr = JSON.stringify(graphData);
 
 				// Build form
-				var $form = $('<form></form>'),
+				var $form = $("<form></form>"),
-					$dataInput = $('<input>'),
+					$dataInput = $("<input>"),
-					$typeInput = $('<input>'),
+					$typeInput = $("<input>"),
-					$separatorInput = $('<input>'),
+					$separatorInput = $("<input>"),
-					$excelInput = $('<input>');
+					$excelInput = $("<input>");
 
 				$dataInput
-					.prop('name', 'data')
+					.prop("name", "data")
-					.prop('type', 'text')
+					.prop("type", "text")
-					.prop('value', graphDataStr);
+					.prop("value", graphDataStr);
 
 				$typeInput
-					.prop('name', 'type')
+					.prop("name", "type")
-					.prop('type', 'text')
+					.prop("type", "text")
-					.prop('value', type);
+					.prop("value", type);
 
 				$separatorInput
-					.prop('name', 'separator')
+					.prop("name", "separator")
-					.prop('type', 'text')
+					.prop("type", "text")
-					.prop('value', ';');
+					.prop("value", ";");
 
 				$excelInput
-					.prop('name', 'excel_encoding')
+					.prop("name", "excel_encoding")
-					.prop('type', 'text')
+					.prop("type", "text")
-					.prop('value', 0);
+					.prop("value", 0);
 
 				$form
-					.prop('method', 'POST')
+					.prop("method", "POST")
-					.prop('action', plot.getOptions().export.homeurl + 'include/graphs/export_data.php')
+					.prop(
+						"action",
+						plot.getOptions().export.homeurl + "include/graphs/export_data.php"
+					)
 					.append($dataInput, $typeInput, $separatorInput, $excelInput)
 					.hide()
 					// Firefox made me write into the DOM for this :(
-					.appendTo('body')
+					.appendTo("body")
 					.submit();
+			} catch (e) {
+				alert("There was an error exporting the data");
 			}
-			catch (e) {
+		};
-				alert('There was an error exporting the data');
-			}
-		}
 	}
 
-    $.plot.plugins.push({
+	$.plot.plugins.push({
-        init: init,
+		init: init,
-        options: options,
+		options: options,
-        name: 'exportdata',
+		name: "exportdata",
-        version: '0.1'
+		version: "0.1",
-    });
+	});
-})(jQuery);
+})(jQuery);

pandora_console/include/graphs/flot/pandora.flot.js

@@ -3009,7 +3009,7 @@ function number_format(number, force_integer, unit, short_data, divisor) {
   var decimals = 2;
 
   if (unit == "KB") {
-    return number + unit;
+    return Math.round(number * decimals) + unit;
   }
 
   // Set maximum decimal precision to 99 in case short_data is not set.
@@ -3038,6 +3038,12 @@ function number_format(number, force_integer, unit, short_data, divisor) {
 
   if (divisor) {
     number = Math.round(number * decimals) / decimals;
+  } else {
+    number = Math.round(number * decimals);
+  }
+
+  if (isNaN(number)) {
+    number = 0;
   }
 
   return number + " " + shorts[pos] + unit;

pandora_console/include/graphs/functions_flot.php

@@ -226,14 +226,13 @@ function flot_area_graph(
         $config['custom_graph_width'],
         true
     );
-    /*
+    $return .= "<div id='timestamp_$graph_id'
-        $return .= "<div id='timestamp_$graph_id'
+                     class='timestamp_graph'
-                    class='timestamp_graph'
+                     style='font-size:".$params['font_size']."pt;
-                    style='    font-size:".$params['font_size']."pt;
+                        display:none; position:absolute;
-                            display:none; position:absolute;
+                        background:#fff; border: solid 1px #aaa;
-                            background:#fff; border: solid 1px #aaa;
+                        padding: 2px; z-index:1000;
-                            padding: 2px; z-index:1000;'></div>";
+                '></div>";
-    */
     $return .= "<div id='$graph_id' class='";
 
     if ($params['type'] == 'area_simple') {
@@ -699,6 +698,7 @@ function flot_slicesbar_graph(
             'show'               => $show,
             'return_img_base_64' => true,
             'date_to'            => $date_to,
+            'server_id'          => $server_id,
         ];
 
         $graph = '<img src="data:image/jpg;base64,';
@@ -738,7 +738,7 @@ function flot_slicesbar_graph(
 
     $maxticks = (int) 20;
     if ($sizeForTicks === false) {
-        $maxticks = (int) 20;
+        $maxticks = (int) 12;
     } else if ($sizeForTicks < 300) {
         $maxticks = (int) 3;
     } else if ($sizeForTicks < 600) {
@@ -808,7 +808,23 @@ function flot_slicesbar_graph(
     // Javascript code.
     $return .= "<script type='text/javascript'>";
     $return .= "//<![CDATA[\n";
-    $return .= "pandoraFlotSlicebar('$graph_id','$values','$datacolor','$legend',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive, '$show', $datelimit, $server_id)";
+    $return .= "pandoraFlotSlicebar(
+        '$graph_id',
+        '$values',
+        '$datacolor',
+        '$legend',
+        $intervaltick,
+        '$fontpath',
+        $fontsize,
+        '$separator',
+        '$separator2',
+        $id_agent,
+        '$full_legend_date',
+        $not_interactive,
+        '$show',
+        $datelimit,
+        '$server_id'
+    )";
     $return .= "\n//]]>";
     $return .= '</script>';
 

pandora_console/include/javascript/pandora.js

@@ -844,7 +844,7 @@ function post_process_select_events(name) {
 function period_select_init(name, allow_zero) {
   // Manual mode is hidden by default
   $("#" + name + "_manual").css("display", "none");
-  $("#" + name + "_default").css("display", "flex");
+  $("#" + name + "_default").css("display", "inline");
 
   // If the text input is empty, we put on it 5 minutes by default
   if ($("#text-" + name + "_text").val() == "") {
@@ -858,7 +858,7 @@ function period_select_init(name, allow_zero) {
     }
   } else if ($("#text-" + name + "_text").val() == 0 && allow_zero != true) {
     $("#" + name + "_units option:last").prop("selected", false);
-    $("#" + name + "_manual").css("display", "flex");
+    $("#" + name + "_manual").css("display", "inline");
     $("#" + name + "_default").css("display", "none");
   }
 }
@@ -947,13 +947,13 @@ function selectFirst(name) {
  */
 function toggleBoth(name) {
   if ($("#" + name + "_default").css("display") == "none") {
-    $("#" + name + "_default").css("display", "flex");
+    $("#" + name + "_default").css("display", "inline");
   } else {
     $("#" + name + "_default").css("display", "none");
   }
 
   if ($("#" + name + "_manual").css("display") == "none") {
-    $("#" + name + "_manual").css("display", "flex");
+    $("#" + name + "_manual").css("display", "inline");
   } else {
     $("#" + name + "_manual").css("display", "none");
   }

pandora_console/include/styles/wizard.css

@@ -70,9 +70,8 @@ ul.wizard li > textarea {
 }
 
 .wizard .discovery_inline_input {
-  display: flex;
+  display: inline;
   align-content: end;
-  flex: 0;
   align-self: flex-start;
 }
 

pandora_console/index.php

@@ -685,6 +685,11 @@ if (! isset($config['id_user'])) {
             unset($query_params_redirect['sec2']);
         }
 
+        // Dashboard do not want sec2.
+        if ($home_page == 'Dashboard') {
+            unset($query_params_redirect['sec2']);
+        }
+
         $redirect_url = '?logged=1';
         foreach ($query_params_redirect as $key => $value) {
             if ($key == 'login') {
@@ -1161,7 +1166,7 @@ if ($searchPage) {
                     if (($home_url == '') || ($id_visualc == false)) {
                         $str = 'sec=network&sec2=operation/visual_console/index&refr=60';
                     } else {
-                        $str = 'sec=network&sec2=operation/visual_console/render_view&id='.$id_visualc.'&refr=60';
+                        $str = 'sec=network&sec2=operation/visual_console/render_view&id='.$id_visualc;
                     }
 
                     parse_str($str, $res);

pandora_console/install.php

@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.746';
-            $build = '200611';
+            $build = '200623';
             $banner = "v$version Build $build";
 
             error_reporting(0);

pandora_console/operation/events/events.php

@@ -1962,17 +1962,7 @@ function process_datatables_item(item) {
 
     /* Agent ID link */
     if (item.id_agente > 0) {
-        <?php
+        item.id_agente = '<a href="'+url_link+item.id_agente+url_link_hash+'">' + item.id_agente + '</a>';
-        if (in_array('agent_name', $fields)) {
-            ?>
-            item.id_agente = '<a href="'+url_link+item.id_agente+url_link_hash+'">' + item.id_agente + '</a>';
-            <?php
-        } else {
-            ?>
-            item.id_agente = '<a href="'+url_link+item.id_agente+url_link_hash+'">' + item.agent_name + '</a>';
-            <?php
-        }
-        ?>
     } else {
         item.id_agente = '';
     }

pandora_console/operation/messages/message_edit.php

@@ -158,7 +158,7 @@ if ($read_message) {
     ).' '.$user_name.' '.__('wrote').":\n\n".$message['mensaje'];
 
 
-    echo '<form id="delete_message" method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&amp;delete_message=1&amp;id='.$message_id.'">';
+    echo '<form id="delete_message" method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent='.$show_sent.'&amp;delete_message=1&amp;id='.$message_id.'">';
     echo '</form>';
 
     echo '<form id="reply_message" method="post" action="index.php?sec=message_list&sec2=operation/messages/message_edit&amp;new_msg=1&amp;reply=1">';

pandora_console/operation/messages/message_list.php

@@ -78,7 +78,13 @@ if ($mark_unread) {
 
 if ($delete_msg) {
     $id = (int) get_parameter('id');
-    $result = messages_delete_message($id);
+
+    if ($show_sent) {
+        $result = messages_delete_message_sent($id);
+    } else {
+        $result = messages_delete_message($id);
+    }
+
     // Delete message function will actually check the credentials.
     ui_print_result_message(
         $result,
@@ -91,7 +97,11 @@ if ($multiple_delete) {
     $ids = (array) get_parameter('delete_multiple_messages', []);
 
     foreach ($ids as $id) {
-        $result = messages_delete_message($id);
+        if ($show_sent) {
+            $result = messages_delete_message_sent($id);
+        } else {
+            $result = messages_delete_message($id);
+        }
 
         if ($result === false) {
             break;

pandora_console/pandora_console.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 # User and Group under which Apache is running
 %define httpd_name  httpd

pandora_console/pandora_console.rhel7.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 # 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.746
-%define release     200611
+%define release     200623
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandoradb.sql

@@ -1291,6 +1291,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` (
 	`citicity` INT(10) UNSIGNED DEFAULT '0',
 	`id_source` BIGINT(20) UNSIGNED NOT NULL,
 	`subtype` VARCHAR(255) DEFAULT '',
+	`hidden_sent` TINYINT(1) UNSIGNED DEFAULT 0,
 	PRIMARY KEY (`id_mensaje`),
 	UNIQUE KEY `id_mensaje` (`id_mensaje`),
 	KEY `tsource_fk` (`id_source`),

pandora_console/vendor/mpdf/mpdf/src/Image/ImageProcessor.php

@@ -143,11 +143,14 @@ class ImageProcessor implements \Psr\Log\LoggerAwareInterface
 			}
 			$data = $this->mpdf->imageVars[$v[1]];
 			$file = md5($data);
+			
 		}
 
-		if (preg_match('/data:image\/(gif|jpeg|png);base64,(.*)/', $file, $v)) {
+		if (preg_match('~data:image/(gif|jpeg|png);base64,(.*)~', $file, $v)) {
 			$type = $v[1];
-			$data = base64_decode($v[2]);
+			$encoded = $v[2];
+			$decoded = "";
+			$data = base64_decode(html_entity_decode($encoded));
 			$file = md5($data);
 		}
 

pandora_server/DEBIAN/control

@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.746-200611
+Version: 7.0NG.746-200623
 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.746-200611"
+pandora_version="7.0NG.746-200623"
 
 package_cpan=0
 package_pandora=1

pandora_server/lib/PandoraFMS/Config.pm

@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.746";
-my $pandora_build = "200611";
+my $pandora_build = "200623";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -401,7 +401,8 @@ sub pandora_load_config {
 	$pa_config->{'max_log_generation'} = 1;
 
 	# Ignore the timestamp in the XML and use the file timestamp instead
-	$pa_config->{'use_xml_timestamp'} = 0; 
+	# If 1 => uses timestamp from received XML #5763.
+	$pa_config->{'use_xml_timestamp'} = 1;
 
 	# Server restart delay in seconds
 	$pa_config->{'restart_delay'} = 60; 

pandora_server/lib/PandoraFMS/DataServer.pm

@@ -234,6 +234,7 @@ sub data_consumer ($$) {
 		}
 
 		# Ignore the timestamp in the XML and use the file timestamp instead
+		# If 1 => uses timestamp from received XML #5763.
 		$xml_data->{'timestamp'} = strftime ("%Y-%m-%d %H:%M:%S", localtime((stat($file_name))[9])) if ($pa_config->{'use_xml_timestamp'} eq '0' || ! defined ($xml_data->{'timestamp'}));
 
 		# Double check that the file exists

pandora_server/lib/PandoraFMS/PluginTools.pm

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

pandora_server/lib/PandoraFMS/Recon/Base.pm

@@ -40,6 +40,7 @@ use constant {
   DISCOVERY_CLOUD_AZURE_COMPUTE => 8,
   DISCOVERY_DEPLOY_AGENTS => 9,
   DISCOVERY_APP_SAP => 10,
+  DISCOVERY_APP_DB2 => 11,
   DISCOVERY_REVIEW => 0,
   DISCOVERY_STANDARD => 1,
   DISCOVERY_RESULTS => 2,
@@ -1661,6 +1662,9 @@ sub database_scan($$$) {
     # Skip database scan in Oracle tasks
     next if defined($self->{'type'}) && $self->{'type'} == DISCOVERY_APP_ORACLE;
 
+    # Skip database scan in DB2 tasks
+    next if defined($self->{'type'}) && $self->{'type'} == DISCOVERY_APP_DB2;
+
     my $__data = $obj->scan_databases();
 
     if (ref($__data) eq "ARRAY") {
@@ -1705,6 +1709,8 @@ sub app_scan($) {
     $type = 'MySQL';
   } elsif ($self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE) {
     $type = 'Oracle';
+  } elsif ($self->{'task_data'}->{'type'} == DISCOVERY_APP_DB2) {
+    $type = 'DB2';
   } elsif ($self->{'task_data'}->{'type'} == DISCOVERY_APP_SAP) {
     $type = 'SAP';
   } else {
@@ -1787,7 +1793,9 @@ sub app_scan($) {
 
         # Scan connected obj.
         if (   $self->{'task_data'}->{'type'} == DISCOVERY_APP_MYSQL
-          || $self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE) {
+          || $self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE
+          || $self->{'task_data'}->{'type'} == DISCOVERY_APP_DB2
+        ) {
 
           # Database.
           $results = $self->database_scan($type, $obj, $global_percent, \@targets);
@@ -1894,6 +1902,7 @@ sub scan($) {
   if (defined($self->{'task_data'})) {
     if (    $self->{'task_data'}->{'type'} == DISCOVERY_APP_MYSQL
       ||  $self->{'task_data'}->{'type'} == DISCOVERY_APP_ORACLE
+      ||  $self->{'task_data'}->{'type'} == DISCOVERY_APP_DB2
       ||  $self->{'task_data'}->{'type'} == DISCOVERY_APP_SAP) {
       # Application scan.
       $self->call('message', "Scanning application ...", 6);

pandora_server/pandora_server.redhat.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.746
-%define release     200611
+%define release     200623
 
 Summary:            Pandora FMS Server
 Name:               %{name}

pandora_server/pandora_server_installer

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

pandora_server/util/pandora_db.pl

@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.746 PS200611";
+my $version = "7.0NG.746 PS200623";
 
 # 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.746 PS200611";
+my $version = "7.0NG.746 PS200623";
 
 # save program name for logging
 my $progname = basename($0);