Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red

extras/deploy-scripts/pandora_agent_deploy.sh

@@ -4,7 +4,7 @@
 
 # define variables
 PANDORA_AGENT_CONF=/etc/pandora/pandora_agent.conf
-S_VERSION='2021012801'
+S_VERSION='2021100601'
 LOGFILE="/tmp/pandora-agent-deploy-$(date +%F).log"
 
 # Ansi color code variables
@@ -83,6 +83,7 @@ execute_cmd  "[ $PANDORA_SERVER_IP ]" 'Check Server IP Address' 'Please define e
 OS=$([[ $(grep '^ID_LIKE=' /etc/os-release) ]] && grep ^ID_LIKE= /etc/os-release | cut -d '=' -f2 | tr -d '"' || grep ^ID= /etc/os-release | cut -d '=' -f2 | tr -d '"')
 
 [[ $OS == 'rhel fedora' ]] &&  OS_RELEASE=$OS
+[[ $OS == 'fedora' ]] &&  OS_RELEASE=$OS
 [[ $OS == 'centos rhel fedora' ]] &&  OS_RELEASE=$OS
 [[ $OS == 'debian' ]] &&  OS_RELEASE=$OS
 

pandora_agents/unix/DEBIAN/control

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

@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.757';
-use constant AGENT_BUILD => '211005';
+use constant AGENT_BUILD => '211006';
 
 # 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.757
-%define release     211005
+%define release     211006
 
 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.757
-%define release     211005
+%define release     211006
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}

pandora_agents/unix/pandora_agent_installer

@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.757"
-PI_BUILD="211005"
+PI_BUILD="211006"
 OS_NAME=`uname -s`
 
 FORCE=0

pandora_agents/win32/installer/pandora.mpi

@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{211005}
+{211006}
 
 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.757 Build 211005")
+#define PANDORA_VERSION ("7.0NG.757 Build 211006")
 
 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.757(Build 211005))"
+      VALUE "ProductVersion", "(7.0NG.757(Build 211006))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END

pandora_console/DEBIAN/control

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

pandora_console/extensions/agents_modules.php

@@ -331,6 +331,10 @@ function mainAgentsModules()
     $offset = (int) get_parameter('offset', 0);
     $hor_offset = (int) get_parameter('hor_offset', 0);
     $block = $config['block_size'];
+    if (intval($block) > 15) {
+        $block = '15';
+    }
+
     if (get_parameter('modulegroup') != null) {
         $agents_id = (array) get_parameter('id_agents2', null);
     }
