diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 0c8792617b..bf5df0c125 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.735-190523
+Version: 7.0NG.735-190527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index ac72f9df38..08bb79494c 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/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.735-190523"
+pandora_version="7.0NG.735-190527"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 36c5b20673..c134985c2a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -42,7 +42,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.735';
-use constant AGENT_BUILD => '190523';
+use constant AGENT_BUILD => '190527';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index d9f1d82a64..006f14dec5 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index 39cb9b7c7d..9570f76a61 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index 714eefcd83..09dee41bfc 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190523"
+PI_BUILD="190527"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 491efab4e8..8ed0a773a6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190523}
+{190527}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1133383a2b..83f46ffda7 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/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.735(Build 190523)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190527)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 933dbb876d..f7c288faef 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/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.735(Build 190523))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190527))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6be861d642..f0c00292aa 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190523
+Version: 7.0NG.735-190527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index d202f2028e..aef18cc75d 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/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.735-190523"
+pandora_version="7.0NG.735-190527"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 1f2b3fd883..eae4be58b2 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -169,6 +169,9 @@ if ($registration) {
     }
 }
 
+
+$newsletter = null;
+
 ?>
 <script type="text/javascript">
 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 8ebfdb296a..4e3b399e96 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1220,6 +1220,7 @@ if ($update_module || $create_module) {
 
     // Get macros.
     $macros = (string) get_parameter('macros');
+    $macros_names = (array) get_parameter('macro_name', []);
 
     if (!empty($macros)) {
         $macros = json_decode(base64_decode($macros), true);
@@ -1230,10 +1231,18 @@ if ($update_module || $create_module) {
                 $m_hide = $m['hide'];
             }
 
-            if ($m_hide == '1') {
-                $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+            if ($update_module) {
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
+                } else {
+                    $macros[$k]['value'] = get_parameter($m['macro'], '');
+                }
             } else {
-                $macros[$k]['value'] = get_parameter($m['macro'], '');
+                if ($m_hide == '1') {
+                    $macros[$k]['value'] = io_input_password($macros_names[$k]);
+                } else {
+                    $macros[$k]['value'] = $macros_names[$k];
+                }
             }
         }
 
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 6b39172bca..f8fbd46c73 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -79,7 +79,7 @@ push_table_simple($data, 'plugin_1');
 $data = [];
 $data[0] = 'macro_desc';
 $data[0] .= ui_print_help_tip('macro_help', true);
-$data[1] = html_print_input_text('macro_name', 'macro_value', '', 100, 1024, true);
+$data[1] = html_print_input_text('macro_name[]', 'macro_value', '', 100, 1024, true);
 $table_simple->colspan['macro_field'][1] = 3;
 $table_simple->rowstyle['macro_field'] = 'display:none';
 
diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php
index 70d82c3af4..9e81bd3aaa 100755
--- a/pandora_console/godmode/massive/massive_operations.php
+++ b/pandora_console/godmode/massive/massive_operations.php
@@ -72,6 +72,7 @@ if (! check_acl($config['id_user'], 0, 'AW')) {
 
 $options_policies = [];
 $policies_options = enterprise_hook('massive_policies_options');
+$policies_options = array_unique($policies_options);
 
 if ($policies_options != ENTERPRISE_NOT_HOOK) {
     $options_policies = array_merge($options_policies, $policies_options);
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 61125b15c3..93806138cb 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -877,7 +877,7 @@ $class = 'databox filters';
         <tr id="row_label" style="" class="datos">
             <td style="font-weight:bold;">
                 <?php
-                echo __('Label').ui_print_help_icon('reports_label_field', true);
+                echo __('Label');
                 ?>
             </td>
             <td style="">
@@ -981,11 +981,6 @@ $class = 'databox filters';
             <td style="font-weight:bold;">
                 <?php
                 echo __('Period');
-                if ($type == 'projection_graph') {
-                    echo ui_print_help_icon('projection_graph', true);
-                } else {
-                    echo ui_print_help_icon('prediction_date', true);
-                }
                 ?>
             </td>
             <td style="">
@@ -1004,10 +999,7 @@ $class = 'databox filters';
         <tr id="row_estimate" style="" class="datos">
             <td style="font-weight:bold;">
                 <?php
-                echo __('Projection period').ui_print_help_icon(
-                    'projection_graph',
-                    true
-                );
+                echo __('Projection period');
                 ?>
             </td>
             <td style="">
@@ -1026,10 +1018,7 @@ $class = 'databox filters';
         <tr id="row_interval" style="" class="datos">
             <td style="font-weight:bold;">
             <?php
-            echo __('Data range').ui_print_help_icon(
-                'prediction_date',
-                true
-            );
+            echo __('Data range');
             ?>
             </td>
             <td>
@@ -4865,7 +4854,6 @@ function chooseType() {
     switch (type) {
         case 'event_report_agent':
         case 'simple_graph':
-        case 'agent_configuration':
         case 'event_report_module':
         case 'alert_report_agent':
         case 'alert_report_module':
@@ -4876,8 +4864,6 @@ function chooseType() {
         case 'min_value':
         case 'max_value':
         case 'avg_value':
-        case 'projection_graph':
-        case 'prediction_date':
         case 'TTRT':
         case 'TTO':
         case 'MTBF':
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 9addb32f26..b2a206a40a 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -745,7 +745,12 @@ function message_check_delete_items() {
 }
 
 function added_ids_deleted_items_to_hidden_input() {
-    message_check_delete_items();
+   var success = message_check_delete_items();
+
+   if(success === false){
+    $(".check_delete").prop("checked", false);
+       return false;
+   }
     
     var ids = '';
     var first = true;
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index c174951590..4717dd8681 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -28,7 +28,7 @@ $action_update_url_update_manager = (bool) get_parameter(
 );
 
 if (!$action_update_url_update_manager) {
-    $url_update_manager = get_parameter('url_update_manager', get_um_url());
+    $url_update_manager = get_parameter('url_update_manager', $config['url_update_manager']);
     $update_manager_proxy_server = get_parameter('update_manager_proxy_server', $config['update_manager_proxy_server']);
     $update_manager_proxy_port = get_parameter('update_manager_proxy_port', $config['update_manager_proxy_port']);
     $update_manager_proxy_user = get_parameter('update_manager_proxy_user', $config['update_manager_proxy_user']);
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ba38bbc3cb..e0180374e9 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC190523';
+$build_version = 'PC190527';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 4d1fed36e0..81a3365fc5 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1,16 +1,32 @@
 <?php
+/**
+ * Extension to manage a list of gateways and the node address where they should
+ * point to.
+ *
+ * @category   Graphs
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2011 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the  GNU Lesser General Public License
-// as published by the Free Software Foundation; version 2
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
 require_once $config['homedir'].'/include/graphs/fgraph.php';
 require_once $config['homedir'].'/include/functions_reporting.php';
 require_once $config['homedir'].'/include/functions_agents.php';
@@ -18,6 +34,17 @@ require_once $config['homedir'].'/include/functions_modules.php';
 require_once $config['homedir'].'/include/functions_users.php';
 
 
+/**
+ * Function for retun data extract aand uncompressed bbdd.
+ *
+ * @param integer $agent_module_id   ID.
+ * @param array   $date_array        Date stasrt finish and period.
+ * @param array   $data_module_graph Data module.
+ * @param array   $params            Params graphs.
+ * @param integer $series_suffix     Int.
+ *
+ * @return array Return data module.
+ */
 function grafico_modulo_sparse_data_chart(
     $agent_module_id,
     $date_array,
@@ -27,9 +54,12 @@ function grafico_modulo_sparse_data_chart(
 ) {
     global $config;
 
-    // To avoid showing all the data at the same time which can be reloaded, a system of boxes is made starting from a constant = 250
-    // and the selected period of time in addition to being able to reduce the level of boxes, that is, increasing the level of detail of the graph
-    // until the full option that would show all the points (data) that that period contains.
+    // To avoid showing all the data at the same time which can be reloaded,
+    // a system of boxes is made starting from a constant = 250
+    // and the selected period of time in addition to being able to reduce
+    // the level of boxes, that is, increasing the level of detail of the graph
+    // until the full option that would show all the points (data)
+    // that that period contains.
     $data_slice = ($date_array['period'] / (250 * $params['zoom']));
 
     if ($data_module_graph['id_module_type'] == 23
@@ -84,7 +114,7 @@ function grafico_modulo_sparse_data_chart(
         $data = [];
     }
 
-    // Get previous data
+    // Get previous data.
     $previous_data = modules_get_previous_data(
         $agent_module_id,
         $date_array['start_date']
@@ -96,7 +126,7 @@ function grafico_modulo_sparse_data_chart(
         array_unshift($data, $previous_data);
     }
 
-    // Get next data
+    // Get next data.
     $nextData = modules_get_next_data(
         $agent_module_id,
         $date_array['final_date']
@@ -106,7 +136,7 @@ function grafico_modulo_sparse_data_chart(
         unset($nextData['id_agente_modulo']);
         array_push($data, $nextData);
     } else if (count($data) > 0) {
-        // Propagate the last known data to the end of the interval
+        // Propagate the last known data to the end of the interval.
         $nextData = [
             'datos'      => $data[(count($data) - 1)]['datos'],
             'utimestamp' => $date_array['final_date'],
@@ -114,9 +144,8 @@ function grafico_modulo_sparse_data_chart(
         array_push($data, $nextData);
     }
 
-    // Check available data
+    // Check available data.
     if (count($data) < 1) {
-        // return fs_error_image ();
         return false;
     }
 
@@ -126,7 +155,7 @@ function grafico_modulo_sparse_data_chart(
     $array_percentil = [];
 
     foreach ($data as $k => $v) {
-        // convert array
+        // Convert array.
         if ($params['flag_overlapped']) {
             $array_data['sum'.$series_suffix]['data'][$k] = [
                 (($v['utimestamp'] + $date_array['period']  ) * 1000),
@@ -139,40 +168,43 @@ function grafico_modulo_sparse_data_chart(
             ];
         }
 
-        // min
+        // Min.
         if ($min_value > $v['datos']) {
             $min_value = $v['datos'];
         }
 
-        // max
+        // Max.
         if ($max_value < $v['datos']) {
             $max_value = $v['datos'];
         }
 
-        // avg
+        // Avg.
         $sum_data += $v['datos'];
         $count_data++;
 
-        // percentil
-        if (!is_null($params['percentil']) && $params['percentil']) {
+        // Percentil.
+        if (!isset($params['percentil']) && $params['percentil']) {
             $array_percentil[] = $v['datos'];
         }
     }
 
-    $array_data['sum'.$series_suffix]['min']            = $min_value;
-    $array_data['sum'.$series_suffix]['max']            = $max_value;
-    $array_data['sum'.$series_suffix]['avg']            = ($sum_data / $count_data);
+    $array_data['sum'.$series_suffix]['min'] = $min_value;
+    $array_data['sum'.$series_suffix]['max'] = $max_value;
+    $array_data['sum'.$series_suffix]['avg'] = ($sum_data / $count_data);
     $array_data['sum'.$series_suffix]['agent_module_id'] = $agent_module_id;
     $array_data['sum'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
-    $array_data['sum'.$series_suffix]['agent_name']     = $data_module_graph['agent_name'];
-    $array_data['sum'.$series_suffix]['module_name']    = $data_module_graph['module_name'];
-    $array_data['sum'.$series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
+    $array_data['sum'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
+    $array_data['sum'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
+    $array_data['sum'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
 
-    if (!is_null($params['percentil'])
+    if (!isset($params['percentil'])
         && $params['percentil']
         && !$params['flag_overlapped']
     ) {
-        $percentil_result = get_percentile($params['percentil'], $array_percentil);
+        $percentil_result = get_percentile(
+            $params['percentil'],
+            $array_percentil
+        );
         $array_data['percentil'.$series_suffix]['data'][0] = [
             ($date_array['start_date'] * 1000),
             $percentil_result,
@@ -188,6 +220,17 @@ function grafico_modulo_sparse_data_chart(
 }
 
 
+/**
+ * Prepare data for send to function js paint charts.
+ *
+ * @param integer $agent_module_id   ID.
+ * @param array   $date_array        Date stasrt finish and period.
+ * @param array   $data_module_graph Data module.
+ * @param array   $params            Params graphs.
+ * @param integer $series_suffix     Int.
+ *
+ * @return array Prepare data to paint js.
+ */
 function grafico_modulo_sparse_data(
     $agent_module_id,
     $date_array,
@@ -210,7 +253,7 @@ function grafico_modulo_sparse_data(
             $params['type_mode_graph']
         );
     } else {
-        // uncompress data except boolean and string.
+        // Uncompress data except boolean and string.
         if ($data_module_graph['id_module_type'] == 23
             || $data_module_graph['id_module_type'] == 3
             || $data_module_graph['id_module_type'] == 17
@@ -232,6 +275,7 @@ function grafico_modulo_sparse_data(
                     $series_suffix
                 );
         } else {
+            $data_slice = ($date_array['period'] / (250 * $params['zoom']) + 100);
             $array_data = fullscale_data(
                 $agent_module_id,
                 $date_array,
@@ -239,7 +283,7 @@ function grafico_modulo_sparse_data(
                 $params['percentil'],
                 $series_suffix,
                 $params['flag_overlapped'],
-                $data_slice    = ($date_array['period'] / (250 * $params['zoom']) + 100),
+                $data_slice,
                 $params['type_mode_graph']
             );
         }
@@ -253,12 +297,13 @@ function grafico_modulo_sparse_data(
 
     $array_data['sum'.$series_suffix]['agent_module_id'] = $agent_module_id;
     $array_data['sum'.$series_suffix]['id_module_type'] = $data_module_graph['id_module_type'];
-    $array_data['sum'.$series_suffix]['agent_name']     = $data_module_graph['agent_name'];
-    $array_data['sum'.$series_suffix]['module_name']    = $data_module_graph['module_name'];
-    $array_data['sum'.$series_suffix]['agent_alias']    = $data_module_graph['agent_alias'];
-    $array_data['sum'.$series_suffix]['unit']    = $data_module_graph['unit'];
+    $array_data['sum'.$series_suffix]['agent_name'] = $data_module_graph['agent_name'];
+    $array_data['sum'.$series_suffix]['module_name'] = $data_module_graph['module_name'];
+    $array_data['sum'.$series_suffix]['agent_alias'] = $data_module_graph['agent_alias'];
+    $array_data['sum'.$series_suffix]['unit'] = $data_module_graph['unit'];
 
-    // This is for a specific type of report that consists in passing an interval and doing the average sum and avg.
+    // This is for a specific type of report that consists in passing
+    // an interval and doing the average sum and avg.
     if ($params['force_interval'] != '') {
         $period_time_interval = ($date_array['period'] * 1000);
         $start_period = ($date_array['start_date'] * 1000);
@@ -270,7 +315,9 @@ function grafico_modulo_sparse_data(
 
         while ($period_time_interval > 0) {
             foreach ($array_data['sum1']['data'] as $key => $value) {
-                if ($value[0] >= $start_period && $value[0] < ($start_period + $params['time_interval'] * 1000)) {
+                if ($value[0] >= $start_period
+                    && $value[0] < ($start_period + $params['time_interval'] * 1000)
+                ) {
                     $sum_data = $value[1];
                     $array_data_only[] = $value[1];
                     $count_data++;
@@ -278,7 +325,9 @@ function grafico_modulo_sparse_data(
                 } else {
                     if ($params['force_interval'] == 'max_only') {
                         $acum_array_data[$i][0] = $start_period;
-                        if (is_array($array_data_only) && count($array_data_only) > 0) {
+                        if (is_array($array_data_only)
+                            && count($array_data_only) > 0
+                        ) {
                             $acum_array_data[$i][1] = max($array_data_only);
                             $data_last_acum = $array_data_only[(count($array_data_only) - 1)];
                         } else {
@@ -288,7 +337,9 @@ function grafico_modulo_sparse_data(
 
                     if ($params['force_interval'] == 'min_only') {
                         $acum_array_data[$i][0] = $start_period;
-                        if (is_array($array_data_only) && count($array_data_only) > 0) {
+                        if (is_array($array_data_only)
+                            && count($array_data_only) > 0
+                        ) {
                             $acum_array_data[$i][1] = min($array_data_only);
                             $data_last_acum = $array_data_only[(count($array_data_only) - 1)];
                         } else {
@@ -298,7 +349,9 @@ function grafico_modulo_sparse_data(
 
                     if ($params['force_interval'] == 'avg_only') {
                         $acum_array_data[$i][0] = $start_period;
-                        if (is_array($array_data_only) && count($array_data_only) > 0) {
+                        if (is_array($array_data_only)
+                            && count($array_data_only) > 0
+                        ) {
                             $acum_array_data[$i][1] = ($sum_data / $count_data);
                         } else {
                             $acum_array_data[$i][1] = $data_last_acum;
@@ -317,7 +370,7 @@ function grafico_modulo_sparse_data(
             $period_time_interval = ($period_time_interval - $params['time_interval']);
         }
 
-        // drag the last value to paint the graph correctly
+        // Drag the last value to paint the graph correctly.
         $acum_array_data[] = [
             0 => $start_period,
             1 => $acum_array_data[($i - 1)][1],
@@ -361,7 +414,6 @@ function grafico_modulo_sparse_data(
                     $date_array['final_date'],
                     $data_module_graph['history_db'],
                     1
-                    // fix the time ranges to start_date - final_date
                 );
 
                 if ($unknown_events !== false) {
@@ -496,57 +548,55 @@ function grafico_modulo_sparse_data(
 }
 
 
-/*
-    $params =array(
-        'agent_module_id'     => $agent_module_id,
-        'period'              => $period,
-        'show_events'         => false,
-        'width'               => $width,
-        'height'              => $height,
-        'title'               => '',
-        'unit_name'           => null,
-        'show_alerts'         => false,
-        'date'                => 0,
-        'unit'                => '',
-        'baseline'            => 0,
-        'return_data'         => 0,
-        'show_title'          => true,
-        'only_image'          => false,
-        'homeurl'             => $config['homeurl'],
-        'ttl'                 => 1,
-        'adapt_key'           => '',
-        'compare'             => false,
-        'show_unknown'        => false,
-        'menu'                => true,
-        'backgroundColor'     => 'white',
-        'percentil'           => null,
-        'dashboard'           => false,
-        'vconsole'            => false,
-        'type_graph'          => 'area',
-        'fullscale'           => false,
-        'id_widget_dashboard' => false,
-        'force_interval'      => '',
-        'time_interval'       => 300,
-        'array_data_create'   => 0,
-        'show_legend'         => true,
-        'show_overview'       => true,
-        'return_img_base_64'  => false,
-        'image_treshold'      => false,
-        'graph_combined'      => false,
-        'zoom'                => 1,
-        'server_id'           => null,
-        'stacked'             => 0,
-    );
-*/
+/**
+ * Functions tu create graphs.
+ *
+ * @param array $params Details builds graphs. For example:
+ * 'agent_module_id'     => $agent_module_id,
+ * 'period'              => $period,
+ * 'show_events'         => false,
+ * 'width'               => $width,
+ * 'height'              => $height,
+ * 'title'               => '',
+ * 'unit_name'           => null,
+ * 'show_alerts'         => false,
+ * 'date'                => 0,
+ * 'unit'                => '',
+ * 'baseline'            => 0,
+ * 'return_data'         => 0,
+ * 'show_title'          => true,
+ * 'only_image'          => false,
+ * 'homeurl'             => $config['homeurl'],
+ * 'ttl'                 => 1,
+ * 'adapt_key'           => '',
+ * 'compare'             => false,
+ * 'show_unknown'        => false,
+ * 'menu'                => true,
+ * 'backgroundColor'     => 'white',
+ * 'percentil'           => null,
+ * 'dashboard'           => false,
+ * 'vconsole'            => false,
+ * 'type_graph'          => 'area',
+ * 'fullscale'           => false,
+ * 'id_widget_dashboard' => false,
+ * 'force_interval'      => '',
+ * 'time_interval'       => 300,
+ * 'array_data_create'   => 0,
+ * 'show_legend'         => true,
+ * 'show_overview'       => true,
+ * 'return_img_base_64'  => false,
+ * 'image_treshold'      => false,
+ * 'graph_combined'      => false,
+ * 'zoom'                => 1,
+ * 'server_id'           => null,
+ * 'stacked'             => 0.
+ *
+ * @return string html Content graphs.
+ */
 function grafico_modulo_sparse($params)
 {
     global $config;
 
-    /*
-        XXXXXXXXXXXX Documnetar
-     *Set all variable
-     */
-
     if (!isset($params) || !is_array($params)) {
         return false;
     }
@@ -694,11 +744,10 @@ function grafico_modulo_sparse($params)
     }
 
     if (!isset($params['zoom'])) {
-        $params['zoom'] = $config['zoom_graph'] ? $config['zoom_graph'] : 1;
+        $params['zoom'] = ($config['zoom_graph']) ? $config['zoom_graph'] : 1;
     }
 
     if (!isset($params['type_mode_graph'])) {
-        // $config['type_mode_graph']
         $params['type_mode_graph'] = $config['type_mode_graph'];
     }
 
@@ -716,10 +765,11 @@ function grafico_modulo_sparse($params)
         $params['stacked'] = 0;
     }
 
-    // XXXX Configurable
-    $params['grid_color']   = '#C1C1C1';
+    // TODO: Configurable.
+    $params['grid_color'] = '#C1C1C1';
     $params['legend_color'] = '#636363';
-    $params['font']       = $config['fontpath'];
+
+    $params['font'] = $config['fontpath'];
     $params['font_size']  = $config['font_size'];
     $params['short_data'] = $config['short_module_graph_data'];
 
@@ -730,8 +780,8 @@ function grafico_modulo_sparse($params)
     global $graphic_type;
     global $array_events_alerts;
 
-    $array_data   = [];
-    $legend       = [];
+    $array_data = [];
+    $legend = [];
     $array_events_alerts = [];
 
     $date_array = [];
@@ -746,26 +796,36 @@ function grafico_modulo_sparse($params)
         );
 
         $data_module_graph = [];
-        $data_module_graph['history_db']     = db_search_in_history_db($date_array['start_date']);
-        $data_module_graph['agent_name']     = modules_get_agentmodule_agent_name($agent_module_id);
-        $data_module_graph['agent_alias']    = modules_get_agentmodule_agent_alias($agent_module_id);
-        $data_module_graph['agent_id']       = $module_data['id_agente'];
-        $data_module_graph['module_name']    = $module_data['nombre'];
+        $data_module_graph['history_db'] = db_search_in_history_db(
+            $date_array['start_date']
+        );
+        $data_module_graph['agent_name'] = modules_get_agentmodule_agent_name(
+            $agent_module_id
+        );
+        $data_module_graph['agent_alias'] = modules_get_agentmodule_agent_alias(
+            $agent_module_id
+        );
+        $data_module_graph['agent_id'] = $module_data['id_agente'];
+        $data_module_graph['module_name'] = $module_data['nombre'];
         $data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-        $data_module_graph['module_type']    = modules_get_moduletype_name($data_module_graph['id_module_type']);
-        $data_module_graph['uncompressed']   = is_module_uncompressed($data_module_graph['module_type']);
-        $data_module_graph['w_min']             = $module_data['min_warning'];
-        $data_module_graph['w_max']            = $module_data['max_warning'];
-        $data_module_graph['w_inv']             = $module_data['warning_inverse'];
-        $data_module_graph['c_min']             = $module_data['min_critical'];
-        $data_module_graph['c_max']             = $module_data['max_critical'];
-        $data_module_graph['c_inv']             = $module_data['critical_inverse'];
-        $data_module_graph['unit']              = $module_data['unit'];
+        $data_module_graph['module_type'] = modules_get_moduletype_name(
+            $data_module_graph['id_module_type']
+        );
+        $data_module_graph['uncompressed'] = is_module_uncompressed(
+            $data_module_graph['module_type']
+        );
+        $data_module_graph['w_min'] = $module_data['min_warning'];
+        $data_module_graph['w_max'] = $module_data['max_warning'];
+        $data_module_graph['w_inv'] = $module_data['warning_inverse'];
+        $data_module_graph['c_min'] = $module_data['min_critical'];
+        $data_module_graph['c_max'] = $module_data['max_critical'];
+        $data_module_graph['c_inv'] = $module_data['critical_inverse'];
+        $data_module_graph['unit'] = $module_data['unit'];
     } else {
         $data_module_graph = false;
     }
 
-    // format of the graph
+    // Format of the graph.
     if (empty($params['unit'])) {
         $params['unit'] = $module_data['unit'];
         if (modules_is_unit_macro($params['unit'])) {
@@ -775,7 +835,12 @@ function grafico_modulo_sparse($params)
 
     if (!$params['array_data_create']) {
         if ($params['baseline']) {
-            $array_data = get_baseline_data($agent_module_id, $date_array, $data_module_graph, $params);
+            $array_data = get_baseline_data(
+                $agent_module_id,
+                $date_array,
+                $data_module_graph,
+                $params
+            );
         } else {
             if ($params['compare'] !== false) {
                 $series_suffix = 2;
@@ -801,10 +866,14 @@ function grafico_modulo_sparse($params)
                 switch ($params['compare']) {
                     case 'separated':
                     case 'overlapped':
-                        // Store the chart calculated
+                        // Store the chart calculated.
                         $array_data_prev = $array_data;
                         $legend_prev     = $legend;
                     break;
+
+                    default:
+                        // Not defined.
+                    break;
                 }
             }
 
@@ -857,7 +926,7 @@ function grafico_modulo_sparse($params)
 
     $data_module_graph['series_suffix'] = $series_suffix;
 
-    // Check available data
+    // Check available data.
     if ($params['compare'] === 'separated') {
         if (!empty($array_data)) {
             $return = area_graph(
@@ -931,67 +1000,41 @@ function grafico_modulo_sparse($params)
 
 
 /**
- * Produces a combined/user defined graph
+ * Functions tu create graphs.
  *
- * @param array List of source modules
- * @param array List of weighs for each module
- * @param int Period (in seconds)
- * @param int Width, in pixels
- * @param int Height, in pixels
- * @param string Title for graph
- * @param string Unit name, for render in legend
- * @param int Show events in graph (set to 1)
- * @param int Show alerts in graph (set to 1)
- * @param int Pure mode (without titles) (set to 1)
- * @param int Date to start of getting info.
- * @param mixed If is a projection graph this parameter will be module data with prediction data (the projection)
- * or false in other case.
- * @param array List of names for the items. Should have the same size as the module list.
- * @param array List of units for the items. Should have the same size as the module list.
- * @param bool Show the last value of the item on the list.
- * @param bool Show the max value of the item on the list.
- * @param bool Show the min value of the item on the list.
- * @param bool Show the average value of the item on the list.
+ * @param array $module_list     Array modules.
+ * @param array $params          Details builds graphs. For example:
+ * 'period'              => $period,
+ * 'show_events'         => false,
+ * 'width'               => $width,
+ * 'height'              => $height,
+ * 'title'               => '',
+ * 'unit_name'           => null,
+ * 'show_alerts'         => false,
+ * 'date'                => 0,
+ * 'unit'                => '',
+ * 'only_image'          => false,
+ * 'homeurl'             => '',
+ * 'ttl'                 => 1,
+ * 'percentil'           => null,
+ * 'dashboard'           => false,
+ * 'vconsole'            => false,
+ * 'fullscale'           => false,
+ * 'id_widget_dashboard' => false.
+ * @param array $params_combined Details builds graphs. For example:
+ * 'weight_list'    => array(),
+ * 'stacked'        => 0,
+ * 'projection'     => false,
+ * 'labels'         => array(),
+ * 'from_interface' => false,
+ * 'summatory'      => 0,
+ * 'average'        => 0,
+ * 'modules_series' => 0,
+ * 'id_graph'       => 0,
+ * 'return'         => 1.
  *
- * @return Mixed
+ * @return string html Content graphs.
  */
-
-
-/*
-    $params =array(
-        'period'              => $period,
-        'show_events'         => false,
-        'width'               => $width,
-        'height'              => $height,
-        'title'               => '',
-        'unit_name'           => null,
-        'show_alerts'         => false,
-        'date'                => 0,
-        'unit'                => '',
-        'only_image'          => false,
-        'homeurl'             => '',
-        'ttl'                 => 1,
-        'percentil'           => null,
-        'dashboard'           => false,
-        'vconsole'            => false,
-        'fullscale'           => false,
-        'id_widget_dashboard' => false,
-    );
-
-    $params_combined = array(
-        'weight_list'    => array(),
-        'stacked'        => 0,
-        'projection'     => false,
-        'labels'         => array(),
-        'from_interface' => false,
-        'summatory'      => 0,
-        'average'        => 0,
-        'modules_series' => 0,
-        'id_graph'       => 0,
-        'return'         => 1
-    );
-*/
-
 function graphic_combined_module(
     $module_list,
     $params,
@@ -1171,18 +1214,24 @@ function graphic_combined_module(
     $params_combined['graph_combined'] = true;
 
     if ($params['only_image']) {
-        return generator_chart_to_pdf('combined', $params, $params_combined, $module_list);
+        return generator_chart_to_pdf(
+            'combined',
+            $params,
+            $params_combined,
+            $module_list
+        );
     }
 
     if (!isset($params['zoom'])) {
         $params['zoom'] = 1;
     }
 
-    // XXXX Configurable
+    // TODO: Configurable.
     $params['grid_color']   = '#C1C1C1';
     $params['legend_color'] = '#636363';
-    $params['font']         = $config['fontpath'];
-    $params['font_size']    = $config['font_size'];
+
+    $params['font'] = $config['fontpath'];
+    $params['font_size'] = $config['font_size'];
 
     $params['short_data'] = $config['short_module_graph_data'];
 
@@ -1228,8 +1277,10 @@ function graphic_combined_module(
                 array_push($modules, $source['id_agent_module']);
                 array_push($weights, $source['weight']);
                 if ($source['label'] != '' || $params_combined['labels']) {
-                    $item['type']            = 'custom_graph';
-                    $item['id_agent']        = agents_get_module_id($source['id_agent_module']);
+                    $item['type'] = 'custom_graph';
+                    $item['id_agent'] = agents_get_module_id(
+                        $source['id_agent_module']
+                    );
                     $item['id_agent_module'] = $source['id_agent_module'];
                     $labels[$source['id_agent_module']] = ($source['label'] != '') ? reporting_label_macro($item, $source['label']) : reporting_label_macro($item, $params_combined['labels']);
                 }
@@ -1281,13 +1332,13 @@ function graphic_combined_module(
         }
     }
 
-    $width            = $params['width'];
-    $height           = $params['height'];
-    $homeurl          = $params['homeurl'];
-    $ttl              = $params['ttl'];
+    $width = $params['width'];
+    $height = $params['height'];
+    $homeurl = $params['homeurl'];
+    $ttl = $params['ttl'];
     $background_color = $params['backgroundColor'];
-    $datelimit        = $date_array['start_date'];
-    $fixed_font_size  = $config['font_size'];
+    $datelimit = $date_array['start_date'];
+    $fixed_font_size = $config['font_size'];
 
     if ($config['fixed_graph'] == false) {
         $water_mark = [
@@ -1344,22 +1395,32 @@ function graphic_combined_module(
                 );
 
                 $data_module_graph = [];
-                $data_module_graph['history_db']     = db_search_in_history_db($date_array['start_date']);
-                $data_module_graph['agent_name']     = modules_get_agentmodule_agent_name($agent_module_id);
-                $data_module_graph['agent_alias']    = modules_get_agentmodule_agent_alias($agent_module_id);
-                $data_module_graph['agent_id']       = $module_data['id_agente'];
-                $data_module_graph['module_name']    = $module_data['nombre'];
+                $data_module_graph['history_db'] = db_search_in_history_db(
+                    $date_array['start_date']
+                );
+                $data_module_graph['agent_name'] = modules_get_agentmodule_agent_name(
+                    $agent_module_id
+                );
+                $data_module_graph['agent_alias'] = modules_get_agentmodule_agent_alias(
+                    $agent_module_id
+                );
+                $data_module_graph['agent_id'] = $module_data['id_agente'];
+                $data_module_graph['module_name'] = $module_data['nombre'];
                 $data_module_graph['id_module_type'] = $module_data['id_tipo_modulo'];
-                $data_module_graph['module_type']    = modules_get_moduletype_name($data_module_graph['id_module_type']);
-                $data_module_graph['uncompressed']   = is_module_uncompressed($data_module_graph['module_type']);
-                $data_module_graph['w_min']          = $module_data['min_warning'];
-                $data_module_graph['w_max']          = $module_data['max_warning'];
-                $data_module_graph['w_inv']          = $module_data['warning_inverse'];
-                $data_module_graph['c_min']          = $module_data['min_critical'];
-                $data_module_graph['c_max']          = $module_data['max_critical'];
-                $data_module_graph['c_inv']          = $module_data['critical_inverse'];
-                $data_module_graph['module_id']      = $agent_module_id;
-                $data_module_graph['unit']           = $module_data['unit'];
+                $data_module_graph['module_type'] = modules_get_moduletype_name(
+                    $data_module_graph['id_module_type']
+                );
+                $data_module_graph['uncompressed'] = is_module_uncompressed(
+                    $data_module_graph['module_type']
+                );
+                $data_module_graph['w_min'] = $module_data['min_warning'];
+                $data_module_graph['w_max'] = $module_data['max_warning'];
+                $data_module_graph['w_inv'] = $module_data['warning_inverse'];
+                $data_module_graph['c_min'] = $module_data['min_critical'];
+                $data_module_graph['c_max'] = $module_data['max_critical'];
+                $data_module_graph['c_inv'] = $module_data['critical_inverse'];
+                $data_module_graph['module_id'] = $agent_module_id;
+                $data_module_graph['unit'] = $module_data['unit'];
 
                 // Stract data.
                 $array_data_module = grafico_modulo_sparse_data(
@@ -1400,10 +1461,11 @@ function graphic_combined_module(
                 // Work around for fixed the agents name with huge size chars.
                 $fixed_font_size = $config['font_size'];
 
-                // $array_events_alerts[$series_suffix] = $events;
                 $i++;
 
-                if (is_metaconsole() && $params_combined['type_report'] == 'automatic_graph') {
+                if (is_metaconsole()
+                    && $params_combined['type_report'] == 'automatic_graph'
+                ) {
                     metaconsole_restore_db();
                 }
             }
@@ -1418,7 +1480,7 @@ function graphic_combined_module(
             }
 
             if ($params_combined['projection']) {
-                // If projection doesn't have data then don't draw graph
+                // If projection doesn't have data then don't draw graph.
                 if ($output_projection != null) {
                     $date_array_projection = max($output_projection);
                     $date_array['final_date'] = ($date_array_projection[0] / 1000);
@@ -1426,9 +1488,13 @@ function graphic_combined_module(
                 }
             }
 
-            // summatory and average series
-            if ($params_combined['stacked'] == CUSTOM_GRAPH_AREA || $params_combined['stacked'] == CUSTOM_GRAPH_LINE) {
-                if ($params_combined['summatory'] || $params_combined['average']) {
+            // Summatory and average series.
+            if ($params_combined['stacked'] == CUSTOM_GRAPH_AREA
+                || $params_combined['stacked'] == CUSTOM_GRAPH_LINE
+            ) {
+                if ($params_combined['summatory']
+                    || $params_combined['average']
+                ) {
                     $array_data = combined_graph_summatory_average(
                         $array_data,
                         $params_combined['average'],
@@ -1471,9 +1537,19 @@ function graphic_combined_module(
                 $do_it_critical_inverse = true;
 
                 foreach ($module_list as $index => $id_module) {
-                    // Get module warning_min and critical_min
-                    $warning_min  = db_get_value('min_warning', 'tagente_modulo', 'id_agente_modulo', $id_module);
-                    $critical_min = db_get_value('min_critical', 'tagente_modulo', 'id_agente_modulo', $id_module);
+                    // Get module warning_min and critical_min.
+                    $warning_min  = db_get_value(
+                        'min_warning',
+                        'tagente_modulo',
+                        'id_agente_modulo',
+                        $id_module
+                    );
+                    $critical_min = db_get_value(
+                        'min_critical',
+                        'tagente_modulo',
+                        'id_agente_modulo',
+                        $id_module
+                    );
 
                     if ($index == 0) {
                         $compare_warning = $warning_min;
@@ -1494,8 +1570,18 @@ function graphic_combined_module(
 
                 if ($do_it_warning_min || $do_it_critical_min) {
                     foreach ($module_list as $index => $id_module) {
-                        $warning_max  = db_get_value('max_warning', 'tagente_modulo', 'id_agente_modulo', $id_module);
-                        $critical_max = db_get_value('max_critical', 'tagente_modulo', 'id_agente_modulo', $id_module);
+                        $warning_max  = db_get_value(
+                            'max_warning',
+                            'tagente_modulo',
+                            'id_agente_modulo',
+                            $id_module
+                        );
+                        $critical_max = db_get_value(
+                            'max_critical',
+                            'tagente_modulo',
+                            'id_agente_modulo',
+                            $id_module
+                        );
 
                         if ($index == 0) {
                             $yellow_up = $warning_max;
@@ -1517,8 +1603,18 @@ function graphic_combined_module(
 
                 if ($do_it_warning_min || $do_it_critical_min) {
                     foreach ($module_list as $index => $id_module) {
-                        $warning_inverse  = db_get_value('warning_inverse', 'tagente_modulo', 'id_agente_modulo', $id_module);
-                        $critical_inverse = db_get_value('critical_inverse', 'tagente_modulo', 'id_agente_modulo', $id_module);
+                        $warning_inverse  = db_get_value(
+                            'warning_inverse',
+                            'tagente_modulo',
+                            'id_agente_modulo',
+                            $id_module
+                        );
+                        $critical_inverse = db_get_value(
+                            'critical_inverse',
+                            'tagente_modulo',
+                            'id_agente_modulo',
+                            $id_module
+                        );
 
                         if ($index == 0) {
                             $yellow_inverse = $warning_inverse;
@@ -1538,18 +1634,24 @@ function graphic_combined_module(
                     }
                 }
 
-                if ($do_it_warning_min && $do_it_warning_max && $do_it_warning_inverse) {
+                if ($do_it_warning_min
+                    && $do_it_warning_max
+                    && $do_it_warning_inverse
+                ) {
                     $yellow_threshold = $compare_warning;
                     $threshold_data['yellow_threshold'] = $compare_warning;
-                    $threshold_data['yellow_up']        = $yellow_up;
-                    $threshold_data['yellow_inverse']   = (bool) $yellow_inverse;
+                    $threshold_data['yellow_up'] = $yellow_up;
+                    $threshold_data['yellow_inverse'] = (bool) $yellow_inverse;
                 }
 
-                if ($do_it_critical_min && $do_it_critical_max && $do_it_critical_inverse) {
+                if ($do_it_critical_min
+                    && $do_it_critical_max
+                    && $do_it_critical_inverse
+                ) {
                     $red_threshold = $compare_critical;
                     $threshold_data['red_threshold'] = $compare_critical;
-                    $threshold_data['red_up']        = $red_up;
-                    $threshold_data['red_inverse']   = (bool) $red_inverse;
+                    $threshold_data['red_up'] = $red_up;
+                    $threshold_data['red_inverse'] = (bool) $red_inverse;
                 }
 
                 $params['threshold_data'] = $threshold_data;
@@ -1596,9 +1698,12 @@ function graphic_combined_module(
             foreach ($module_list as $module_item) {
                 $automatic_custom_graph_meta = false;
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[$i])) {
-                        $server = metaconsole_get_connection_by_id($module_item['server']);
+                        $server = metaconsole_get_connection_by_id(
+                            $module_item['server']
+                        );
                         metaconsole_connect($server);
                         $automatic_custom_graph_meta = true;
                     }
@@ -1635,16 +1740,27 @@ function graphic_combined_module(
                     $value = false;
                 }
 
-                if (!empty($params_combined['labels']) && isset($params_combined['labels'][$module])) {
+                if (!empty($params_combined['labels'])
+                    && isset($params_combined['labels'][$module])
+                ) {
                     $label = io_safe_input($params_combined['labels'][$module]);
                 } else {
-                    $alias = db_get_value('alias', 'tagente', 'id_agente', $temp[$module]['id_agente']);
+                    $alias = db_get_value(
+                        'alias',
+                        'tagente',
+                        'id_agente',
+                        $temp[$module]['id_agente']
+                    );
                     $label = $alias.': '.$temp[$module]['nombre'];
                 }
 
                 $temp[$module]['label'] = $label;
                 $temp[$module]['value'] = $value;
-                $temp_max = reporting_get_agentmodule_data_max($module, $params['period'], $params['date']);
+                $temp_max = reporting_get_agentmodule_data_max(
+                    $module,
+                    $params['period'],
+                    $params['date']
+                );
                 if ($temp_max < 0) {
                     $temp_max = 0;
                 }
@@ -1655,7 +1771,11 @@ function graphic_combined_module(
                     $temp[$module]['max'] = ($temp_max === false) ? 0 : $temp_max;
                 }
 
-                $temp_min = reporting_get_agentmodule_data_min($module, $params['period'], $params['date']);
+                $temp_min = reporting_get_agentmodule_data_min(
+                    $module,
+                    $params['period'],
+                    $params['date']
+                );
                 if ($temp_min < 0) {
                     $temp_min = 0;
                 }
@@ -1663,7 +1783,8 @@ function graphic_combined_module(
                 $temp[$module]['min'] = ($temp_min === false) ? 0 : $temp_min;
 
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the
+                    // report template in metaconsole.
                     if (is_array($module_list[0])) {
                         metaconsole_restore_db();
                     }
@@ -1688,7 +1809,12 @@ function graphic_combined_module(
                 $color,
                 $module_name_list,
                 $long_index,
-                ui_get_full_url('images/image_problem_area_small.png', false, false, false),
+                ui_get_full_url(
+                    'images/image_problem_area_small.png',
+                    false,
+                    false,
+                    false
+                ),
                 '',
                 '',
                 $water_mark,
@@ -1699,7 +1825,6 @@ function graphic_combined_module(
                 $homeurl,
                 $background_color
             );
-
         break;
 
         case CUSTOM_GRAPH_GAUGE:
@@ -1708,9 +1833,12 @@ function graphic_combined_module(
             foreach ($module_list as $module_item) {
                 $automatic_custom_graph_meta = false;
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from
+                    // the report template in metaconsole.
                     if (is_array($module_list[$i])) {
-                        $server = metaconsole_get_connection_by_id($module_item['server']);
+                        $server = metaconsole_get_connection_by_id(
+                            $module_item['server']
+                        );
                         metaconsole_connect($server);
                         $automatic_custom_graph_meta = true;
                     }
@@ -1747,7 +1875,14 @@ function graphic_combined_module(
                 $temp[$module]['label'] = ($params_combined['labels'][$module] != '') ? $params_combined['labels'][$module] : $temp[$module]['nombre'];
 
                 $temp[$module]['value'] = $value;
-                $temp[$module]['label'] = ui_print_truncate_text($temp[$module]['label'], 'module_small', false, true, false, '..');
+                $temp[$module]['label'] = ui_print_truncate_text(
+                    $temp[$module]['label'],
+                    'module_small',
+                    false,
+                    true,
+                    false,
+                    '..'
+                );
 
                 if ($temp[$module]['unit'] == '%') {
                     $temp[$module]['min'] = 0;
@@ -1755,7 +1890,11 @@ function graphic_combined_module(
                 } else {
                     $min = $temp[$module]['min'];
                     if ($temp[$module]['max'] == 0) {
-                        $max = reporting_get_agentmodule_data_max($module, $params['period'], $params['date']);
+                        $max = reporting_get_agentmodule_data_max(
+                            $module,
+                            $params['period'],
+                            $params['date']
+                        );
                     } else {
                         $max = $temp[$module]['max'];
                     }
@@ -1767,7 +1906,8 @@ function graphic_combined_module(
                 $temp[$module]['gauge'] = uniqid('gauge_');
 
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[0])) {
                         metaconsole_restore_db();
                     }
@@ -1794,13 +1934,17 @@ function graphic_combined_module(
                 $height,
                 $color,
                 $module_name_list,
-                ui_get_full_url('images/image_problem_area_small.png', false, false, false),
+                ui_get_full_url(
+                    'images/image_problem_area_small.png',
+                    false,
+                    false,
+                    false
+                ),
                 $config['fontpath'],
                 $fixed_font_size,
                 '',
                 $homeurl
             );
-
         break;
 
         case CUSTOM_GRAPH_HBARS:
@@ -1809,9 +1953,12 @@ function graphic_combined_module(
             foreach ($module_list as $module_item) {
                 $automatic_custom_graph_meta = false;
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[$i])) {
-                        $server = metaconsole_get_connection_by_id($module_item['server']);
+                        $server = metaconsole_get_connection_by_id(
+                            $module_item['server']
+                        );
                         metaconsole_connect($server);
                         $automatic_custom_graph_meta = true;
                     }
@@ -1840,17 +1987,25 @@ function graphic_combined_module(
                     modules_get_agentmodule_agent_name($module)
                 );
 
-                if (!empty($params_combined['labels']) && isset($params_combined['labels'][$module])) {
+                if (!empty($params_combined['labels'])
+                    && isset($params_combined['labels'][$module])
+                ) {
                     $label = $params_combined['labels'][$module];
                 } else {
-                    $alias = db_get_value('alias', 'tagente', 'id_agente', $module_data['id_agente']);
+                    $alias = db_get_value(
+                        'alias',
+                        'tagente',
+                        'id_agente',
+                        $module_data['id_agente']
+                    );
                     $label = $alias.' - '.$module_data['nombre'];
                 }
 
                 $temp[$label]['g'] = round($temp_data, 4);
 
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[0])) {
                         metaconsole_restore_db();
                     }
@@ -1874,7 +2029,12 @@ function graphic_combined_module(
                     $color,
                     $module_name_list,
                     $long_index,
-                    ui_get_full_url('images/image_problem_area_small.png', false, false, false),
+                    ui_get_full_url(
+                        'images/image_problem_area_small.png',
+                        false,
+                        false,
+                        false
+                    ),
                     '',
                     '',
                     $water_mark,
@@ -1896,7 +2056,12 @@ function graphic_combined_module(
                     $color,
                     $module_name_list,
                     $long_index,
-                    ui_get_full_url('images/image_problem_area_small.png', false, false, false),
+                    ui_get_full_url(
+                        'images/image_problem_area_small.png',
+                        false,
+                        false,
+                        false
+                    ),
                     '',
                     '',
                     $water_mark,
@@ -1918,9 +2083,12 @@ function graphic_combined_module(
             foreach ($module_list as $module_item) {
                 $automatic_custom_graph_meta = false;
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[$i])) {
-                        $server = metaconsole_get_connection_by_id($module_item['server']);
+                        $server = metaconsole_get_connection_by_id(
+                            $module_item['server']
+                        );
                         metaconsole_connect($server);
                         $automatic_custom_graph_meta = true;
                     }
@@ -1959,10 +2127,19 @@ function graphic_combined_module(
 
                 $total_modules += $value;
 
-                if (!empty($params_combined['labels']) && isset($params_combined['labels'][$module])) {
-                    $label = io_safe_output($params_combined['labels'][$module]);
+                if (!empty($params_combined['labels'])
+                    && isset($params_combined['labels'][$module])
+                ) {
+                    $label = io_safe_output(
+                        $params_combined['labels'][$module]
+                    );
                 } else {
-                    $alias = db_get_value('alias', 'tagente', 'id_agente', $data_module['id_agente']);
+                    $alias = db_get_value(
+                        'alias',
+                        'tagente',
+                        'id_agente',
+                        $data_module['id_agente']
+                    );
                     $label = io_safe_output($alias.': '.$data_module['nombre']);
                 }
 
@@ -1971,7 +2148,8 @@ function graphic_combined_module(
                     'unit'  => $data_module['unit'],
                 ];
                 if ($config['metaconsole']) {
-                    // Automatic custom graph from the report template in metaconsole
+                    // Automatic custom graph from the report
+                    // template in metaconsole.
                     if (is_array($module_list[0])) {
                         metaconsole_restore_db();
                     }
@@ -2004,7 +2182,6 @@ function graphic_combined_module(
                 false,
                 $background_color
             );
-
         break;
     }
 
@@ -2016,8 +2193,24 @@ function graphic_combined_module(
 }
 
 
-function combined_graph_summatory_average($array_data, $average=false, $summatory=false, $modules_series=false, $baseline=false)
-{
+/**
+ * Function for convert data summatory.
+ *
+ * @param array   $array_data     Data array.
+ * @param boolean $average        Average.
+ * @param boolean $summatory      Summatory.
+ * @param boolean $modules_series Series module.
+ * @param boolean $baseline       Baseline data.
+ *
+ * @return array Data.
+ */
+function combined_graph_summatory_average(
+    $array_data,
+    $average=false,
+    $summatory=false,
+    $modules_series=false,
+    $baseline=false
+) {
     if (isset($array_data) && is_array($array_data)) {
         foreach ($array_data as $key => $value) {
             if (strpos($key, 'sum') !== false) {
@@ -2035,10 +2228,13 @@ function combined_graph_summatory_average($array_data, $average=false, $summator
             $data_array_pop = [];
             $count = 0;
 
-            while (count($data_array_reverse['sum0']) > 0) {
+            $count_data_array_reverse = count($data_array_reverse['sum0']);
+            while ($count_data_array_reverse > 0) {
                 foreach ($data_array_reverse as $key_reverse => $value_reverse) {
                     if (is_array($value_reverse) && count($value_reverse) > 0) {
-                        $data_array_pop[$key_reverse] = array_pop($data_array_reverse[$key_reverse]);
+                        $data_array_pop[$key_reverse] = array_pop(
+                            $data_array_reverse[$key_reverse]
+                        );
                     }
                 }
 
@@ -2092,12 +2288,18 @@ function combined_graph_summatory_average($array_data, $average=false, $summator
                 $count++;
             }
 
-            if ($summatory && isset($array_sum_reverse) && is_array($array_sum_reverse) && count($array_sum_reverse) > 0) {
+            if ($summatory && isset($array_sum_reverse)
+                && is_array($array_sum_reverse)
+                && count($array_sum_reverse) > 0
+            ) {
                 $array_data['summatory']['data']  = $array_sum_reverse;
                 $array_data['summatory']['color'] = 'purple';
             }
 
-            if ($average && isset($array_avg_reverse) && is_array($array_avg_reverse) && count($array_avg_reverse) > 0) {
+            if ($average && isset($array_avg_reverse)
+                && is_array($array_avg_reverse)
+                && count($array_avg_reverse) > 0
+            ) {
                 if ($baseline) {
                     $array_data['baseline']['data']  = $array_avg_reverse;
                     $array_data['baseline']['color'] = 'green';
@@ -2118,19 +2320,28 @@ function combined_graph_summatory_average($array_data, $average=false, $summator
 /**
  * Print a graph with access data of agents
  *
- * @param integer id_agent Agent ID
- * @param integer width pie graph width
- * @param integer height pie graph height
- * @param integer period time period
- * @param bool return or echo the result flag
+ * @param integer $id_agent Agent ID.
+ * @param integer $width    Pie graph width.
+ * @param integer $height   Pie graph height.
+ * @param integer $period   Time period.
+ * @param boolean $return   Return.
+ * @param boolean $tree     View tree.
+ *
+ * @return string Return or echo the result flag.
  */
-function graphic_agentaccess($id_agent, $width, $height, $period=0, $return=false, $tree=false)
-{
+function graphic_agentaccess(
+    $id_agent,
+    $width,
+    $height,
+    $period=0,
+    $return=false,
+    $tree=false
+) {
     global $config;
     global $graphic_type;
 
-    $date       = get_system_time();
-    $datelimit  = ($date - $period);
+    $date = get_system_time();
+    $datelimit = ($date - $period);
     $data_array = [];
 
     $data = db_get_all_rows_sql(
@@ -2160,7 +2371,12 @@ function graphic_agentaccess($id_agent, $width, $height, $period=0, $return=fals
     if ($config['fixed_graph'] == false) {
         $water_mark = [
             'file' => $config['homedir'].'/images/logo_vertical_water.png',
-            'url'  => ui_get_full_url('images/logo_vertical_water.png', false, false, false),
+            'url'  => ui_get_full_url(
+                'images/logo_vertical_water.png',
+                false,
+                false,
+                false
+            ),
         ];
     }
 
@@ -3704,7 +3920,14 @@ function graph_graphic_moduleevents($id_agent, $id_module, $width, $height, $per
 }
 
 
-// Prints an error image
+/**
+ * Function for retun image no data.
+ *
+ * @param integer $width  Width.
+ * @param integer $height Height.
+ *
+ * @return string Image.
+ */
 function fs_error_image($width=300, $height=110)
 {
     global $config;
@@ -3712,15 +3935,29 @@ function fs_error_image($width=300, $height=110)
 }
 
 
+/**
+ * Function for uncompressed data module for cherts.
+ *
+ * @param integer $agent_module_id Id modulo.
+ * @param array   $date_array      Date start, finish, period.
+ * @param integer $show_unknown    Show Unknown.
+ * @param integer $show_percentil  Show Percentil.
+ * @param integer $series_suffix   Series.
+ * @param boolean $compare         Type compare.
+ * @param boolean $data_slice      Size slice.
+ * @param string  $type_mode_graph Type.
+ *
+ * @return array Return array data uncompresess.
+ */
 function fullscale_data(
     $agent_module_id,
     $date_array,
     $show_unknown=0,
     $show_percentil=0,
-    $series_suffix,
+    $series_suffix=0,
     $compare=false,
     $data_slice=false,
-    $type_mode_graph
+    $type_mode_graph=''
 ) {
     global $config;
     $data_uncompress = db_uncompress_module_data(
@@ -3732,218 +3969,234 @@ function fullscale_data(
 
     $data = [];
     $previous_data = 0;
-    // normal
+    // Normal.
     $min_value_total = PHP_INT_MAX;
-    $max_value_total = -PHP_INT_MAX;
-    // max
+    $max_value_total = (-PHP_INT_MAX);
+    // Max.
     $max_value_min = PHP_INT_MAX;
-    $max_value_max = -PHP_INT_MAX;
-    // min
+    $max_value_max = (-PHP_INT_MAX);
+    // Min.
     $min_value_min = PHP_INT_MAX;
-    $min_value_max = -PHP_INT_MAX;
-    // avg
+    $min_value_max = (-PHP_INT_MAX);
+    // Avg.
     $avg_value_min = PHP_INT_MAX;
-    $avg_value_max = -PHP_INT_MAX;
+    $avg_value_max = (-PHP_INT_MAX);
 
     $flag_unknown  = 0;
     $array_percentil = [];
 
     if ($data_slice) {
-        foreach ($data_uncompress as $k) {
-            $sum_data   = 0;
-            $count_data = 0;
-            $min_value  = PHP_INT_MAX;
-            $max_value  = -PHP_INT_MAX;
-            $flag_virtual_data = 0;
-            foreach ($k['data'] as $v) {
-                if (isset($v['type']) && $v['type'] == 1) {
-                    // skip unnecesary virtual data
-                    continue;
-                    $flag_virtual_data = 1;
-                }
+        if (isset($data_uncompress) === true
+            && is_array($data_uncompress) === true
+        ) {
+            foreach ($data_uncompress as $k) {
+                $sum_data   = 0;
+                $count_data = 0;
+                $min_value  = PHP_INT_MAX;
+                $max_value  = (-PHP_INT_MAX);
+                $flag_virtual_data = 0;
+                foreach ($k['data'] as $v) {
+                    if (isset($v['type']) && $v['type'] == 1) {
+                        // Skip unnecesary virtual data.
+                        continue;
+                        $flag_virtual_data = 1;
+                    }
 
-                if ($compare) {
-                    // * 1000 need js utimestam mlsecond
-                    $real_date = (($v['utimestamp'] + $date_array['period']) * 1000);
-                } else {
-                    $real_date = ($v['utimestamp'] * 1000);
-                }
+                    if ($compare) {
+                        // Data * 1000 need js utimestam mlsecond.
+                        $real_date = (($v['utimestamp'] + $date_array['period']) * 1000);
+                    } else {
+                        $real_date = ($v['utimestamp'] * 1000);
+                    }
 
-                if ($v['datos'] === null) {
-                    // Unknown
-                    if ($show_unknown) {
-                        if (!$compare) {
-                            if ($flag_unknown) {
-                                $data['unknown'.$series_suffix]['data'][] = [
-                                    $real_date,
-                                    1,
-                                ];
-                            } else {
-                                $data['unknown'.$series_suffix]['data'][] = [
-                                    ($real_date - 1),
-                                    0,
-                                ];
-                                $data['unknown'.$series_suffix]['data'][] = [
-                                    $real_date,
-                                    1,
-                                ];
-                                $flag_unknown = 1;
+                    if ($v['datos'] === null) {
+                        // Unknown.
+                        if ($show_unknown) {
+                            if (!$compare) {
+                                if ($flag_unknown) {
+                                    $data['unknown'.$series_suffix]['data'][] = [
+                                        $real_date,
+                                        1,
+                                    ];
+                                } else {
+                                    $data['unknown'.$series_suffix]['data'][] = [
+                                        ($real_date - 1),
+                                        0,
+                                    ];
+                                    $data['unknown'.$series_suffix]['data'][] = [
+                                        $real_date,
+                                        1,
+                                    ];
+                                    $flag_unknown = 1;
+                                }
+                            }
+                        }
+
+                        $v['datos'] = $previous_data;
+                    } else {
+                        // Normal.
+                        $previous_data = $v['datos'];
+                        if ($show_unknown) {
+                            if (!$compare) {
+                                if ($flag_unknown) {
+                                    $data['unknown'.$series_suffix]['data'][] = [
+                                        $real_date,
+                                        0,
+                                    ];
+                                    $flag_unknown = 0;
+                                }
                             }
                         }
                     }
 
-                    $v['datos'] = $previous_data;
-                } else {
-                    // normal
-                    $previous_data = $v['datos'];
-                    if ($show_unknown) {
-                        if (!$compare) {
-                            if ($flag_unknown) {
-                                $data['unknown'.$series_suffix]['data'][] = [
-                                    $real_date,
-                                    0,
-                                ];
-                                $flag_unknown = 0;
-                            }
+                    if (isset($v['datos']) && $v['datos']) {
+                        // Max.
+                        if ($v['datos'] >= $max_value) {
+                            $max_value = $v['datos'];
+                        }
+
+                        // Min.
+                        if ($v['datos'] <= $min_value) {
+                            $min_value = $v['datos'];
+                        }
+
+                        // Avg sum.
+                        $sum_data += $v['datos'];
+                    }
+
+                    // Avg count.
+                    $count_data++;
+
+                    if ($show_percentil && !$compare) {
+                        $array_percentil[] = $v['datos'];
+                    }
+
+                    $last_data = $v['datos'];
+                }
+
+                if (!$flag_virtual_data) {
+                    if ($compare) {
+                        // Data * 1000 need js utimestam mlsecond.
+                        $real_date = (($k['data'][0]['utimestamp'] + $date_array['period']) * 1000);
+                    } else {
+                        $real_date = ($k['data'][0]['utimestamp'] * 1000);
+                    }
+
+                    $data['sum'.$series_suffix]['data'][] = [
+                        $real_date,
+                        ($sum_data / $count_data),
+                    ];
+                    if ($type_mode_graph && !$params['baseline']) {
+                        if ($min_value != PHP_INT_MAX) {
+                            $data['min'.$series_suffix]['data'][] = [
+                                $real_date,
+                                $min_value,
+                            ];
+                        }
+
+                        if ($max_value != (-PHP_INT_MAX)) {
+                            $data['max'.$series_suffix]['data'][] = [
+                                $real_date,
+                                $max_value,
+                            ];
+                        }
+                    } else {
+                        if ($min_value != PHP_INT_MAX) {
+                            $data['sum'.$series_suffix]['slice_data'][$real_date]['min'] = $min_value;
+                        }
+
+                        $data['sum'.$series_suffix]['slice_data'][$real_date]['avg'] = ($sum_data / $count_data);
+
+                        if ($max_value != (-PHP_INT_MAX)) {
+                            $data['sum'.$series_suffix]['slice_data'][$real_date]['max'] = $max_value;
                         }
                     }
-                }
 
-                if (isset($v['datos']) && $v['datos']) {
-                    // max
-                    if ($v['datos'] >= $max_value) {
-                        $max_value = $v['datos'];
+                    // Max total.
+                    if ($max_value >= $max_value_total
+                        && $max_value != (-PHP_INT_MAX)
+                    ) {
+                        $max_value_total = $max_value;
                     }
 
-                    // min
-                    if ($v['datos'] <= $min_value) {
-                        $min_value = $v['datos'];
+                    // Min total.
+                    if ($min_value <= $min_value_total
+                        && $min_value != PHP_INT_MAX
+                    ) {
+                        $min_value_total = $min_value;
                     }
 
-                    // avg sum
-                    $sum_data += $v['datos'];
-                }
+                    // Avg sum total.
+                    $sum_data_total += ($sum_data / $count_data);
 
-                // avg count
-                $count_data++;
+                    // Avg count total.
+                    $count_data_total++;
 
-                if ($show_percentil && !$compare) {
-                    $array_percentil[] = $v['datos'];
-                }
+                    if ($type_mode_graph && !$params['baseline']) {
+                        // MIN.
+                        // max min.
+                        if ($min_value >= $min_value_max
+                            && $min_value != PHP_INT_MAX
+                        ) {
+                            $min_value_max = $min_value;
+                        }
 
-                $last_data = $v['datos'];
-            }
+                        // Min min.
+                        if ($min_value <= $min_value_min
+                            && $min_value != PHP_INT_MAX
+                        ) {
+                            $min_value_min = $min_value;
+                        }
 
-            if (!$flag_virtual_data) {
-                if ($compare) {
-                    // * 1000 need js utimestam mlsecond
-                    $real_date = (($k['data'][0]['utimestamp'] + $date_array['period']) * 1000);
-                } else {
-                    $real_date = ($k['data'][0]['utimestamp'] * 1000);
-                }
+                        // Avg sum min.
+                        if ($min_value != PHP_INT_MAX) {
+                            $sum_data_min += $min_value;
+                        }
 
-                $data['sum'.$series_suffix]['data'][] = [
-                    $real_date,
-                    ($sum_data / $count_data),
-                ];
-                if ($type_mode_graph && !$params['baseline']) {
-                    if ($min_value != PHP_INT_MAX) {
-                        $data['min'.$series_suffix]['data'][] = [
-                            $real_date,
-                            $min_value,
-                        ];
+                        // MAX.
+                        // Max max.
+                        if ($max_value >= $max_value_max
+                            && $max_value != (-PHP_INT_MAX)
+                        ) {
+                            $max_value_max = $max_value;
+                        }
+
+                        // Min max.
+                        if ($max_value <= $max_value_min
+                            && $max_value != (-PHP_INT_MAX)
+                        ) {
+                            $max_value_min = $max_value;
+                        }
+
+                        // Avg Sum max.
+                        if ($max_value != (-PHP_INT_MAX)) {
+                            $sum_data_max += $max_value;
+                        }
+
+                        // AVG.
+                        // Max max.
+                        if (($sum_data / $count_data) >= $avg_value_max) {
+                            $avg_value_max = ($sum_data / $count_data);
+                        }
+
+                        // Min max.
+                        if (($sum_data / $count_data) <= $avg_value_min) {
+                            $avg_value_min = ($sum_data / $count_data);
+                        }
+
+                        // Avg sum max.
+                        $sum_data_avg += ($sum_data / $count_data);
                     }
-
-                    if ($max_value != -PHP_INT_MAX) {
-                        $data['max'.$series_suffix]['data'][] = [
-                            $real_date,
-                            $max_value,
-                        ];
-                    }
-                } else {
-                    if ($min_value != PHP_INT_MAX) {
-                        $data['sum'.$series_suffix]['slice_data'][$real_date]['min'] = $min_value;
-                    }
-
-                    $data['sum'.$series_suffix]['slice_data'][$real_date]['avg'] = ($sum_data / $count_data);
-
-                    if ($max_value != -PHP_INT_MAX) {
-                        $data['sum'.$series_suffix]['slice_data'][$real_date]['max'] = $max_value;
-                    }
-                }
-
-                // max_total
-                if ($max_value >= $max_value_total && $max_value != -PHP_INT_MAX) {
-                    $max_value_total = $max_value;
-                }
-
-                // min_total
-                if ($min_value <= $min_value_total && $min_value != PHP_INT_MAX) {
-                    $min_value_total = $min_value;
-                }
-
-                // avg sum_total
-                $sum_data_total += ($sum_data / $count_data);
-
-                // avg count_total
-                $count_data_total++;
-
-                if ($type_mode_graph && !$params['baseline']) {
-                    /*
-                        MIN*/
-                    // max_min
-                    if ($min_value >= $min_value_max && $min_value != PHP_INT_MAX) {
-                        $min_value_max = $min_value;
-                    }
-
-                    // min_min
-                    if ($min_value <= $min_value_min && $min_value != PHP_INT_MAX) {
-                        $min_value_min = $min_value;
-                    }
-
-                    // avg sum_min
-                    if ($min_value != PHP_INT_MAX) {
-                        $sum_data_min += $min_value;
-                    }
-
-                    /*
-                        MAX*/
-                    // max_max
-                    if ($max_value >= $max_value_max && $max_value != -PHP_INT_MAX) {
-                        $max_value_max = $max_value;
-                    }
-
-                    // min_max
-                    if ($max_value <= $max_value_min && $max_value != -PHP_INT_MAX) {
-                        $max_value_min = $max_value;
-                    }
-
-                    // avg sum_max
-                    if ($max_value != -PHP_INT_MAX) {
-                        $sum_data_max += $max_value;
-                    }
-
-                    /*
-                        AVG*/
-                    // max_max
-                    if (($sum_data / $count_data) >= $avg_value_max) {
-                        $avg_value_max = ($sum_data / $count_data);
-                    }
-
-                    // min_max
-                    if (($sum_data / $count_data) <= $avg_value_min) {
-                        $avg_value_min = ($sum_data / $count_data);
-                    }
-
-                    // avg sum_max
-                    $sum_data_avg += ($sum_data / $count_data);
                 }
             }
         }
 
         $data['sum'.$series_suffix]['min'] = $min_value_total;
         $data['sum'.$series_suffix]['max'] = $max_value_total;
-        $data['sum'.$series_suffix]['avg'] = ($sum_data_total / $count_data_total);
+        $data['sum'.$series_suffix]['avg'] = 0;
+        if (isset($count_data_total) === true) {
+            $data['sum'.$series_suffix]['avg'] = ($sum_data_total / $count_data_total);
+        }
 
         if ($type_mode_graph && !$params['baseline']) {
             $data['min'.$series_suffix]['min'] = $min_value_min;
@@ -3966,19 +4219,19 @@ function fullscale_data(
         foreach ($data_uncompress as $k) {
             foreach ($k['data'] as $v) {
                 if (isset($v['type']) && $v['type'] == 1) {
-                    // skip unnecesary virtual data
+                    // Skip unnecesary virtual data.
                     continue;
                 }
 
                 if ($compare) {
-                    // * 1000 need js utimestam mlsecond
+                    // Data * 1000 need js utimestam mlsecond.
                     $real_date = (($v['utimestamp'] + $date_array['period']) * 1000);
                 } else {
                     $real_date = ($v['utimestamp'] * 1000);
                 }
 
                 if ($v['datos'] === null) {
-                    // Unknown
+                    // Unknown.
                     if ($show_unknown) {
                         if (!$compare) {
                             if ($flag_unknown) {
@@ -4005,7 +4258,7 @@ function fullscale_data(
                         $previous_data,
                     ];
                 } else {
-                    // normal
+                    // Normal.
                     $previous_data = $v['datos'];
                     $data['sum'.$series_suffix]['data'][] = [
                         $real_date,
@@ -4025,21 +4278,21 @@ function fullscale_data(
                 }
 
                 if (isset($v['datos']) && $v['datos']) {
-                    // max
+                    // Max.
                     if ((float) $v['datos'] >= $max_value_max) {
                         $max_value_max = $v['datos'];
                     }
 
-                    // min
+                    // Min.
                     if ((float) $v['datos'] <= $min_value_min) {
                         $min_value_min = $v['datos'];
                     }
 
-                    // avg sum
+                    // Avg sum.
                     $sum_data += $v['datos'];
                 }
 
-                // avg count
+                // Avg count.
                 $count_data++;
 
                 if ($show_percentil && !$compare) {
@@ -4052,7 +4305,7 @@ function fullscale_data(
 
         $data['sum'.$series_suffix]['min'] = $min_value_min;
         $data['sum'.$series_suffix]['max'] = $max_value_max;
-        $data['sum'.$series_suffix]['avg'] = $count_data == 0 ? 0 : ($sum_data / $count_data);
+        $data['sum'.$series_suffix]['avg'] = ($count_data == 0) ? 0 : ($sum_data / $count_data);
     }
 
     if ($show_percentil && !$compare) {
@@ -4078,7 +4331,7 @@ function fullscale_data(
         }
     }
 
-    // Add missed last data
+    // Add missed last data.
     if ($compare) {
         $data['sum'.$series_suffix]['data'][] = [
             (($date_array['final_date'] + $date_array['period']) * 1000),
@@ -4101,7 +4354,11 @@ function fullscale_data(
                 ];
             } else {
                 $data['sum'.$series_suffix]['slice_data'][($date_array['final_date'] * 1000)]['min'] = $min_value;
-                $data['sum'.$series_suffix]['slice_data'][($date_array['final_date'] * 1000)]['avg'] = ($sum_data / $count_data);
+                $data['sum'.$series_suffix]['slice_data'][($date_array['final_date'] * 1000)]['avg'] = 0;
+                if (isset($count_data) === true) {
+                    $data['sum'.$series_suffix]['slice_data'][($date_array['final_date'] * 1000)]['avg'] = ($sum_data / $count_data);
+                }
+
                 $data['sum'.$series_suffix]['slice_data'][($date_array['final_date'] * 1000)]['max'] = $max_value;
             }
         }
@@ -4124,7 +4381,7 @@ function graph_netflow_aggregate_area($data, $period, $width, $height, $ttl=1, $
         return;
     }
 
-    // Calculate source indexes
+    // Calculate source indexes.
     foreach ($data['sources'] as $key => $value) {
         $i = 0;
         foreach ($data['data'] as $k => $v) {
@@ -4143,7 +4400,12 @@ function graph_netflow_aggregate_area($data, $period, $width, $height, $ttl=1, $
     if ($config['fixed_graph'] == false) {
         $water_mark = [
             'file' => $config['homedir'].'/images/logo_vertical_water.png',
-            'url'  => ui_get_full_url('images/logo_vertical_water.png', false, false, false),
+            'url'  => ui_get_full_url(
+                'images/logo_vertical_water.png',
+                false,
+                false,
+                false
+            ),
         ];
 
             $water_mark = $config['homedir'].'/images/logo_vertical_water.png';
@@ -4949,8 +5211,22 @@ function graph_monitor_wheel($width=550, $height=600, $filter=false)
 }
 
 
-function get_baseline_data($agent_module_id, $date_array, $data_module_graph, $params)
-{
+/**
+ * Function that on a date requests 3 times that period and takes an average.
+ *
+ * @param integer $agent_module_id   ID module.
+ * @param array   $date_array        Date array start finish period.
+ * @param array   $data_module_graph Data module.
+ * @param array   $params            Params.
+ *
+ * @return array Data baseline graph.
+ */
+function get_baseline_data(
+    $agent_module_id,
+    $date_array,
+    $data_module_graph,
+    $params
+) {
     $period = $date_array['period'];
     $date = $date_array['final_date'];
     $array_data = [];
@@ -4989,8 +5265,18 @@ function get_baseline_data($agent_module_id, $date_array, $data_module_graph, $p
     }
 
     $result['avg'] = (($array_data[0]['sum0']['avg'] + $array_data[1]['sum1']['avg'] + $array_data[2]['sum2']['avg'] + $array_data[3]['sum3']['avg']) / 4);
-    $result['max'] = max($array_data[0]['sum0']['max'], $array_data[1]['sum1']['max'], $array_data[2]['sum2']['max'], $array_data[3]['sum3']['max']);
-    $result['min'] = min($array_data[0]['sum0']['min'], $array_data[1]['sum1']['min'], $array_data[2]['sum2']['min'], $array_data[3]['sum3']['min']);
+    $result['max'] = max(
+        $array_data[0]['sum0']['max'],
+        $array_data[1]['sum1']['max'],
+        $array_data[2]['sum2']['max'],
+        $array_data[3]['sum3']['max']
+    );
+    $result['min'] = min(
+        $array_data[0]['sum0']['min'],
+        $array_data[1]['sum1']['min'],
+        $array_data[2]['sum2']['min'],
+        $array_data[3]['sum3']['min']
+    );
 
     $result['agent_module_id'] = $array_data[0]['sum0']['agent_module_id'];
     $result['id_module_type'] = $array_data[0]['sum0']['id_module_type'];
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index aa29bec33e..46c920c4bb 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -1914,6 +1914,11 @@ function reporting_event_report_module(
     $return['title'] = $content['name'];
     $return['subtitle'] = agents_get_alias($content['id_agent']).' - '.io_safe_output(modules_get_agentmodule_name($content['id_agent_module']));
 
+    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
+
     if (is_metaconsole()) {
         metaconsole_restore_db();
     }
@@ -1921,7 +1926,6 @@ function reporting_event_report_module(
     $return['description'] = $content['description'];
     $return['show_extended_events'] = $content['show_extended_events'];
     $return['date'] = reporting_get_date_text($report, $content);
-    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
     $event_filter = $content['style'];
     $return['show_summary_group'] = $event_filter['show_summary_group'];
@@ -2741,6 +2745,17 @@ function reporting_group_report($report, $content)
 }
 
 
+/**
+ * Create data report event agent.
+ *
+ * @param array   $report             Data report.
+ * @param array   $content            Content report.
+ * @param string  $type               Type report.
+ * @param integer $force_width_chart  Force width.
+ * @param integer $force_height_chart Force height.
+ *
+ * @return array Data.
+ */
 function reporting_event_report_agent(
     $report,
     $content,
@@ -2761,26 +2776,26 @@ function reporting_event_report_agent(
         $history = true;
     }
 
-    $return['title']              = $content['name'];
-    $return['subtitle']           = agents_get_alias($content['id_agent']);
-    $return['description']        = $content['description'];
-    $return['date']               = reporting_get_date_text($report, $content);
-    $return['label']              = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    $return['title'] = $content['name'];
+    $return['subtitle'] = agents_get_alias($content['id_agent']);
+    $return['description'] = $content['description'];
+    $return['date'] = reporting_get_date_text($report, $content);
+
     $return['show_summary_group'] = $content['style']['show_summary_group'];
     $return['show_extended_events'] = $content['show_extended_events'];
 
     $style = $content['style'];
 
-    // filter
-    $show_summary_group         = $style['show_summary_group'];
-    $filter_event_severity      = json_decode($style['filter_event_severity'], true);
-    $filter_event_type          = json_decode($style['filter_event_type'], true);
-    $filter_event_status        = json_decode($style['filter_event_status'], true);
+    // Filter.
+    $show_summary_group = $style['show_summary_group'];
+    $filter_event_severity = json_decode($style['filter_event_severity'], true);
+    $filter_event_type = json_decode($style['filter_event_type'], true);
+    $filter_event_status = json_decode($style['filter_event_status'], true);
     $filter_event_filter_search = $style['event_filter_search'];
 
-    // graph
-    $event_graph_by_user_validator        = $style['event_graph_by_user_validator'];
-    $event_graph_by_criticity             = $style['event_graph_by_criticity'];
+    // Graph.
+    $event_graph_by_user_validator = $style['event_graph_by_user_validator'];
+    $event_graph_by_criticity = $style['event_graph_by_criticity'];
     $event_graph_validated_vs_unvalidated = $style['event_graph_validated_vs_unvalidated'];
 
     $return['data'] = reporting_get_agents_detailed_event(
@@ -2825,6 +2840,12 @@ function reporting_event_report_agent(
         $metaconsole_dbtable = false;
     }
 
+    $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($label != '') {
+        $label = reporting_label_macro($content, $label);
+    }
+    $return['label'] = $label;
+
     if ($event_graph_by_user_validator) {
         $data_graph = events_get_count_events_validated_by_user(
             ['id_agent' => $content['id_agent']],
@@ -2908,7 +2929,7 @@ function reporting_event_report_agent(
         metaconsole_restore_db();
     }
 
-    // total_events
+    // Total events.
     if ($return['data'] != '') {
         $return['total_events'] = count($return['data']);
     } else {
@@ -2941,7 +2962,11 @@ function reporting_historical_data($report, $content)
     $return['subtitle'] = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
+
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
 
     $return['keys'] = [
         __('Date'),
@@ -3017,7 +3042,6 @@ function reporting_database_serialized($report, $content)
     $return['subtitle'] = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
-    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
     $keys = [];
     if (isset($content['header_definition']) && ($content['header_definition'] != '')) {
@@ -3043,6 +3067,11 @@ function reporting_database_serialized($report, $content)
         metaconsole_connect($server);
     }
 
+    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
+
     $datelimit = ($report['datetime'] - $content['period']);
     $search_in_history_db = db_search_in_history_db($datelimit);
 
@@ -3589,7 +3618,12 @@ function reporting_alert_report_agent($report, $content)
     $return['subtitle'] = $agent_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
+
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
+
     $module_list = agents_get_modules($content['id_agent']);
 
     $data = [];
@@ -3721,6 +3755,9 @@ function reporting_alert_report_module($report, $content)
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
     $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
 
     $data_row = [];
 
@@ -3923,7 +3960,6 @@ function reporting_monitor_report($report, $content)
     $return['subtitle'] = $agent_name.' - '.$module_name;
     $return['description'] = $content['description'];
     $return['date'] = reporting_get_date_text($report, $content);
-    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
 
     if ($config['metaconsole']) {
         $id_meta = metaconsole_get_id_server($content['server_name']);
@@ -3932,6 +3968,11 @@ function reporting_monitor_report($report, $content)
         metaconsole_connect($server);
     }
 
+    $return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
+    if ($return['label'] != '') {
+        $return['label'] = reporting_label_macro($content, $return['label']);
+    }
+
     $module_name = io_safe_output(
         modules_get_agentmodule_name($content['id_agent_module'])
     );
@@ -7335,6 +7376,7 @@ function reporting_simple_graph(
         $report,
         $content
     );
+
     $label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
     if ($label != '') {
         $label = reporting_label_macro($content, $label);
@@ -7346,7 +7388,7 @@ function reporting_simple_graph(
 
     $return['chart'] = '';
 
-    // Get chart
+    // Get chart.
     reporting_set_conf_charts($width, $height, $only_image, $type, $content, $ttl);
 
     if (!empty($force_width_chart)) {
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 3782a11e16..fb499e45e7 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -955,6 +955,8 @@ function update_manager_get_config_values()
     global $build_version;
     global $pandora_version;
 
+    enterprise_include_once('include/functions_license.php');
+
     $license = db_get_value(
         db_escape_key_identifier('value'),
         'tupdate_settings',
@@ -962,7 +964,13 @@ function update_manager_get_config_values()
         'customer_key'
     );
 
-    $limit_count = db_get_value_sql('SELECT count(*) FROM tagente');
+    $data = enterprise_hook('license_get_info');
+
+    if ($data === ENTERPRISE_NOT_HOOK) {
+        $limit_count = db_get_value_sql('SELECT count(*) FROM tagente');
+    } else {
+        $limit_count = $data['count_enabled'];
+    }
 
     return [
         'license'        => $license,
@@ -1211,7 +1219,7 @@ function update_manager_check_online_free_packages_available()
     ];
 
     $curlObj = curl_init();
-    curl_setopt($curlObj, CURLOPT_URL, get_um_url());
+    curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
     curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($curlObj, CURLOPT_POST, true);
     curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
@@ -1285,7 +1293,7 @@ function update_manager_check_online_free_packages($is_ajax=true)
      */
 
     $curlObj = curl_init();
-    curl_setopt($curlObj, CURLOPT_URL, get_um_url());
+    curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
     curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($curlObj, CURLOPT_POST, true);
     curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
@@ -1436,7 +1444,7 @@ function update_manager_curl_request($action, $additional_params=false)
     $params['action'] = $action;
 
     $curlObj = curl_init();
-    curl_setopt($curlObj, CURLOPT_URL, get_um_url());
+    curl_setopt($curlObj, CURLOPT_URL, get_um_url().'server.php');
     curl_setopt($curlObj, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($curlObj, CURLOPT_POST, true);
     curl_setopt($curlObj, CURLOPT_POSTFIELDS, $params);
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 8fc7073365..55cc748261 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1,3 +1,5 @@
+/* global $ */
+
 function pandoraFlotPie(
   graph_id,
   values,
@@ -1074,7 +1076,6 @@ function pandoraFlotArea(
     .split(".")
     .shift();
   var width = params.width;
-  var height = params.height;
   var vconsole = params.vconsole;
   var dashboard = params.dashboard;
   var menu = params.menu;
@@ -1088,9 +1089,8 @@ function pandoraFlotArea(
   var background_color = params.backgroundColor;
   var legend_color = params.legend_color;
   var update_legend = {};
-
-  //XXXXXX colocar
   var force_integer = 0;
+  var title = params.title;
 
   if (typeof type === "undefined" || type == "") {
     type = params.type_graph;
@@ -1105,8 +1105,6 @@ function pandoraFlotArea(
   var red_up = parseFloat(data_module_graph.c_max);
   var yellow_inverse = parseInt(data_module_graph.w_inv);
   var red_inverse = parseInt(data_module_graph.c_inv);
-
-  //XXXXX
   var markins_graph = true;
 
   // If threshold and up are the same, that critical or warning is disabled
@@ -1934,11 +1932,12 @@ function pandoraFlotArea(
     }
   }
 
+  var stacked = null;
+  var filled_s = 0.3;
+
   switch (type) {
     case "line":
     case 2:
-      stacked = null;
-      filled_s = false;
       break;
     case 3:
       stacked = "stack";
@@ -1960,7 +1959,15 @@ function pandoraFlotArea(
   var data_base = new Array();
   var lineWidth = $("#hidden-line_width_graph").val() || 1;
 
-  i = 0;
+  var i = 0;
+  var fill_color = "green";
+  var line_show = true;
+  var points_show = false;
+  var filled = false;
+  var steps_chart = false;
+  var radius = false;
+  var fill_points = fill_color;
+
   $.each(values, function(index, value) {
     if (typeof value.data !== "undefined") {
       if (index.search("alert") >= 0) {
@@ -1974,7 +1981,7 @@ function pandoraFlotArea(
       switch (series_type[index]) {
         case "area":
           line_show = true;
-          points_show = false; // XXX - false
+          points_show = false;
           filled = filled_s;
           steps_chart = false;
           radius = false;
@@ -1995,7 +2002,7 @@ function pandoraFlotArea(
           points_show = true;
           filled = false;
           steps_chart = false;
-          radius = 1.5;
+          radius = 3;
           fill_points = fill_color;
           break;
         case "unknown":
@@ -2033,7 +2040,7 @@ function pandoraFlotArea(
           },
           points: {
             show: points_show,
-            radius: 3,
+            radius: radius,
             fillColor: fill_points
           },
           legend: legend.index
@@ -2051,7 +2058,8 @@ function pandoraFlotArea(
     number_ticks = 5;
   }
 
-  var maxticks = date_array["period"] / 3600 / number_ticks;
+  // masticks this variable is commented because the library defines the tick number by itself
+  // var maxticks = date_array["period"] / 3600 / number_ticks;
 
   var options = {
     series: {
@@ -2125,16 +2133,11 @@ function pandoraFlotArea(
     options.selection = false;
   }
 
-  var stack = 0,
-    bars = true,
-    lines = false,
-    steps = false;
-
   var plot = $.plot($("#" + graph_id), datas, options);
 
   // Re-calculate the graph height with the legend height
   if (dashboard) {
-    $acum = 0;
+    var $acum = 0;
     if (dashboard) $acum = 35;
     var hDiff =
       $("#" + graph_id).height() - $("#legend_" + graph_id).height() - $acum;
@@ -2143,22 +2146,12 @@ function pandoraFlotArea(
         navigator.userAgent
       )
     ) {
+      // not defined.???
     } else {
       $("#" + graph_id).css("height", hDiff);
     }
   }
 
-  /*
-		//XXXREvisar esto
-		if (vconsole) {
-			var myCanvas = plot.getCanvas();
-			plot.setupGrid(); // redraw plot to new size
-			plot.draw();
-			var image = myCanvas.toDataURL("image/png");
-			return;
-		}
-	*/
-
   // Adjust the overview plot to the width and position of the main plot
   adjust_left_width_canvas(graph_id, "overview_" + graph_id);
   update_left_width_canvas(graph_id);
@@ -2251,7 +2244,7 @@ function pandoraFlotArea(
       return;
     }
 
-    dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
+    var dataInSelection = ranges.xaxis.to - ranges.xaxis.from;
 
     var maxticks_zoom = dataInSelection / 3600000 / number_ticks;
     if (maxticks_zoom < 0.001) {
@@ -2261,8 +2254,9 @@ function pandoraFlotArea(
       }
     }
 
+    var y_recal = "";
     if (thresholded) {
-      var y_recal = axis_thresholded(
+      y_recal = axis_thresholded(
         threshold_data,
         plot.getAxes().yaxis.min,
         plot.getAxes().yaxis.max,
@@ -2271,11 +2265,11 @@ function pandoraFlotArea(
         red_up
       );
     } else {
-      var y_recal = ranges.yaxis;
+      y_recal = ranges.yaxis;
     }
 
     if (thresholded) {
-      data_base_treshold = add_threshold(
+      var data_base_treshold = add_threshold(
         data_base,
         threshold_data,
         ranges.yaxis.from,
@@ -2400,7 +2394,6 @@ function pandoraFlotArea(
   var updateLegendTimeout = null;
   var latestPosition = null;
   var currentPlot = null;
-  var currentRanges = null;
 
   // Update legend with the data of the plot in the mouse position
   function updateLegend() {
@@ -2434,7 +2427,7 @@ function pandoraFlotArea(
       "Dec"
     ];
 
-    date_format =
+    var date_format =
       (d.getDate() < 10 ? "0" : "") +
       d.getDate() +
       " " +
@@ -2455,7 +2448,7 @@ function pandoraFlotArea(
 
     var timesize = $("#timestamp_" + graph_id).width();
 
-    dataset = currentPlot.getData();
+    var dataset = currentPlot.getData();
 
     var timenewpos =
       dataset[0].xaxis.p2c(pos.x) +
@@ -2481,9 +2474,8 @@ function pandoraFlotArea(
       $("#timestamp_" + graph_id).css("left", timenewpos);
     }
 
-    var dataset = currentPlot.getData();
     var i = 0;
-    for (k = 0; k < dataset.length; k++) {
+    for (var k = 0; k < dataset.length; k++) {
       // k is the real series counter
       // i is the series counter without thresholds
       var series = dataset[k];
@@ -2492,7 +2484,7 @@ function pandoraFlotArea(
       }
 
       // find the nearest points, x-wise
-      for (j = 0; j < series.data.length; ++j) {
+      for (var j = 0; j < series.data.length; ++j) {
         if (series.data[j][0] > pos.x) {
           break;
         }
@@ -2503,10 +2495,10 @@ function pandoraFlotArea(
         }
       }
 
-      y_array = format_unit_yaxes(y);
+      var y_array = format_unit_yaxes(y);
 
       y = y_array["y"];
-      how_bigger = y_array["unit"];
+      var how_bigger = y_array["unit"];
 
       var data_legend = [];
 
@@ -2516,8 +2508,9 @@ function pandoraFlotArea(
         series_type[dataset[k]["label"]] != "unknown" &&
         series_type[dataset[k]["label"]] != "percentil"
       ) {
+        var label_aux = "";
         if (Object.keys(update_legend).length == 0) {
-          var label_aux = legend[series.label];
+          label_aux = legend[series.label];
 
           $("#legend_" + graph_id + " .legendLabel")
             .eq(i)
@@ -2532,6 +2525,16 @@ function pandoraFlotArea(
                 unit
             );
         } else {
+          var min_y_array;
+          var min_y = 0;
+          var min_bigger = "";
+          var max_y_array;
+          var max_y = 0;
+          var max_bigger = "";
+          var avg_y_array;
+          var avg_y = 0;
+          var avg_bigger = "";
+
           $.each(update_legend, function(index, value) {
             if (!value[x]) {
               x = x + 1;
@@ -2581,7 +2584,7 @@ function pandoraFlotArea(
               avg_bigger;
           });
 
-          var label_aux =
+          label_aux =
             legend[series.label].split(":")[0] + data_legend[series.label];
           $("#legend_" + graph_id + " .legendLabel")
             .eq(i)
@@ -2604,7 +2607,7 @@ function pandoraFlotArea(
   }
 
   // Events
-  $("#overview_" + graph_id).bind("plothover", function(event, pos, item) {
+  $("#overview_" + graph_id).bind("plothover", function(event, pos) {
     plot.setCrosshair({ x: pos.x, y: pos.y });
     currentPlot = plot;
     latestPosition = pos;
@@ -2613,7 +2616,7 @@ function pandoraFlotArea(
     }
   });
 
-  $("#" + graph_id).bind("plothover", function(event, pos, item) {
+  $("#" + graph_id).bind("plothover", function(event, pos) {
     overview.setCrosshair({ x: pos.x, y: pos.y });
     currentPlot = plot;
     latestPosition = pos;
@@ -2636,7 +2639,6 @@ function pandoraFlotArea(
       $("#extra_" + graph_id).css("width", "170px");
       $("#extra_" + graph_id).css("height", "60px");
 
-      var dataset = plot.getData();
       var extra_info = "<i>No info to show</i>";
       var extra_show = false;
       var extra_height = $("#extra_" + graph_id).height();
@@ -2657,8 +2659,6 @@ function pandoraFlotArea(
         coord_x = coord_x - extra_width;
       }
 
-      var coord_y = offset_graph.top + height_legend + extra_height;
-
       $("#extra_" + graph_id).css("left", coord_x);
       $("#extra_" + graph_id).css("top", coord_y);
 
@@ -2677,21 +2677,22 @@ function pandoraFlotArea(
           });
         });
 
+        var extra_color = "#ffffff";
         if (events_data.event_type.search("alert") >= 0) {
-          $extra_color = "#FFA631";
+          extra_color = "#FFA631";
         } else if (events_data.event_type.search("critical") >= 0) {
-          $extra_color = "#FC4444";
+          extra_color = "#FC4444";
         } else if (events_data.event_type.search("warning") >= 0) {
-          $extra_color = "#FAD403";
+          extra_color = "#FAD403";
         } else if (events_data.event_type.search("unknown") >= 0) {
-          $extra_color = "#3BA0FF";
+          extra_color = "#3BA0FF";
         } else if (events_data.event_type.search("normal") >= 0) {
-          $extra_color = "#80BA27";
+          extra_color = "#80BA27";
         } else {
-          $extra_color = "#ffffff";
+          extra_color = "#ffffff";
         }
 
-        $("#extra_" + graph_id).css("background-color", $extra_color);
+        $("#extra_" + graph_id).css("background-color", extra_color);
 
         extra_info = "<b>" + events_data.evento + ":";
         extra_info +=
@@ -2717,9 +2718,10 @@ function pandoraFlotArea(
   }
 
   if (image_treshold) {
+    var y_recal = plot.getAxes().yaxis.max;
     if (!thresholded) {
       // Recalculate the y axis
-      var y_recal = axis_thresholded(
+      y_recal = axis_thresholded(
         threshold_data,
         plot.getAxes().yaxis.min,
         plot.getAxes().yaxis.max,
@@ -2727,11 +2729,9 @@ function pandoraFlotArea(
         extremes,
         red_up
       );
-    } else {
-      var y_recal = plot.getAxes().yaxis.max;
     }
 
-    datas_treshold = add_threshold(
+    var datas_treshold = add_threshold(
       data_base,
       threshold_data,
       plot.getAxes().yaxis.min,
@@ -2762,7 +2762,7 @@ function pandoraFlotArea(
   // Reset interactivity styles
   function resetInteractivity() {
     $("#timestamp_" + graph_id).hide();
-    dataset = plot.getData();
+    var dataset = plot.getData();
     for (i = 0; i < dataset.length; ++i) {
       var series = dataset[i];
       var label_aux = legend[series.label];
@@ -2784,15 +2784,14 @@ function pandoraFlotArea(
     overview.clearCrosshair();
   }
 
-  function yFormatter(v, axis) {
+  function yFormatter(v) {
+    var formatted = v;
     if (short_data) {
-      var formatted = number_format(v, force_integer, "", short_data);
+      formatted = number_format(v, force_integer, "", short_data);
     } else {
       // It is an integer
       if (v - Math.floor(v) == 0) {
-        var formatted = number_format(v, force_integer, "", 2);
-      } else {
-        var formatted = v;
+        formatted = number_format(v, force_integer, "", 2);
       }
     }
 
@@ -2801,7 +2800,7 @@ function pandoraFlotArea(
     return formatted;
   }
 
-  function lFormatter(v, item) {
+  function lFormatter(v) {
     return '<span style="color:' + legend_color + '">' + legend[v] + "</span>";
   }
 
@@ -2858,9 +2857,10 @@ function pandoraFlotArea(
         );
         thresholded = false;
       } else {
+        var y_recal = plot.getAxes().yaxis.max;
         if (!thresholded) {
           // Recalculate the y axis
-          var y_recal = axis_thresholded(
+          y_recal = axis_thresholded(
             threshold_data,
             plot.getAxes().yaxis.min,
             plot.getAxes().yaxis.max,
@@ -2868,8 +2868,6 @@ function pandoraFlotArea(
             extremes,
             red_up
           );
-        } else {
-          var y_recal = plot.getAxes().yaxis.max;
         }
 
         datas_treshold = add_threshold(
@@ -2917,7 +2915,6 @@ function pandoraFlotArea(
         homeurl + "images/zoom_cross.disabled.png"
       );
       overview.clearSelection();
-      currentRanges = null;
       thresholded = false;
       max_draw = [];
     });
@@ -2932,7 +2929,6 @@ function pandoraFlotArea(
 
     // Add bottom margin in the legend
     // Estimated height of 24 (works fine with this data in all browsers)
-    menu_height = 24;
     $("#legend_" + graph_id).css("margin-bottom", "10px");
     parent_height = parseInt(
       $("#menu_" + graph_id)
@@ -2979,6 +2975,7 @@ function format_unit_yaxes(y) {
 }
 
 function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
+  var left_ticks_width = 0;
   if (
     $("#" + graph_id + " .xAxis .tickLabel")
       .eq(0)
@@ -2988,14 +2985,11 @@ function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
       .eq(0)
       .css("width")
       .split("px")[0];
-  } else {
-    left_ticks_width = 0;
   }
 
-  var parent_height_new = 0;
-
+  var legend_height = 0;
   if (show_legend) {
-    var legend_height =
+    legend_height =
       parseInt(
         $("#legend_" + graph_id)
           .css("height")
@@ -3006,12 +3000,9 @@ function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
           .css("margin-top")
           .split("px")[0]
       );
-  } else {
-    var legend_height = 0;
   }
 
   var menu_height = "25";
-
   if (
     $("#menu_" + graph_id).height() != undefined &&
     $("#menu_" + graph_id).height() > 20
@@ -3019,7 +3010,7 @@ function adjust_menu(graph_id, plot, parent_height, width, show_legend) {
     menu_height = $("#menu_" + graph_id).height();
   }
 
-  offset = $("#" + graph_id)[0].offsetTop;
+  var offset = $("#" + graph_id)[0].offsetTop;
 
   $("#menu_" + graph_id).css("top", offset + "px");
 
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 637d02b34b..4492da7834 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -82,9 +82,22 @@ function include_javascript_dependencies_flot_graph($return=false)
 }
 
 
-//
-// AREA GRAPHS ////////
-//
+/**
+ * Function create container for print charts.
+ *
+ * @param integer $agent_module_id     Id module.
+ * @param array   $array_data          Data.
+ * @param array   $legend              Legend.
+ * @param array   $series_type         Series.
+ * @param array   $color               Color.
+ * @param array   $date_array          Date.
+ * @param array   $data_module_graph   Data module.
+ * @param array   $params              Params.
+ * @param string  $water_mark          Water.
+ * @param array   $array_events_alerts Events array.
+ *
+ * @return string Return graphs.
+ */
 function flot_area_graph(
     $agent_module_id,
     $array_data,
@@ -99,8 +112,7 @@ function flot_area_graph(
 ) {
     global $config;
 
-    // include_javascript_dependencies_flot_graph();
-    // Get a unique identifier to graph
+    // Get a unique identifier to graph.
     $graph_id = uniqid('graph_');
 
     $background_style = '';
@@ -126,19 +138,26 @@ function flot_area_graph(
         break;
     }
 
-    $padding_vconsole = $params['dashboard'] ? 'padding: 1px 0px 10px 10px;' : '';
+    $padding_vconsole = ($params['dashboard']) ? 'padding: 1px 0px 10px 10px;' : '';
 
-    // Parent layer
+    // Parent layer.
     $return = "<div class='parent_graph' style='width: ".($params['width']).';'.$background_style.$padding_vconsole."'>";
+
+    if (empty($params['title']) === false) {
+        $return .= '<p style="text-align:center;">'.$params['title'].'</p>';
+    }
+
     // Set some containers to legend, graph, timestamp tooltip, etc.
     if ($params['show_legend']) {
-        $return .= "<p id='legend_$graph_id' style='text-align:left;'></p>";
+        $return .= '<p id="legend_'.$graph_id.'" style="text-align:left;"></p>';
     }
 
     if (isset($params['graph_combined']) && $params['graph_combined']
         && (!isset($params['from_interface']) || !$params['from_interface'])
     ) {
-        if (isset($params['threshold_data']) && is_array($params['threshold_data'])) {
+        if (isset($params['threshold_data'])
+            && is_array($params['threshold_data'])
+        ) {
             $yellow_threshold = $params['threshold_data']['yellow_threshold'];
             $red_threshold    = $params['threshold_data']['red_threshold'];
             $yellow_up        = $params['threshold_data']['yellow_up'];
@@ -154,7 +173,7 @@ function flot_area_graph(
     } else if (!isset($params['combined']) || !$params['combined']) {
         $yellow_threshold = $data_module_graph['w_min'];
         $red_threshold    = $data_module_graph['c_min'];
-        // Get other required module datas to draw warning and critical
+        // Get other required module datas to draw warning and critical.
         if ($agent_module_id == 0) {
             $yellow_up      = 0;
             $red_up         = 0;
@@ -166,8 +185,12 @@ function flot_area_graph(
             $yellow_inverse = !($data_module_graph['w_inv'] == 0);
             $red_inverse    = !($data_module_graph['c_inv'] == 0);
         }
-    } else if (isset($params['from_interface']) && $params['from_interface']) {
-        if (isset($params['threshold_data']) && is_array($params['threshold_data'])) {
+    } else if (isset($params['from_interface'])
+        && $params['from_interface']
+    ) {
+        if (isset($params['threshold_data'])
+            && is_array($params['threshold_data'])
+        ) {
             $yellow_threshold = $params['threshold_data']['yellow_threshold'];
             $red_threshold    = $params['threshold_data']['red_threshold'];
             $yellow_up        = $params['threshold_data']['yellow_up'];
@@ -200,7 +223,11 @@ function flot_area_graph(
         );
     }
 
-    $return .= html_print_input_hidden('line_width_graph', $config['custom_graph_width'], true);
+    $return .= html_print_input_hidden(
+        'line_width_graph',
+        $config['custom_graph_width'],
+        true
+    );
     $return .= "<div id='timestamp_$graph_id'
 					class='timestamp_graph'
 					style='	font-size:".$params['font_size']."pt;
@@ -239,20 +266,21 @@ function flot_area_graph(
         $series_type_unique['data_'.$graph_id.'_'.$k] = $v;
     }
 
-    // Store data series in javascript format
+    // Store data series in javascript format.
     $extra_width = (int) ($params['width'] / 3);
     $return .= "<div id='extra_$graph_id'
-					style='font-size: ".$params['font_size'].'pt;
-					display:none; position:absolute; overflow: auto;
-					max-height: '.($params['height'] + 50).'px;
-					width: '.$extra_width."px;
-					background:#fff; padding: 2px 2px 2px 2px;
-					border: solid #000 1px;'></div>";
+        style='font-size: ".$params['font_size'].'pt;
+        display:none; position:absolute; overflow: auto;
+        max-height: '.($params['height'] + 50).'px;
+        width: '.$extra_width."px;
+        background:#fff; padding: 2px 2px 2px 2px;
+        border: solid #000 1px;'></div>";
 
-    // Trick to get translated string from javascript
+    // Trick to get translated string from javascript.
     $return .= html_print_input_hidden('unknown_text', __('Unknown'), true);
 
-    $values              = json_encode($array_data);
+    $values = json_encode($array_data);
+
     $legend              = json_encode($legend);
     $series_type         = json_encode($series_type);
     $color               = json_encode($color);
@@ -261,7 +289,7 @@ function flot_area_graph(
     $params              = json_encode($params);
     $array_events_alerts = json_encode($array_events_alerts);
 
-    // Javascript code
+    // Javascript code.
     if ($font_size == '') {
         $font_size = '\'\'';
     }
@@ -272,7 +300,7 @@ function flot_area_graph(
     $return .= '});';
     $return .= '</script>';
 
-    // Parent layer
+    // Parent layer.
     $return .= '</div>';
 
     return $return;
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e8e47fd711..43c941b797 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.735';
-            $build = '190523';
+            $build = '190527';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index f47a1efc8e..93b8fac63b 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -80,12 +80,34 @@ if (isset($_GET['modified']) && !$view_mode) {
     $upd_info['id_skin'] = get_parameter('skin', $user_info['id_skin']);
     $upd_info['default_event_filter'] = get_parameter('event_filter', null);
     $upd_info['block_size'] = get_parameter('block_size', $config['block_size']);
-    $upd_info['firstname'] = get_parameter('newsletter_reminder', $user_info['first_name']);
+    $upd_info['middlename'] = get_parameter_switch('newsletter_reminder', $user_info['middlename']);
     $default_block_size = get_parameter('default_block_size', 0);
     if ($default_block_size) {
         $upd_info['block_size'] = 0;
     }
 
+    if ($upd_info['middlename'] == 1) {
+        // User wants to enable newsletter reminders.
+        if ($user_info['middlename'] > 0) {
+            // User has already registered!. No sense.
+            $upd_info['middlename'] = $user_info['middlename'];
+        } else {
+            // Force subscription reminder.
+            $upd_info['middlename'] = 0;
+        }
+    }
+
+    if ($upd_info['middlename'] == 0 || $upd_info['middlename'] == 0) {
+        // Switch is ON. user had not registered.
+        $newsletter_reminder_value = 1;
+    } else if ($upd_info['middlename'] < 1) {
+        // Switch is OFF. User do not want to register.
+        $newsletter_reminder_value = 0;
+    } else if ($upd_info['middlename'] > 0) {
+        // Switc is OFF. User is already registered!
+        $newsletter_reminder_value = 0;
+    }
+
     $upd_info['section'] = get_parameter('section', $user_info['section']);
     $upd_info['data_section'] = get_parameter('data_section', '');
     $dashboard = get_parameter('dashboard', '');
@@ -396,23 +418,28 @@ if (check_acl($config['id_user'], 0, 'ER')) {
         null,
         true
     ).'</div>';
-} else if (license_free()) {
-    $newsletter = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Subscribed').': </p>';
-    if ($user_info['middlename']) {
-        $newsletter .= '<span>'.__('Already subscribed to %s newsletter', get_product_name()).'</span></div>';
-    } else {
-        $newsletter .= '<span><a href="javascript: force_run_newsletter();">'.__('Subscribe to our newsletter').'</a></span></div>';
-    }
-
-    $newsletter_reminder = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Reminder').': </p>';
-    if ($user_info['firstname'] != 0) {
-        $user_info['firstname'] = 1;
-    }
-
-    $newsletter_reminder .= html_print_checkbox_switch('newsletter_reminder', 1, $user_info['firstname'], true).'</div>';
 }
 
 
+$newsletter = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Subscribed').': </p>';
+if ($user_info['middlename'] > 0) {
+    $newsletter .= '<span>'.__('Already subscribed to %s newsletter', get_product_name()).'</span>';
+} else {
+    $newsletter .= '<span><a href="javascript: force_run_newsletter();">'.__('Subscribe to our newsletter').'</a></span></div>';
+    $newsletter_reminder = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Newsletter Reminder').': </p>';
+    $newsletter_reminder .= html_print_switch(
+        [
+            'name'     => 'newsletter_reminder',
+            'value'    => $newsletter_reminder_value,
+            'disabled' => false,
+        ]
+    );
+}
+
+$newsletter_reminder .= '</div>';
+
+
+
 $autorefresh_list_out = [];
 if (is_metaconsole()) {
     $autorefresh_list_out['monitoring/tactical'] = 'Tactical view';
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index c5c593d2be..62bbca26bd 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index ac9764e1ee..cdb32cc641 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index e6c3adcebe..f75bd6503b 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index cfb5135ae1..e0c8a4fa52 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190523
+Version: 7.0NG.735-190527
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index dc1dfc8662..88884097fe 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/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.735-190523"
+pandora_version="7.0NG.735-190527"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f4701c0fa1..a72dac39c8 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/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.735";
-my $pandora_build = "190523";
+my $pandora_build = "190527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
@@ -1133,6 +1133,18 @@ sub pandora_load_config {
 		elsif ($parametro =~ m/^fsnmp\s(.*)/i) {
 			$pa_config->{'fsnmp'}= clean_blank($1); 
 		}
+
+		# Pandora HA extra
+		elsif ($parametro =~ m/^ha_file\s(.*)/i) {
+			$pa_config->{'ha_file'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^ha_pid_file\s(.*)/i) {
+			$pa_config->{'ha_pid_file'} = clean_blank($1);
+		}
+		elsif ($parametro =~ m/^pandora_service_cmd\s(.*)/i) {
+			$pa_config->{'pandora_service_cmd'} = clean_blank($1);
+		}
+		
 	} # end of loop for parameter #
 
 	# Set to RDBMS' standard port
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 20ee212e76..a3806c7e60 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -32,7 +32,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.735";
-my $pandora_build = "190523";
+my $pandora_build = "190527";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 645677628a..a75f57b68e 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 5b6cb2507e..9b4eea12e0 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.735
-%define release     190523
+%define release     190527
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 24b7ed329f..f04c4c0b18 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190523"
+PI_BUILD="190527"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c4b8def713..a0f7a736ec 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.735 PS190523";
+my $version = "7.0NG.735 PS190527";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7f59bdbb0d..a574d3fa54 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/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.735 PS190523";
+my $version = "7.0NG.735 PS190527";
 
 # save program name for logging
 my $progname = basename($0);