@@ -543,7 +547,7 @@ function mainAgentsModules()
 
     if ($config['pure'] != 1) {
         $show_filters = '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" class="w100p">';
-        $show_filters .= '<table class="white_table w100p no-border" cellpadding="0" cellspacing="0" border="0">';
+        $show_filters .= '<table class="w100p no-border" cellpadding="0" cellspacing="0" border="0">';
             $show_filters .= '<tr>';
                 $show_filters .= '<td>'.$filter_groups_label.'</td>';
                 $show_filters .= '<td>'.$filter_groups.'&nbsp;&nbsp;&nbsp;'.$filter_recursion_label.$filter_recursion.'</td>';
@@ -561,7 +565,7 @@ function mainAgentsModules()
                 $show_filters .= '<td>'.$filter_modules.'</td>';
             $show_filters .= '</tr>';
             $show_filters .= '<tr>';
-                $show_filters .= "<td colspan=6 ><span class='right pdd_r_20px'>".$filter_update.'</span></td>';
+                $show_filters .= "<td colspan=6 ><span class='right pdd_r_35px mrgn_top_25px'>".$filter_update.'</span></td>';
             $show_filters .= '</tr>';
         $show_filters .= '</table>';
         $show_filters .= '</form>';

pandora_console/extensions/resource_registration.php

@@ -1081,12 +1081,18 @@ function resource_registration_extension_main()
     }
 
     if (is_management_allowed() === false) {
+        if (is_metaconsole() === false) {
+            $url = '<a target="_blank" href="'.ui_get_meta_url(
+                'index.php?sec=advanced&sec2=advanced/policymanager'
+            ).'">'.__('metaconsole').'</a>';
+        } else {
+            $url = __('any node');
+        }
+
         ui_print_warning_message(
             __(
                 'This node is configured with centralized mode. Go to %s to create a policy.',
-                '<a target="_blank" href="'.ui_get_meta_url(
+                $url
-                    'index.php?sec=advanced&sec2=advanced/policymanager'
-                ).'">'.__('metaconsole').'</a>'
             )
         );
 

pandora_console/godmode/agentes/modificar_agente.php

@@ -111,12 +111,18 @@ ui_print_standard_header(
 );
 
 if (is_management_allowed() === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. Go to %s to delete an agent',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -139,7 +139,7 @@ function add_component_selection($id_network_component_type)
         true,
         '',
         false,
-        'width: 460px; '
+        'width: 350px; '
     );
     $data[1] .= '</span>';
     $data[1] .= ' <span id="component_loading" class="invisible">';

pandora_console/godmode/alerts/alert_actions.php

@@ -215,12 +215,18 @@ if ($delete_action) {
 
 $is_management_allowed = is_management_allowed();
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/alert_actions&tab=action&pure=0'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alert actions information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/alert_actions&tab=action&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/alerts/alert_commands.php

@@ -616,12 +616,18 @@ if ($copy_command) {
 
 $is_management_allowed = is_management_allowed();
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/alert_commands&tab=command&pure=0'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/alert_commands&tab=command&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/alerts/alert_templates.php

@@ -260,12 +260,18 @@ if ($delete_template) {
 }
 
 if (is_management_allowed() === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/alert_templates&tab=template'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alert templates information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/alert_templates&tab=template'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/alerts/configure_alert_action.php

@@ -104,12 +104,18 @@ if (!$is_in_group && $al_action['id_group'] != 0) {
 $is_management_allowed = is_management_allowed();
 
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_action&tab=action&pure=0&id='.$id
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alert actions information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_action&tab=action&pure=0&id='.$id
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/alerts/configure_alert_command.php

@@ -159,12 +159,18 @@ if (empty($fields_hidden) === false) {
 $is_management_allowed = is_management_allowed();
 
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_command&pure=0&id='.$id
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alert commands information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_command&pure=0&id='.$id
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/alerts/configure_alert_template.php

@@ -373,12 +373,18 @@ function update_template($step)
 $is_management_allowed = is_management_allowed();
 
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_template&pure=0&id='.$id.'&step='.$step
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All alerts templates information is read only. Go to Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/alerts/configure_alert_template&pure=0&id='.$id.'&step='.$step
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/category/category.php

@@ -92,12 +92,18 @@ if (is_metaconsole() === true) {
 $is_management_allowed = true;
 if (is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/category/category&tab=list&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All categories information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/category/category&tab=list&pure='.(int) $config['pure']
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/groups/group_list.php

@@ -382,12 +382,18 @@ if (is_metaconsole() === true) {
 $is_management_allowed = true;
 if (is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/groups/group_list&tab=groups'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All groups information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/groups/group_list&tab=groups'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/groups/modu_group_list.php

@@ -79,12 +79,18 @@ if (is_metaconsole() === false) {
 $is_management_allowed = true;
 if (is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/component_management&tab=module_group'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All module groups information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/component_management&tab=module_group'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/massive/massive_add_profiles.php

@@ -39,12 +39,18 @@ if (!check_acl($config['id_user'], 0, 'UM')) {
 }
 
 if (is_management_allowed() === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All profiles user information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 

pandora_console/godmode/massive/massive_delete_profiles.php

@@ -39,12 +39,18 @@ if (! check_acl($config['id_user'], 0, 'UM')) {
 }
 
 if (is_management_allowed() === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All profiles user information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 

pandora_console/godmode/massive/massive_operations.php

@@ -334,12 +334,18 @@ $agentstab = [
         }
 
         if ($tab == 'massive_policies' && is_management_allowed() === false) {
+            if (is_metaconsole() === false) {
+                $url = '<a target="_blank" href="'.ui_get_meta_url(
+                    'index.php?sec=advanced&sec2=advanced/policymanager'
+                ).'">'.__('metaconsole').'</a>';
+            } else {
+                $url = __('any node');
+            }
+
             ui_print_warning_message(
                 __(
                     'This node is configured with centralized mode. All policies information is read only. Go to %s to manage it.',
-                    '<a target="_blank" href="'.ui_get_meta_url(
+                    $url
-                        'index.php?sec=advanced&sec2=advanced/policymanager'
-                    ).'">'.__('metaconsole').'</a>'
                 )
             );
             return;
@@ -401,12 +407,18 @@ $agentstab = [
 
 <?php
 if (is_management_allowed() === false && $option == 'delete_agents') {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. To delete agents go to %s',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=monitoring&sec2=monitoring/wizard/wizard'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/modules/manage_nc_groups.php

@@ -271,12 +271,18 @@ foreach ($groups as $group) {
 }
 
 if (is_management_allowed() === false && is_metaconsole() === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/modules/manage_nc_groups'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. Component groups are read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/modules/manage_nc_groups'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/modules/manage_network_components.php

@@ -297,12 +297,18 @@ if (is_metaconsole() === true) {
 }
 
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=godmode/modules/manage_network_components&tab=network&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All remote components are read only. Go to %s to manage them.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=godmode/modules/manage_network_components&tab=network&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/reporting/reporting_builder.php

@@ -1251,16 +1251,7 @@ switch ($action) {
                 array_push($table->data, $data);
             }
 
-            if ($columnview) {
-                $count = 0;
-                foreach ($table->data as $datos) {
-                    if (!isset($datos[9])) {
-                        $table->data[$count][9] = '';
-                    }
 
-                    $count++;
-                }
-            }
 
             html_print_table($table);
             ui_pagination(

pandora_console/godmode/setup/os.list.php

@@ -40,12 +40,18 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 $is_management_allowed = true;
 if (is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=list&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All OS definitions are read only. Go to %s to manage them.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&tab2=list&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/setup/snmp_wizard.php

@@ -97,7 +97,7 @@ $table->data['editor'] = [
     'oid'          => html_print_input_text('oid_editor', '', '', 40, 255, true),
     'description'  => html_print_input_text('description_editor', '', '', 40, 255, true),
     'post_process' => html_print_input_text('post_process_editor', '', '', 20, 255, true),
-    'op'           => '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_save_snmp" href="javascript: save_translation();">'.html_print_image('images/save_mc.png', true, ['title' => __('Save')]).'</a>'.'<a class="button_update_snmp invisible" href="javascript: update_snmp();">'.html_print_image('images/update.png', true, ['title' => __('Update'), 'class' => 'invert_filter']).'</a>'.'<a class="cancel_button_snmp invisible" href="javascript: cancel_snmp();">'.html_print_image('images/cancel.png', true, ['title' => __('Cancel')]).'</a>',
+    'op'           => '<img class="loading invisible" src="'.'images/spinner.gif'.'" />'.'<a class="button_save_snmp" href="javascript: save_translation();">'.html_print_image('images/save_mc.png', true, ['title' => __('Save'), 'class' => 'invert_filter']).'</a>'.'<a class="button_update_snmp invisible" href="javascript: update_snmp();">'.html_print_image('images/update.png', true, ['title' => __('Update'), 'class' => 'invert_filter']).'</a>'.'<a class="cancel_button_snmp invisible" href="javascript: cancel_snmp();">'.html_print_image('images/cancel.png', true, ['title' => __('Cancel')]).'</a>',
 ];
 
 

pandora_console/godmode/tag/tag.php

@@ -171,12 +171,18 @@ if ($delete !== 0) {
 
 $is_management_allowed = is_management_allowed();
 if ($is_management_allowed === false) {
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/component_management'
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All tags information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/component_management'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/users/profile_list.php

@@ -102,12 +102,18 @@ $id_profile = (int) get_parameter('id');
 $is_management_allowed = true;
 if (is_metaconsole() === false && is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All profiles information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/users_setup&tab=profile&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/users/user_list.php

@@ -397,12 +397,18 @@ $table->data[0][4] = html_print_submit_button(
 $is_management_allowed = true;
 if (is_metaconsole() === false && is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/users_setup&tab=user&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All users information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/users_setup&tab=user&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -1652,9 +1652,9 @@ class DiscoveryTaskList extends HTML
         $license = enterprise_hook('license_get_info');
 
         if (is_array($license) === true
-            && $n_agents > ($license['limit'] - $license['count'])
+            && $n_agents > ($license['limit'] - $license['count_enabled'])
         ) {
-            $limit = ($license['limit'] - $license['count']);
+            $limit = ($license['limit'] - $license['count_enabled']);
             echo json_encode(
                 [
                     'error' => __(

pandora_console/include/class/AgentWizard.class.php

@@ -1227,7 +1227,7 @@ class AgentWizard extends HTML
                         $this->idPolicy,
                         io_safe_input($module['name'])
                     );
-                    $msgError = __('Module exist in policy');
+                    $msgError = __('Module exists in policy');
                 } else {
                     $sql = sprintf(
                         "SELECT id_agente_modulo
@@ -1237,7 +1237,7 @@ class AgentWizard extends HTML
                         $this->idAgent,
                         io_safe_input($module['name'])
                     );
-                    $msgError = __('Module exist in agent');
+                    $msgError = __('Module exists in agent');
                 }
 
                 $existInDb = db_get_value_sql($sql);
@@ -1931,7 +1931,7 @@ class AgentWizard extends HTML
                 // Already defined.
                 $this->message['type'][] = 'error';
                 $this->message['message'][] = __(
-                    'Module "%s" exits in this agent',
+                    'Module "%s" exists in this agent',
                     $candidate['name']
                 );
                 $errorflag = true;
@@ -3965,7 +3965,7 @@ class AgentWizard extends HTML
 
                 $class = '';
                 if ($activeModules === 1) {
-                    $class = 'alpha50';
+                    $class = 'alpha50 pdd_0px';
                 }
 
                 $table->head[6] = html_print_checkbox_switch_extended(
@@ -3997,7 +3997,7 @@ class AgentWizard extends HTML
                     '',
                     true,
                     '',
-                    'alpha50'
+                    'alpha50 pdd_0px'
                 );
             }
 
@@ -4196,7 +4196,9 @@ class AgentWizard extends HTML
                         false,
                         'switchBlockControl(event)',
                         '',
-                        true
+                        true,
+                        '',
+                        'pdd_0px'
                     );
                 } else {
                     // WIP. Current value of this module.
@@ -4222,7 +4224,9 @@ class AgentWizard extends HTML
                         false,
                         'switchBlockControl(event)',
                         'form="form-create-modules"',
-                        true
+                        true,
+                        '',
+                        'pdd_0px'
                     );
                 }
 
@@ -5681,22 +5685,28 @@ class AgentWizard extends HTML
                         .parent()
                         .removeClass("alpha50");
                         if (selectedBlock.prop("checked")) {
-                        // Set to active the values of fields.
+                            // Set all inputs in block to checked.
-                            for (i = 0; i<=15; i++) {
+                            var blockItems = document.querySelectorAll('[id^="hidden-module-active-'+switchName[2]+'"]');
-                                document.getElementById("hidden-module-active-" + switchName[2] + "_"+i+"-"+i).value = 1;
+
-                            }
+                            blockItems.forEach(function(item) {
-                            // Set checked.
+                                item.value = 1;
+                            });
+
+                            // Set block selector to checked.
                             $("[id*=checkbox-sel_module_" + blockNumber + "]")
                                 .each(function() {
                                     $(this).prop("checked", true);
                                 });
                             imageInfoModules.removeClass('hidden');
                         } else {
-                        // Set to inactive the values of fields.
+                            // Set all inputs in block to unchecked.
-                            for (i = 0; i<=15; i++) {
+                            var blockItems = document.querySelectorAll('[id^="hidden-module-active-'+switchName[2]+'"]');
-                                document.getElementById("hidden-module-active-" + switchName[2] + "_"+i+"-"+i).value = 0;
+
-                            }
+                            blockItems.forEach(function(item) {
-                            // Set unchecked.
+                                item.value = 0;
+                            });
+
+                            // Set block selector to unchecked.
                             $("[id*=checkbox-sel_module_" + blockNumber + "]")
                                 .each(function() {
                                     $(this).prop("checked", false);

pandora_console/include/class/ConsoleSupervisor.php

@@ -1400,6 +1400,10 @@ class ConsoleSupervisor
         $PHPmemory_limit_min = config_return_in_bytes('800M');
         $PHPSerialize_precision = ini_get('serialize_precision');
 
+        if (is_metaconsole() === true) {
+            $PHPmemory_limit_min = config_return_in_bytes('-1');
+        }
+
         // PhantomJS status.
         $phantomjs_dir = io_safe_output($config['phantomjs_bin']);
         $result_ejecution = exec($phantomjs_dir.'/phantomjs --version');
@@ -1504,6 +1508,11 @@ class ConsoleSupervisor
                 $url = 'http://php.net/manual/es/ini.core.php#ini.memory-limit';
             }
 
+            $recommended_memory = '800M';
+            if (is_metaconsole() === true) {
+                $recommended_memory = '-1';
+            }
+
             $this->notify(
                 [
                     'type'    => 'NOTIF.PHP.MEMORY_LIMIT',
@@ -1513,7 +1522,7 @@ class ConsoleSupervisor
                     ),
                     'message' => sprintf(
                         __('Recommended value is: %s'),
-                        sprintf(__('%s or greater'), '800M')
+                        sprintf(__('%s or greater'), $recommended_memory)
                     ).'<br><br>'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator'),
                     'url'     => $url,
                 ]

pandora_console/include/config_process.php

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

pandora_console/include/db/mysql.php

@@ -1291,23 +1291,6 @@ function mysql_db_process_sql_rollback()
 }
 
 
-/**
- * Put quotes if magic_quotes protection
- *
- * @param string Text string to be protected with quotes if magic_quotes protection is disabled
- */
-function mysql_safe_sql_string($string)
-{
-    if (get_magic_quotes_gpc() == 0) {
-        return $string;
-    }
-
-    global $config;
-
-    return mysql_real_escape_string($config['dbconnection'], $string);
-}
-
-
 /**
  * Get last error.
  *

pandora_console/include/db/oracle.php

@@ -1496,21 +1496,6 @@ function oracle_db_process_sql_rollback()
 }
 
 
-/**
- * Put quotes if magic_quotes protection
- *
- * @param string Text string to be protected with quotes if magic_quotes protection is disabled
- */
-function oracle_safe_sql_string($string)
-{
-    if (get_magic_quotes_gpc() == 0) {
-        return $string;
-    }
-
-    return oracle_escape_string_sql($string);
-}
-
-
 /**
  * Get last error.
  *

pandora_console/include/db/postgresql.php

@@ -1098,23 +1098,6 @@ function postgresql_db_process_sql_rollback()
 }
 
 
-/**
- * Put quotes if magic_quotes protection
- *
- * @param string Text string to be protected with quotes if magic_quotes protection is disabled
- */
-function postgresql_safe_sql_string($string)
-{
-    if (get_magic_quotes_gpc() == 0) {
-        return $string;
-    }
-
-    global $config;
-
-    return pg_escape_string($config['dbconnection'], $string);
-}
-
-
 /**
  * Get last error.
  *

pandora_console/include/functions.php

@@ -1689,32 +1689,6 @@ if (!function_exists('mb_strtoupper')) {
 }
 
 
-/**
- * Put quotes if magic_quotes protection
- *
- * @param string Text string to be protected with quotes if magic_quotes protection is disabled
- */
-function safe_sql_string($string)
-{
-    global $config;
-
-    switch ($config['dbtype']) {
-        case 'mysql':
-        return mysql_safe_sql_string($string);
-
-            break;
-        case 'postgresql':
-        return postgresql_safe_sql_string($string);
-
-            break;
-        case 'oracle':
-        return oracle_safe_sql_string($string);
-
-            break;
-    }
-}
-
-
 /**
  * Verifies if current Pandora FMS installation is a Metaconsole.
  *
@@ -1753,7 +1727,12 @@ function has_metaconsole()
  */
 function is_management_allowed($hkey='')
 {
-    return ( (is_metaconsole() && is_centrallised())
+    $nodes = db_get_value('count(*) as n', 'tmetaconsole_setup');
+    if ($nodes !== false) {
+        $nodes = (int) $nodes;
+    }
+
+    return ( (is_metaconsole() && (is_centrallised() || $nodes === 0))
         || (!is_metaconsole() && !is_centrallised())
         || (!is_metaconsole() && is_centrallised()) && $hkey == generate_hash_to_api());
 }

pandora_console/include/functions_alerts.php

@@ -1162,7 +1162,6 @@ function alerts_duplicate_alert_template($id_alert_template, $id_group)
     unset($template['name']);
     unset($template['id']);
     unset($template['type']);
-    $template['value'] = safe_sql_string($template['value']);
 
     return alerts_create_alert_template($name, $type, $template);
 }

pandora_console/include/functions_graph.php

@@ -1574,11 +1574,17 @@ function graphic_combined_module(
             $date_array['final_date'] = $params['date'];
             $date_array['start_date'] = ($params['date'] - $params['period']);
 
+            $server_name = metaconsole_get_server_by_id($modules[0]['server']);
+
             if ($params_combined['projection']) {
                 $output_projection = forecast_projection_graph(
                     $module_list[0],
                     $params['period'],
-                    $params_combined['projection']
+                    $params_combined['projection'],
+                    false,
+                    false,
+                    false,
+                    $server_name
                 );
             }
 

pandora_console/include/functions_html.php

@@ -1982,7 +1982,7 @@ function html_print_extended_select_for_time(
         html_print_select(
             $units,
             $uniq_name.'_units',
-            '60',
+            '1',
             ''.$script,
             $nothing,
             $nothing_value,
@@ -3752,7 +3752,7 @@ function html_print_checkbox_switch_extended(
         $name.($idcounter[$name] ? $idcounter[$name] : '')
     );
 
-    $output = '<label class="p-switch '.$classParent.'">';
+    $output = '<label class="p-switch pdd_0px'.$classParent.'">';
     $output .= '<input name="'.$name.'" type="checkbox" value="'.$value.'" '.($checked ? 'checked="checked"' : '');
     if ($id == '') {
         $output .= ' id="checkbox-'.$id_aux.'"';
@@ -3976,6 +3976,7 @@ function html_print_image(
             'onkeypress',
             'onkeydown',
             'onkeyup',
+            'onload',
             'pos_tree',
         ];
 

pandora_console/include/functions_io.php

@@ -82,11 +82,6 @@ function io_safe_input($value)
         return $value;
     }
 
-    // Clean the trash mix into string because of magic quotes.
-    if (get_magic_quotes_gpc() == 1) {
-        $value = stripslashes($value);
-    }
-
     if (! mb_check_encoding($value, 'UTF-8')) {
         $value = utf8_encode($value);
     }
@@ -158,11 +153,6 @@ function io_safe_input_html($value)
         return $value;
     }
 
-    // Clean the trash mix into string because of magic quotes.
-    if (get_magic_quotes_gpc() == 1) {
-        $value = stripslashes($value);
-    }
-
     if (! mb_check_encoding($value, 'UTF-8')) {
         $value = utf8_encode($value);
     }
@@ -380,21 +370,6 @@ function io_safe_output_xml($string)
 }
 
 
-/**
- * Avoid magic_quotes protection
- *
- * @param string Text string to be stripped of magic_quotes protection
- */
-function io_unsafe_string($string)
-{
-    if (get_magic_quotes_gpc()) {
-        return stripslashes($string);
-    }
-
-    return $string;
-}
-
-
 /**
  * Get a translated string
  *

pandora_console/include/functions_netflow.php

@@ -929,7 +929,12 @@ function netflow_get_filter_arguments($filter, $safe_input=false)
 
         // Normal filter.
         if ($filter['ip_dst'] != '') {
-            $filter_args .= ' (';
+            if ($filter_args != '') {
+                $filter_args .= ' and (';
+            } else {
+                $filter_args .= ' (';
+            }
+
             $val_ipdst = explode(',', io_safe_output($filter['ip_dst']));
             for ($i = 0; $i < count($val_ipdst); $i++) {
                 if ($i > 0) {
@@ -1754,7 +1759,9 @@ function netflow_update_second_level_filter(&$filter, $aggregate, $sources)
         $filter[$extra_filter] .= ',';
     }
 
-    $filter[$extra_filter] = implode(',', $sources);
+    if (!empty($sources)) {
+        $filter[$extra_filter] = implode(',', $sources);
+    }
 }
 
 

pandora_console/include/functions_networkmap.php

@@ -3032,6 +3032,7 @@ function erase_node($id)
         ['deleted' => 1],
         ['id_parent' => (int) $node['id']]
     );
+
     db_process_sql_update(
         'trel_item',
         ['deleted' => 1],
@@ -3045,6 +3046,7 @@ function erase_node($id)
             'type'   => 1,
         ]
     );
+
     foreach ($node_modules as $node_module) {
         $style = json_decode($node_module['style'], true);
 
@@ -4035,7 +4037,8 @@ function add_agent_node_in_option($id_networkmap, $id_agent, $x, $y)
 
     $new_node = db_get_row_sql(
         sprintf(
-            'SELECT * FROM titem WHERE id_map = $id_networkmap AND type = 0 AND source_data = %s',
+            'SELECT * FROM titem WHERE id_map = %s AND type = 0 AND source_data = %s',
+            $id_networkmap,
             $id_agent
         )
     );

pandora_console/include/functions_ui.php

@@ -4290,10 +4290,6 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             if (substr($fullurl, -1) != '/') {
                 $fullurl .= '/';
             }
-
-            if ($url == 'index.php' && is_metaconsole()) {
-                $fullurl .= ENTERPRISE_DIR.'/meta';
-            }
         } else if (!empty($config['public_url'])
             && (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
         ) {
@@ -4332,40 +4328,34 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             // Only add the home url.
             $url = $config['homeurl_static'].'/';
         }
-
-        if (is_metaconsole() && $metaconsole_root) {
-            $url .= 'enterprise/meta/';
-        }
     } else if (!strstr($url, '.php')) {
         if ($proxy) {
             $fullurl .= '/';
         } else {
             $fullurl .= $config['homeurl_static'].'/';
         }
-
-        if (is_metaconsole() && $metaconsole_root) {
-            $fullurl .= 'enterprise/meta/';
-        }
     } else {
-        if ($proxy) {
+        if ((bool) $proxy === false) {
-            $fullurl .= '/';
-        } else {
             if ($add_name_php_file) {
                 $fullurl .= $_SERVER['SCRIPT_NAME'];
             } else {
                 $fullurl .= $config['homeurl_static'].'/';
-
-                if (is_metaconsole() && $metaconsole_root) {
-                    $fullurl .= 'enterprise/meta/';
-                }
             }
         }
     }
 
-    if (substr($fullurl, -1, 1) === substr($url, 0, 1)) {
+    // Add last slash if missing.
-        if (substr($fullurl, -1, 1) === '/') {
+    if (substr($fullurl, -1, 1) !== '/') {
-            $url = substr($url, 1);
+        $fullurl .= '/';
-        }
+    }
+
+    // Remove starting slash if present.
+    if (substr($url, 0, 1) === '/') {
+        $url = substr($url, 1);
+    }
+
+    if (is_metaconsole() && $metaconsole_root) {
+        $fullurl .= 'enterprise/meta/';
     }
 
     return $fullurl.$url;

pandora_console/include/javascript/functions_pandora_networkmap.js

@@ -763,7 +763,6 @@ function move_to_networkmap(node) {
 }
 
 function edit_node(data_node, dblClick) {
-  console.log("PATATA");
   var flag_edit_node = true;
   var edit_node = null;
 

pandora_console/include/javascript/pandora_visual_console.js

@@ -1831,13 +1831,13 @@ function getTimeZoneVisualConsole(baseUrl, vcId, zone, callback) {
  * Draw a line between two elements in a div
  * 
  * @param line Line to draw. JavaScript object with the following properties:
-	- x1 X coordinate of the first point. If not set, it will get the coord from node_begin position
+  - x1 X coordinate of the first point. If not set, it will get the coord from node_begin position
-	- y1 Y coordinate of the first point. If not set, it will get the coord from node_begin position
+  - y1 Y coordinate of the first point. If not set, it will get the coord from node_begin position
-	- x2 X coordinate of the second point. If not set, it will get the coord from node_end position
+  - x2 X coordinate of the second point. If not set, it will get the coord from node_end position
-	- y2 Y coordinate of the second point. If not set, it will get the coord from node_end position
+  - y2 Y coordinate of the second point. If not set, it will get the coord from node_end position
-	- color Color of the line to draw
+  - color Color of the line to draw
-	- node_begin Id of the beginning node
+  - node_begin Id of the beginning node
-	- node_end Id of the finishing node
+  - node_end Id of the finishing node
  * @param id_div Div to draw the lines in
  * @param editor Boolean variable to set other css selector in editor (when true).
  */

pandora_console/include/lib/Core/DBMaintainer.php

@@ -133,7 +133,7 @@ final class DBMaintainer
     public function __construct(array $params)
     {
         $this->user = $params['user'];
-        $this->pass = $params['pass'];
+        $this->pass = io_output_password($params['pass']);
         $this->host = $params['host'];
         $this->port = $params['port'];
         $this->name = $params['name'];

pandora_console/include/rest-api/models/VisualConsole/Items/Odometer.php

@@ -53,6 +53,13 @@ final class Odometer extends Item
         $return['thresholds'] = $this->extractThresholds($data);
         $return['titleColor'] = $this->extractTitleColor($data);
         $return['title'] = $this->extractTitle($data);
+
+        $return['titleModule'] = $return['moduleName'];
+
+        if (strlen($return['moduleName']) >= 25) {
+            $return['moduleName'] = substr($return['moduleName'], 0, 9).' ... '.substr($return['moduleName'], -9);
+        }
+
         $return['minMaxValue'] = $this->extractMinMaxValue($data);
 
         return $return;

pandora_console/include/styles/pandora.css

@@ -6571,7 +6571,7 @@ div.graph div.legend table {
 */
 
 .pdd_0px {
-  padding: 0px;
+  padding: 0px !important;
 }
 .pdd_4px {
   padding: 4px;
@@ -6676,6 +6676,9 @@ div.graph div.legend table {
 .pdd_r_30px {
   padding-right: 30px;
 }
+.pdd_r_35px {
+  padding-right: 35px;
+}
 .pdd_r_40px {
   padding-right: 40px;
 }
@@ -6808,6 +6811,9 @@ div.graph div.legend table {
 .pdd_t_10px {
   padding-top: 10px;
 }
+.pdd_t_15px {
+  padding-top: 15px;
+}
 .pdd_t_20px {
   padding-top: 20px;
 }
@@ -7088,6 +7094,9 @@ div.graph div.legend table {
   max-height: 50px;
 }
 
+.mx_height150px {
+  max-height: 150px !important;
+}
 /*
 * HEIGHT PX
 */

pandora_console/include/styles/pandora_black.css

@@ -36,7 +36,8 @@ textarea,
 select,
 .edit_user_comments #textarea_comments,
 .discovery_textarea_input,
-.selection {
+.selection,
+button.sub {
   background-color: #111 !important;
   color: #fff !important;
 }
@@ -1198,3 +1199,6 @@ a.pandora_pagination,
   background-color: #222;
   color: #fff !important;
 }
+.bg_ccc {
+  background-color: #50505050 !important;
+}

pandora_console/install.php

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

pandora_console/operation/agentes/log_sources_status.php

@@ -13,9 +13,36 @@
 // GNU General Public License for more details.
 global $config;
 
-// Login check
+// Login check.
 check_login();
 
+?>
+<script type="text/javascript">
+
+function get_last_contact(source, agent_id) {
+    var params = {};
+    params["get_last_contact"] = 1;
+    params["page"] = "enterprise/include/ajax/log_viewer.ajax";
+    params["source"] = source;
+    params["agent_id"] = agent_id;
+
+    jQuery.ajax ({
+        data: params,
+        dataType: "html",
+        type: "POST",
+        url: "ajax.php",
+        success: function (data) {
+            var td = $(`#img-${source}`).parent();
+            td.empty();
+            td.html(data);
+            td.css('padding-left', '12px');
+        }
+    });
+}
+
+</script>
+
+<?php
 $agent_id = get_parameter_get('id_agente', 0);
 
 $table = new stdClass();
@@ -46,9 +73,19 @@ $logs = mysql_db_get_all_rows_sql($sql);
 foreach ($logs as $log) {
     $row['source'] = $log['source'];
     $row['review'] = '<a href="javascript:void(0)">'.html_print_image('images/zoom.png', true, ['title' => __('Review in log viewer'), 'alt' => '', 'onclick' => "send_form('".$log['source'].'-'.$agent_id."')"]).'</a>';
-    $row['last_contact'] = human_time_comparation($log['last_contact']);
+    $row['last_contact'] = html_print_image(
+        'images/spinner.gif',
+        true,
+        [
+            'id'     => 'img-'.$log['source'],
+            'border' => '0',
+            'width'  => '20px',
+            'heigth' => '20px',
+            'onload' => "get_last_contact('".$log['source']."', '".$agent_id."')",
+        ]
+    );
 
-    $table->data[] = $row;
+    $table->data[$log['source']] = $row;
 }
 
 ob_start();

pandora_console/operation/agentes/pandora_networkmap.editor.php

@@ -66,10 +66,7 @@ if ($new_networkmap) {
 $disabled_generation_method_select = false;
 $disabled_source = false;
 if ($edit_networkmap) {
-    if (enterprise_installed()) {
+    $disabled_generation_method_select = true;
-        $disabled_generation_method_select = true;
-    }
-
     $disabled_source = true;
 
     $values = db_get_row('tmap', 'id', $id);

pandora_console/operation/users/user_edit.php

@@ -237,12 +237,18 @@ if (is_metaconsole() === true) {
 $is_management_allowed = true;
 if (is_metaconsole() === false && is_management_allowed() === false) {
     $is_management_allowed = false;
+    if (is_metaconsole() === false) {
+        $url = '<a target="_blank" href="'.ui_get_meta_url(
+            'index.php?sec=advanced&sec2=advanced/users_setup&tab=user&pure='.(int) $config['pure']
+        ).'">'.__('metaconsole').'</a>';
+    } else {
+        $url = __('any node');
+    }
+
     ui_print_warning_message(
         __(
             'This node is configured with centralized mode. All users information is read only. Go to %s to manage it.',
-            '<a target="_blank" href="'.ui_get_meta_url(
+            $url
-                'index.php?sec=advanced&sec2=advanced/users_setup&tab=user&pure=0'
-            ).'">'.__('metaconsole').'</a>'
         )
     );
 }

pandora_console/pandora_console.redhat.spec

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

pandora_server/DEBIAN/control

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

pandora_server/bin/pandora_server

@@ -738,7 +738,9 @@ sub main() {
 
 	# Testing API url
 	my $curl_execution = "'".$Config{'console_api_url'}."?op=get&op2=test&apipass=".$Config{"console_api_pass"}."&user=".$Config{"console_user"}."&pass=".$Config{"console_pass"}."'";
-	my $exe_testing_api = `curl $curl_execution 2>/dev/null`;
+	# More than 30 secs is highly unrecommendated
+	my $command = $Config{'plugin_exec'}.' 30 curl '.$curl_execution.' 2>/dev/null';
+	my $exe_testing_api = `$command`;
 	my @res_testing_api = split(',', $exe_testing_api);
 	if ( $res_testing_api[0] ne 'OK' ) {
 		logger(\%Config, "Warning! The server does not have access to the API, this can trigger problems in the generation of reports and graphs.", 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.757";
-my $pandora_build = "211005";
+my $pandora_build = "211006";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash

pandora_server/lib/PandoraFMS/Goliat/GoliatTools.pm

@@ -83,7 +83,7 @@ sub g_unicode {
 	while ($pos < $len ) {
 	    my $item;
 	    $item = substr($config_word,$pos,1);
-	    $output = $output.$config_char.decToHex(ord($item));
+	    $output = $output.$config_char.g_decToHex(ord($item));
 	    $pos++;
 	}
 	$config_word = $output;
@@ -99,10 +99,10 @@ sub g_trash_unicode {
     my $config_depth = $_[0];
     my $config_char="%";
     my $a;
-    my $output;
+    my $output = "";
 
     for ($a=0;$a<$config_depth;$a++){
-	    $output = $output.$config_char.decToHex(int(rand(25)+97));
+	    $output = $output.$config_char.g_decToHex(int(rand(25)+97));
     }
     return $output
 }
@@ -113,9 +113,8 @@ sub g_trash_unicode {
 
 sub g_trash_ascii {
     my $config_depth = $_[0];
-    my $config_char="%";
     my $a;
-    my $output;
+    my $output = "";
 
     for ($a=0;$a<$config_depth;$a++){
 	    $output = $output.chr(int(rand(25)+97));

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.757";
-my $pandora_build = "211005";
+my $pandora_build = "211006";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );

pandora_server/lib/PandoraFMS/WebServer.pm

@@ -28,6 +28,8 @@ use File::Temp qw(tempfile);
 use HTML::Entities;
 use POSIX qw(strftime);
 
+use Encode;
+
 # Default lib dir for RPM and DEB packages
 use lib '/usr/lib/perl5';
 
@@ -207,7 +209,7 @@ sub data_consumer ($$) {
 	$task = subst_alert_macros ($task, \%macros);
 	
 	# Goliat has some trouble parsing conf files without the newlines
-	$fh->print ("\n\n" . $task . "\n\n");
+	$fh->print ("\n\n" . encode_utf8($task) . "\n\n");
 	close ($fh);
 
 	# Global vars needed by Goliat

pandora_server/pandora_server.redhat.spec

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

pandora_server/pandora_server.spec

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

pandora_server/pandora_server_installer

@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.757"
-PI_BUILD="211005"
+PI_BUILD="211006"
 
 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.757 Build 211005";
+my $version = "7.0NG.757 Build 211006";
 
 # 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.757 Build 211005";
+my $version = "7.0NG.757 Build 211006";
 
 # save program name for logging
 my $progname = basename($0);

visual_console_client/package.json

@@ -39,6 +39,7 @@
     "file-loader": "^3.0.1",
     "jest": "^24.9.0",
     "mini-css-extract-plugin": "^0.5.0",
+    "npm-watch": "^0.11.0",
     "postcss-loader": "^3.0.0",
     "prettier": "^1.19.1",
     "ts-jest": "^24.3.0",

visual_console_client/src/items/Odometer.ts

@@ -8,6 +8,7 @@ export type OdometerProps = {
   value: number;
   status: string;
   title: string | null;
+  titleModule: string;
   titleColor: string;
   odometerType: string;
   thresholds: string | any;
@@ -32,6 +33,7 @@ export function odometerPropsDecoder(data: AnyObject): OdometerProps | never {
     status: stringIsEmpty(data.status) ? "#B2B2B2" : data.status,
     titleColor: stringIsEmpty(data.titleColor) ? "#3f3f3f" : data.titleColor,
     title: stringIsEmpty(data.title) ? "" : data.title,
+    titleModule: stringIsEmpty(data.titleModule) ? "" : data.titleModule,
     thresholds: stringIsEmpty(data.thresholds) ? "" : data.thresholds,
     minMaxValue: stringIsEmpty(data.minMaxValue) ? "" : data.minMaxValue,
     odometerType: stringIsEmpty(data.odometerType)
@@ -208,10 +210,13 @@ export default class Odometer extends Item<OdometerProps> {
 
     const h2 = document.createElement("h2");
     if (this.props.title == "") {
-      h2.textContent = this.props.moduleName;
+      h2.textContent = this.truncateTitle(this.props.moduleName);
     } else {
       h2.textContent = this.truncateTitle(this.props.title);
     }
+    h2.title = this.props.titleModule;
+    h2.setAttribute("title", this.props.titleModule);
+
     h2.style.fontSize = `${anchoB * 0.06}px`;
     h2.style.color = `${this.props.titleColor}`;
     h2.style.lineHeight = "0";