From df8042abb1264d78f4a40ce9e32a14485b5bdeed Mon Sep 17 00:00:00 2001
From: Alejandro Gallardo Escobar <alejandro.gallardo@artica.es>
Date: Tue, 12 Feb 2019 17:45:25 +0100
Subject: [PATCH 01/61] Fixed the error message of the password recovery

Former-commit-id: 3bc9b4044bbe56ec5a1c1f4cbdb3f56db5680abb
---
 pandora_console/general/login_page.php |  4 +-
 pandora_console/index.php              | 92 +++++++++++---------------
 2 files changed, 42 insertions(+), 54 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index 198b5c3fc9..1a99e0d196 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -342,7 +342,7 @@ echo '</div>';
 echo '<div id="ver_num">'.$pandora_version.(($develop_bypass == 1) ? ' '.__('Build').' '.$build_version : '').'</div>';
 echo '</div>';
 
-if (!isset($process_error_message) && isset($mail)) {
+if (empty($process_error_message) && isset($mail)) {
     echo '<div id="reset_correct" title="'.__('Password reset').'">';
         echo '<div class="content_alert">';
             echo '<div class="icon_message_alert">';
@@ -359,7 +359,7 @@ if (!isset($process_error_message) && isset($mail)) {
             echo '</div>';
         echo '</div>';
     echo '</div>';
-} else if (isset($process_error_message)) {
+} else if (isset($process_error_message) && !empty($process_error_message)) {
     echo '<div id="reset_correct" title="'.__('Password reset').'">';
         echo '<div class="content_alert">';
             echo '<div class="icon_message_alert">';
diff --git a/pandora_console/index.php b/pandora_console/index.php
index ad4b93465a..ae79d76f69 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -619,10 +619,9 @@ if (! isset($config['id_user'])) {
 
         header('Location: '.$config['homeurl'].'index.php'.$redirect_url);
         exit;
-        // Always exit after sending location headers
-    }
-    // Hash login process
-    else if (isset($_GET['loginhash'])) {
+        // Always exit after sending location headers.
+    } else if (isset($_GET['loginhash'])) {
+        // Hash login process
         $loginhash_data = get_parameter('loginhash_data', '');
         $loginhash_user = str_rot13(get_parameter('loginhash_user', ''));
 
@@ -638,9 +637,8 @@ if (! isset($config['id_user'])) {
 
             exit('</html>');
         }
-    }
-    // There is no user connected
-    else {
+    } else {
+        // There is no user connected.
         if ($config['enterprise_installed']) {
             enterprise_include_once('include/functions_reset_pass.php');
         }
@@ -722,64 +720,55 @@ if (! isset($config['id_user'])) {
                     $show_error = false;
 
                     if (!$first) {
-                        if ($reset) {
-                            if ($user_reset_pass == '') {
+                        if ($user_reset_pass == '') {
+                            $reset = false;
+                            $error = __('Id user cannot be empty');
+                            $show_error = true;
+                        } else {
+                            $check_user = check_user_id($user_reset_pass);
+
+                            if (!$check_user) {
                                 $reset = false;
-                                $error = __('Id user cannot be empty');
+                                register_pass_change_try($user_reset_pass, 0);
+                                $error = __('Error in reset password request');
                                 $show_error = true;
                             } else {
-                                $check_user = check_user_id($user_reset_pass);
+                                $check_mail = check_user_have_mail($user_reset_pass);
 
-                                if (!$check_user) {
+                                if (!$check_mail) {
                                     $reset = false;
                                     register_pass_change_try($user_reset_pass, 0);
-                                    $error = __('Error in reset password request');
+                                    $error = __('This user doesn\'t have a valid email address');
                                     $show_error = true;
                                 } else {
-                                    $check_mail = check_user_have_mail($user_reset_pass);
-
-                                    if (!$check_mail) {
-                                        $reset = false;
-                                        register_pass_change_try($user_reset_pass, 0);
-                                        $error = __('This user doesn\'t have a valid email address');
-                                        $show_error = true;
-                                    } else {
-                                        $mail = $check_mail;
-                                    }
+                                    $mail = $check_mail;
                                 }
                             }
                         }
 
-                        if (!$reset) {
-                            if ($config['enterprise_installed']) {
-                                include_once 'enterprise/include/reset_pass.php';
-                            }
+                        $cod_hash = $user_reset_pass.'::::'.md5(rand(10, 1000000).rand(10, 1000000).rand(10, 1000000));
+
+                        $subject = '['.io_safe_output(get_product_name()).'] '.__('Reset password');
+                        $body = __('This is an automatically sent message for user ');
+                        $body .= ' "<strong>'.$user_reset_pass.'"</strong>';
+                        $body .= '<p />';
+                        $body .= __('Please click the link below to reset your password');
+                        $body .= '<p />';
+                        $body .= '<a href="'.$config['homeurl'].'index.php?reset_hash='.$cod_hash.'">'.__('Reset your password').'</a>';
+                        $body .= '<p />';
+                        $body .= get_product_name();
+                        $body .= '<p />';
+                        $body .= '<em>'.__('Please do not reply to this email.').'</em>';
+
+                        $result = send_email_to_user($mail, $body, $subject);
+
+                        if (!$result) {
+                            $process_error_message = __('Error at sending the email');
                         } else {
-                            $cod_hash = $user_reset_pass.'::::'.md5(rand(10, 1000000).rand(10, 1000000).rand(10, 1000000));
-
-                            $subject = '['.get_product_name().'] '.__('Reset password');
-                            $body = __('This is an automatically sent message for user ');
-                            $body .= ' "<strong>'.$user_reset_pass.'"</strong>';
-                            $body .= '<p />';
-                            $body .= __('Please click the link below to reset your password');
-                            $body .= '<p />';
-                            $body .= '<a href="'.$config['homeurl'].'index.php?reset_hash='.$cod_hash.'">'.__('Reset your password').'</a>';
-                            $body .= '<p />';
-                            $body .= get_product_name();
-                            $body .= '<p />';
-                            $body .= '<em>'.__('Please do not reply to this email.').'</em>';
-
-                            $result = send_email_to_user($mail, $body, $subject);
-
-                            $process_error_message = '';
-                            if (!$result) {
-                                $process_error_message = __('Error at sending the email');
-                            } else {
-                                send_token_to_db($user_reset_pass, $cod_hash);
-                            }
-
-                            include_once 'general/login_page.php';
+                            send_token_to_db($user_reset_pass, $cod_hash);
                         }
+
+                        include_once 'general/login_page.php';
                     } else {
                         include_once 'enterprise/include/reset_pass.php';
                     }
@@ -1363,4 +1352,3 @@ require 'include/php_to_js_values.php';
 if (__PAN_XHPROF__ === 1) {
     pandora_xhprof_display_result('node_index');
 }
-

From 36b58d0db83bceb77f7417487a8f543cc0613460 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Tue, 26 Feb 2019 16:45:54 +0100
Subject: [PATCH 02/61] ticket resolved

Former-commit-id: 18e461d26d516a4b58f65ee916e3950b2e85d312
---
 pandora_console/godmode/agentes/modificar_agente.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4673bf2f46..a751c06ea1 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -118,7 +118,7 @@ if ($enable_agent) {
         enterprise_include_once('include/functions_agents.php');
         $values = ['disabled' => 0];
         enterprise_hook('agent_update_from_cache', [$enable_agent, $values, $server_name]);
-
+        config_agents_update_config_token($enable_agent, 'standby', 0);
         db_pandora_audit('Agent management', 'Enable  '.$alias);
     } else {
         db_pandora_audit('Agent management', 'Fail to enable '.$alias);
@@ -140,6 +140,7 @@ if ($disable_agent) {
         enterprise_include_once('include/functions_agents.php');
         $values = ['disabled' => 1];
         enterprise_hook('agent_update_from_cache', [$disable_agent, $values, $server_name]);
+        config_agents_update_config_token($disable_agent, 'standby', 1);
 
         db_pandora_audit('Agent management', 'Disable  '.$alias);
     } else {

From f6b6073a16d85207e7d4f26780e2dad5d65610d0 Mon Sep 17 00:00:00 2001
From: Luis Calvo <luis.calvo@artica.es>
Date: Wed, 27 Feb 2019 17:23:59 +0100
Subject: [PATCH 03/61] Fixed ldap adv. perms continues apliying when
 autocreate remote is unselected by cheking it on user login

Former-commit-id: ca6a8a1217ec41d7edadf971e935d506ad9e0cff
---
 pandora_console/include/auth/mysql.php | 61 ++++++++++++++------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index aab0b4c9e4..c4b8fc9840 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -282,39 +282,42 @@ function process_user_login_remote($login, $pass, $api=false)
                 }
             }
         } else if ($config['auth'] === 'ldap') {
-            if ($config['ldap_save_password']) {
-                $update_credentials = change_local_user_pass_ldap($login, $pass);
+            // Check if autocreate  remote users is active.
+            if ($config['autocreate_remote_users'] == 1) {
+                if ($config['ldap_save_password']) {
+                    $update_credentials = change_local_user_pass_ldap($login, $pass);
 
-                if ($update_credentials) {
-                    $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                    return false;
-                }
-            } else {
-                delete_user_pass_ldap($login);
-            }
-
-            $permissions = fill_permissions_ldap($sr);
-            if (empty($permissions)) {
-                $config['auth_error'] = __('User not found in database or incorrect password');
-                return false;
-            } else {
-                // check permissions
-                $result = check_permission_ad(
-                    $login,
-                    $pass,
-                    false,
-                    $permissions,
-                    defined('METACONSOLE')
-                );
-
-                if ($return === 'error_permissions') {
-                    $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
-                    return false;
-                } else {
-                    if ($return === 'permissions_changed') {
+                    if ($update_credentials) {
                         $config['auth_error'] = __('Your permissions have changed. Please, login again.');
                         return false;
                     }
+                } else {
+                    delete_user_pass_ldap($login);
+                }
+
+                $permissions = fill_permissions_ldap($sr);
+                if (empty($permissions)) {
+                    $config['auth_error'] = __('User not found in database or incorrect password');
+                    return false;
+                } else {
+                    // check permissions
+                    $result = check_permission_ad(
+                        $login,
+                        $pass,
+                        false,
+                        $permissions,
+                        defined('METACONSOLE')
+                    );
+
+                    if ($return === 'error_permissions') {
+                        $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
+                        return false;
+                    } else {
+                        if ($return === 'permissions_changed') {
+                            $config['auth_error'] = __('Your permissions have changed. Please, login again.');
+                            return false;
+                        }
+                    }
                 }
             }
         }

From 450eccee7fa4358a03ae9c9ee2c1bd6c42a48264 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Tue, 5 Mar 2019 13:17:21 +0100
Subject: [PATCH 04/61] ticket resolved, duplicated sentece

Former-commit-id: bf419c14b79b633bb2894a34a91f74b32551549e
---
 pandora_console/godmode/setup/performance.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 666dd0b21c..1b514687ac 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -247,8 +247,7 @@ $table->style[0] = 'font-weight: bold';
 $table->size[0] = '70%';
 $table->size[1] = '30%';
 
-enterprise_hook('enterprise_warnings_history_days');
-
+// enterprise_hook('enterprise_warnings_history_days');
 $table->data[1][0] = __('Max. days before delete events');
 $table->data[1][0] .= ui_print_help_tip(
     __('If the compaction or purge of the data is more frequent than the events deletion, anomalies in module graphs could appear'),

From f26593dc21920ff562ca2577a5e8224dfae24162 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Thu, 7 Mar 2019 12:34:09 +0100
Subject: [PATCH 05/61] Success

Former-commit-id: 7920fc0927ddab510b2a9869a09fd7e0cf166182
---
 pandora_console/include/functions_html.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 6d461350e9..0768014827 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -518,7 +518,7 @@ function html_print_select(
     $selected='',
     $script='',
     $nothing='',
-    $nothing_value=0,
+    $nothing_value=none,
     $return=false,
     $multiple=false,
     $sort=true,
@@ -623,8 +623,6 @@ function html_print_select(
                 $output .= 'selected ';
             }
 
-            $output .= 'value="'.$value.'"';
-
             if (is_array($selected) && in_array($value, $selected)) {
                 $output .= ' selected="selected"';
             } else if (is_numeric($value) && is_numeric($selected)
@@ -644,7 +642,7 @@ function html_print_select(
             }
 
             if ($optlabel === '') {
-                $output .= '>'.$value.'</option>';
+                $output .= '>None</option>';
             } else {
                 $output .= '>'.$optlabel.'</option>';
             }

From 39974a1780d216cd4569cbb2dac19978e44652fb Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Thu, 7 Mar 2019 12:37:50 +0100
Subject: [PATCH 06/61] Arreglado

Former-commit-id: a77d86dac7913a7f0f7bf7173eb67eb8609920ed
---
 pandora_console/include/functions_html.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 0768014827..6a0b3bf5ac 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -518,7 +518,7 @@ function html_print_select(
     $selected='',
     $script='',
     $nothing='',
-    $nothing_value=none,
+    $nothing_value=0,
     $return=false,
     $multiple=false,
     $sort=true,
@@ -623,6 +623,8 @@ function html_print_select(
                 $output .= 'selected ';
             }
 
+            $output .= 'value="'.$value.'"';
+
             if (is_array($selected) && in_array($value, $selected)) {
                 $output .= ' selected="selected"';
             } else if (is_numeric($value) && is_numeric($selected)

From 57cfdcfbc4b9e91e8343ed6d2e4ca3028c418715 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Thu, 4 Apr 2019 18:06:48 +0200
Subject: [PATCH 07/61] Changed check value on JS

Former-commit-id: 508cf9a75eedd4836720215451903c3951339ddf
---
 pandora_console/include/javascript/pandora_modules.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index e835f87c24..604a778335 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -183,10 +183,10 @@ function configure_modules_form() {
         );
         $("#text-unit").attr("value", data["unit"] == "" ? "" : data["unit"]);
         $("#checkbox-critical_inverse").prop(
-          "checked",
+          "uncheck",
           data["critical_inverse"]
         );
-        $("#checkbox-warning_inverse").prop("checked", data["warning_inverse"]);
+        $("#checkbox-warning_inverse").prop("uncheck", data["warning_inverse"]);
         $("#component_loading").hide();
         $("#id_module_type").change();
         if ($("#id_category").is("select")) {

From 86dabc6476a5d12c5ed7bcb4ef367695e1ae8610 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Fri, 17 May 2019 11:31:02 +0200
Subject: [PATCH 08/61] Variability event_storm_protection check is added with
 empty data

---
 pandora_console/include/functions_config.php |  2 +-
 pandora_server/lib/PandoraFMS/Core.pm        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index dc0e845afb..1747629920 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -270,7 +270,7 @@ function config_update_config()
                         $error_update[] = __('Referer security');
                     }
 
-                    if (!config_update_value('event_storm_protection', get_parameter('event_storm_protection'))) {
+                    if (!config_update_value('event_storm_protection', get_parameter('event_storm_protection', 0))) {
                         $error_update[] = __('Event storm protection');
                     }
 
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 296be928a4..536669afd2 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -360,9 +360,15 @@ sub pandora_generate_alerts ($$$$$$$$;$$$) {
 	my ($pa_config, $data, $status, $agent, $module, $utimestamp, $dbh, $timestamp, $extra_macros, $last_data_value, $alert_type) = @_;
 
 	# No alerts when event storm protection is enabled
-	if ($EventStormProtection == 1) {
+	if(isnumber $EventStormProtection ){
+		if ($EventStormProtection == 1)
+		{
 		return;
-	}
+		}
+	}else{
+		$EventStormProtection = 0;
+		return;
+	}   
 
 	# Warmup interval for alerts.
 	if ($pa_config->{'warmup_alert_on'} == 1) {

From e82916001bfe00ce764ef183b245c7ab8caca361 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Wed, 22 May 2019 10:18:44 +0200
Subject: [PATCH 09/61] allow fetching of event id in metaconsole event table
 when getting target of an event response in metaconsole having server_id=0

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

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 52eb525bc1..5b2ee546a6 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2293,7 +2293,7 @@ function events_get_response_target(
     global $config;
 
     // If server_id > 0, it's a metaconsole query.
-    $meta = $server_id > 0;
+    $meta = $server_id > 0 || is_metaconsole();
     $event_table = events_get_events_table($meta, $history);
     $event = db_get_row($event_table, 'id_evento', $event_id);
 

From 7347324601fb7a241335e7eb659e13bab83bf893 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 13:19:08 +0200
Subject: [PATCH 10/61] Minor fixes - discovery styles

---
 pandora_console/godmode/wizards/Wizard.main.php |  6 +++---
 pandora_console/include/styles/discovery.css    | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index 6468f1d2ac..f7f5e9a5c8 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -796,7 +796,7 @@ class Wizard
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -868,7 +868,7 @@ class Wizard
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
@@ -963,7 +963,7 @@ class Wizard
         $cb_function = $data['cb_function'];
         $cb_args = $data['cb_args'];
 
-        $output_head = '<form enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
+        $output_head = '<form class="discovery" enctype="'.$form['enctype'].'" action="'.$form['action'].'" method="'.$form['method'];
         $output_head .= '" '.$form['extra'].'>';
 
         if ($return === false) {
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 6df04ae736..fe8431a24a 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -27,6 +27,11 @@ li.discovery > a label {
   cursor: pointer;
 }
 
+div.data_container > label {
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-weight: lighter;
+}
+
 div.data_container {
   width: 100%;
   height: 100%;
@@ -160,6 +165,10 @@ span.breadcrumb_link {
  * Discovery forms structure
  */
 
+form.discovery * {
+  font-size: 10pt;
+}
+
 .edit_discovery_info {
   display: flex;
   align-items: flex-start;
@@ -196,7 +205,9 @@ li > input[type="password"],
   background-color: transparent !important;
   border: none;
   border-radius: 0 !important;
-  border-bottom: 1px solid #343434;
+  border-bottom: 1px solid #ccc;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-weight: lighter;
   padding: 0px 0px 2px 0px;
   box-sizing: border-box;
   margin-bottom: 4px;
@@ -215,7 +226,7 @@ li > input[type="password"],
 }
 
 .discovery_list_input option {
-  text-align: center;
+  text-align: left;
 }
 
 .discovery_list_input option:checked {

From 9eecc414dd3baeb34d58c5e66d5cc2e8a186c038 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 14:12:53 +0200
Subject: [PATCH 11/61] cps changes - switch core touched - test this commit
 carefully

---
 .../godmode/agentes/agent_manager.php         | 34 +++++++++++--------
 .../godmode/agentes/configurar_agente.php     |  5 ++-
 pandora_console/include/functions.php         |  5 +--
 pandora_console/include/javascript/pandora.js |  2 +-
 pandora_console/include/styles/pandora.css    |  4 ++-
 .../operation/agentes/ver_agente.php          |  1 +
 6 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index cee4cb2684..8b88d0737a 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -396,7 +396,7 @@ if (enterprise_installed()) {
         // CSS classnames (default)
         false,
         // Not disabled (default)
-        'width:50%; min-width:170px; text-align:center',
+        'width:50%; min-width:170px;',
         // Inline styles (default)
         false,
         // Option style select (default)
@@ -457,7 +457,7 @@ if (enterprise_installed()) {
         // Class
         false,
         // Disabled
-        'width:50%; min-width:170px; text-align:center'
+        'width:50%; min-width:170px;'
         // Style
     );
 
@@ -510,21 +510,27 @@ if (enterprise_installed()) {
 
     $table_adv_remote .= '</div>';
 
-    $cps_array[-1] = __('Disabled');
-    if ($cps > 0) {
-        $cps_array[$cps] = __('Enabled');
-    } else {
-        $cps_inc = 0;
-        if ($id_agente) {
-            $cps_inc = service_agents_cps($id_agente);
-        }
 
-        $cps_array[$cps_inc] = __('Enabled');
+    // Calculate cps value - agents.
+    if ($id_agente) {
+        $cps_val = service_agents_cps($id_agente);
+    } else {
+        // No agent defined, use received cps as base value.
+        if ($cps >= 0) {
+            $cps_val = $cps;
+        }
     }
 
-    $table_adv_cascade = '<div class="label_select"><p class="input_label">'.__('Cascade protection services').': ';
-    $table_adv_cascade .= ui_print_help_tip(__('Disable the alerts and events of the elements that belong to this service'), true).'</p>';
-    $table_adv_cascade .= html_print_select($cps_array, 'cps', $cps, '', '', 0, true).'</div>';
+    $cps_html = '<div class="label_select"><div class="label_simple_items">';
+    $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true);
+    $cps_html .= __('Cascade protection services').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
+    $cps_html .= ui_print_help_tip(
+        __('Alerts and events will be managed by the service joined by this agent.'),
+        true
+    );
+    $cps_html .= '</div></div>';
+
+    $table_adv_cascade .= $cps_html;
 }
 
 // Custom ID
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 4e3b399e96..6a1d9404c5 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -194,7 +194,7 @@ if ($create_agent) {
     $update_gis_data = (int) get_parameter_post('update_gis_data', 0);
     $url_description = (string) get_parameter('url_description');
     $quiet = (int) get_parameter('quiet', 0);
-    $cps = (int) get_parameter('cps', 0);
+    $cps = (int) get_parameter_switch('cps', -1);
 
     $secondary_groups = (string) get_parameter('secondary_hidden', '');
     $fields = db_get_all_fields_in_table('tagent_custom_fields');
@@ -829,8 +829,7 @@ if ($update_agent) {
     $update_gis_data = (int) get_parameter_post('update_gis_data', 0);
     $url_description = (string) get_parameter('url_description');
     $quiet = (int) get_parameter('quiet', 0);
-    $cps = (int) get_parameter('cps', 0);
-
+    $cps = get_parameter_switch('cps', -1);
     $old_values = db_get_row('tagente', 'id_agente', $id_agente);
     $fields = db_get_all_fields_in_table('tagent_custom_fields');
 
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 73b787ff99..a5f1d92a7a 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -871,12 +871,13 @@ function get_parameter_switch($name, $default='')
     $data = get_parameter($name, null);
 
     if ($data === null) {
-        return 0;
+        return (isset($default) ? $default : 0);
     } else if ($data == 'on') {
         return 1;
     }
 
-    return 0;
+    // Return value assigned to switch.
+    return $data;
 }
 
 
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index d5413e3c09..351531a5e9 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1226,7 +1226,7 @@ function paint_qrcode(text, where, width, height) {
     text: text,
     width: width,
     height: height,
-    colorDark: "#3B6941",
+    colorDark: "#343434",
     colorLight: "#ffffff",
     correctLevel: QRCode.CorrectLevel.M
   });
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 86a461485e..e5114cadda 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5588,7 +5588,9 @@ table.info_table.policy_sub_table {
   background-color: transparent !important;
   border: none;
   border-radius: 0 !important;
-  border-bottom: 1px solid #343434;
+  border-bottom: 1px solid #888;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-size: 10pt;
   padding: 2px 5px;
   box-sizing: border-box;
   background-repeat: no-repeat;
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 46cfc69aec..43abb4602b 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1435,6 +1435,7 @@ switch ($tab) {
     break;
 
     case 'main':
+    default:
         include 'estado_generalagente.php';
         echo "<a name='monitors'></a>";
         include 'estado_monitores.php';

From 0280547465c0ca264dbc6cf47721ae2e274fd618 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 15:41:23 +0200
Subject: [PATCH 12/61] some changes

---
 .../godmode/agentes/agent_manager.php         | 53 ++++++++++++++-----
 pandora_console/include/styles/pandora.css    | 12 ++++-
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 8b88d0737a..213a07bf2d 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -167,13 +167,41 @@ if ($disk_conf_delete) {
 
 echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
 
+// Custom ID.
+$custom_id_div = '<div class="label_select">';
+$custom_id_div .= '<p class="input_label">'.__('Custom ID').': </p>';
+$custom_id_div .= html_print_input_text(
+    'custom_id',
+    $custom_id,
+    '',
+    16,
+    255,
+    true,
+    false,
+    false,
+    '',
+    'agent_custom_id'
+).'</div>';
+
 if (!$new_agent && $alias != '') {
     $table_agent_name = '<div class="label_select"><p class="input_label">'.__('Agent name').': '.ui_print_help_tip(__("The agent's name must be the same as the one defined at the console"), true).'</p>';
     $table_agent_name .= '<div class="label_select_parent">';
     $table_agent_name .= '<div class="label_select_child_left">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
     $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name">';
 
-    $table_qr_code = '<div class="agent_qr white_box"><p class="input_label">'.__('QR Code Agent view').': </p>';
+    // QR code div.
+    $table_qr_code = '<div class="agent_qr white_box">';
+    $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>';
+    $table_qr_code .= '<div id="qr_container_image"></div>';
+    if ($id_agente) {
+        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
+    }
+
+    // Add Custom id div.
+    $table_qr_code .= '<br />';
+    $table_qr_code .= $custom_id_div;
+    $table_qr_code .= '</div>';
+
 
     if ($id_agente) {
         $table_agent_name .= '<span>'.__('ID').' '.$id_agente.'</span>';
@@ -257,14 +285,6 @@ if ($id_agente) {
     }
 </style>
 <?php
-if (!$new_agent && $alias != '') {
-    if ($id_agente) {
-        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
-    }
-
-    $table_qr_code .= '</div>';
-}
-
 $groups = users_get_groups($config['id_user'], 'AR', false);
 
 $modules = db_get_all_rows_sql(
@@ -354,7 +374,7 @@ $table_description .= html_print_input_text(
     true
 ).'</div>';
 
-
+// QR code.
 echo '<div class="first_row">
         <div class="agent_options '.$agent_options_update.' white_box">
             <div class="agent_options_column_left">'.$table_agent_name.$table_alias.$table_ip.$table_primary_group.'</div>
@@ -533,9 +553,6 @@ if (enterprise_installed()) {
     $table_adv_cascade .= $cps_html;
 }
 
-// Custom ID
-$table_adv_custom_id = '<div class="label_select"><p class="input_label">'.__('Custom ID').': </p>';
-$table_adv_custom_id .= html_print_input_text('custom_id', $custom_id, '', 16, 255, true).'</div>';
 
 $table_adv_parent = '<div class="label_select"><p class="input_label">'.__('Parent').': </p>';
 $params = [];
@@ -692,6 +709,7 @@ if ($config['activate_gis']) {
 
 
 
+// General display distribution.
 $table_adv_options = $table_adv_secondary_groups.'<div class="secondary_groups_select" style="margin-bottom:30px;">
         <div class="secondary_groups_list_left">
             '.$table_adv_secondary_groups_left.'
@@ -704,7 +722,14 @@ $table_adv_options = $table_adv_secondary_groups.'<div class="secondary_groups_s
         </div>
     </div>
     <div class="agent_options agent_options_adv">
-        <div class="agent_options_column_left" >'.$table_adv_parent.$table_adv_custom_id.$table_adv_module_mode.$table_adv_cascade.$table_adv_gis.'</div>
+        <div class="agent_options_column_left" >'.$table_adv_parent.$table_adv_module_mode.$table_adv_cascade;
+
+if ($new_agent) {
+    // If agent is new, show custom id as old style format.
+    $table_adv_options .= $custom_id_div;
+}
+
+$table_adv_options .= $table_adv_gis.'</div>
         <div class="agent_options_column_right" >'.$table_adv_agent_icon.$table_adv_url.$table_adv_quiet.$table_adv_status.$table_adv_remote.$table_adv_safe.'</div>
     </div>';
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e5114cadda..3a0f47c4be 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5588,7 +5588,7 @@ table.info_table.policy_sub_table {
   background-color: transparent !important;
   border: none;
   border-radius: 0 !important;
-  border-bottom: 1px solid #888;
+  border-bottom: 1px solid #ccc;
   font-family: "lato-bolder", "Open Sans", sans-serif !important;
   font-size: 10pt;
   padding: 2px 5px;
@@ -5746,6 +5746,15 @@ a#qr_code_agent_view {
   margin-right: 5px;
 }
 
+#text-comentarios,
+.agent_custom_id {
+  padding-bottom: 2em;
+  background: #ececec !important;
+  display: inline-block;
+  border-radius: 5px !important;
+  border: 1px solid #ccc;
+}
+
 /*
  * ---------------------------------------------------------------------
  * - CLASSES FOR THE NEW TOGGLES                     								-
@@ -5760,6 +5769,7 @@ a#qr_code_agent_view {
   border: 1px solid #f3f3f3;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
+  margin-bottom: -1px;
   padding: 5px;
   display: block;
 }

From 556c07ad992d0a155d51bf2acc7d5e519768c960 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 17:12:35 +0200
Subject: [PATCH 13/61] Minor changes in configurar_agente

---
 .../godmode/agentes/agent_manager.php         | 58 +++++++++++--------
 .../godmode/agentes/configurar_agente.php     |  7 ++-
 pandora_console/include/styles/pandora.css    | 17 ++++--
 3 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 213a07bf2d..7707a2b944 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -165,7 +165,7 @@ if ($disk_conf_delete) {
     @unlink($filename['conf']);
 }
 
-echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">';
+echo '<form name="conf_agent" method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
 
 // Custom ID.
 $custom_id_div = '<div class="label_select">';
@@ -186,26 +186,12 @@ $custom_id_div .= html_print_input_text(
 if (!$new_agent && $alias != '') {
     $table_agent_name = '<div class="label_select"><p class="input_label">'.__('Agent name').': '.ui_print_help_tip(__("The agent's name must be the same as the one defined at the console"), true).'</p>';
     $table_agent_name .= '<div class="label_select_parent">';
-    $table_agent_name .= '<div class="label_select_child_left">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
-    $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name">';
-
-    // QR code div.
-    $table_qr_code = '<div class="agent_qr white_box">';
-    $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>';
-    $table_qr_code .= '<div id="qr_container_image"></div>';
-    if ($id_agente) {
-        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
-    }
-
-    // Add Custom id div.
-    $table_qr_code .= '<br />';
-    $table_qr_code .= $custom_id_div;
-    $table_qr_code .= '</div>';
-
+    $table_agent_name .= '<div class="label_select_child_left" style="width: 60%;">'.html_print_input_text('agente', $nombre_agente, '', 50, 100, true).'</div>';
+    $table_agent_name .= '<div class="label_select_child_right agent_options_agent_name" style="width: 40%;">';
 
     if ($id_agente) {
-        $table_agent_name .= '<span>'.__('ID').' '.$id_agente.'</span>';
-        $table_agent_name .= '<a href="index.php?sec=gagente&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'">';
+        $table_agent_name .= '<label>'.__('ID').'</label><input style="width: 50%;" type="text" disabled="true" value="'.$id_agente.'" />';
+        $table_agent_name .= '<a href="index.php?sec=gagente&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'">';
         $table_agent_name .= html_print_image(
             'images/zoom.png',
             true,
@@ -222,6 +208,14 @@ if (!$new_agent && $alias != '') {
     // Delete link from here.
     $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=$id_agente&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
 
+    // Help link.
+    $table_agent_name .= ui_print_help_icon(
+        $help_header,
+        true,
+        '',
+        'images/help_g.png'
+    );
+
     // Remote configuration available.
     if (isset($filename)) {
         if (file_exists($filename['md5'])) {
@@ -229,7 +223,7 @@ if (!$new_agent && $alias != '') {
             $agent_name = io_safe_output($agent_name);
             $agent_md5 = md5($agent_name, false);
 
-            $table_agent_name .= '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=remote_configuration&amp;'.'id_agente='.$id_agente.'&amp;'.'disk_conf='.$agent_md5.'">';
+            $table_agent_name .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=remote_configuration&id_agente='.$id_agente.'&disk_conf='.$agent_md5.'">';
             $table_agent_name .= html_print_image(
                 'images/application_edit.png',
                 true,
@@ -246,6 +240,19 @@ if (!$new_agent && $alias != '') {
     }
 
     $table_agent_name .= '</div></div></div>';
+
+    // QR code div.
+    $table_qr_code = '<div class="agent_qr white_box">';
+    $table_qr_code .= '<p class="input_label">'.__('QR Code Agent view').': </p>';
+    $table_qr_code .= '<div id="qr_container_image"></div>';
+    if ($id_agente) {
+        $table_qr_code .= "<a id='qr_code_agent_view' href='javascript: show_dialog_qrcode(null, \"".ui_get_full_url('mobile/index.php?page=agent&id='.$id_agente)."\" );'></a>";
+    }
+
+    // Add Custom id div.
+    $table_qr_code .= '<br />';
+    $table_qr_code .= $custom_id_div;
+    $table_qr_code .= '</div>';
 }
 
 if ($new_agent) {
@@ -365,13 +372,14 @@ $table_server .= html_print_select(
 
 // Description.
 $table_description = '<div class="label_select"><p class="input_label">'.__('Description').': </p>';
-$table_description .= html_print_input_text(
+$table_description .= html_print_textarea(
     'comentarios',
+    3,
+    10,
     $comentarios,
     '',
-    45,
-    200,
-    true
+    true,
+    'agent_description'
 ).'</div>';
 
 // QR code.
@@ -511,7 +519,7 @@ if (enterprise_installed()) {
     if (!$new_agent && isset($filename) && file_exists($filename['md5'])) {
         $table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5']));
         // Delete remote configuration
-        $table_adv_remote .= '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=main&amp;'.'disk_conf_delete=1&amp;'.'id_agente='.$id_agente.'">';
+        $table_adv_remote .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&disk_conf_delete=1&id_agente='.$id_agente.'">';
         $table_adv_remote .= html_print_image(
             'images/cross.png',
             true,
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 6a1d9404c5..1ad8a09108 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -674,12 +674,15 @@ if ($id_agente) {
         agents_get_alias($id_agente),
         'images/setup.png',
         false,
-        $help_header,
+        // Previous: $help_header.
+        '',
         true,
         $onheader,
         false,
         '',
-        $config['item_title_size_text']
+        $config['item_title_size_text'],
+        '',
+        ''
     );
 } else {
     // Create agent.
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 3a0f47c4be..2cf494c72a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1283,7 +1283,6 @@ div.title_line {
   align-items: flex-end;
   justify-content: space-between;
   border-bottom: 2px solid #82b92e;
-  max-height: 50px;
   min-height: 50px;
   width: 100%;
   padding-right: 0px;
@@ -1436,8 +1435,9 @@ div#agent_wizard_subtabs {
 #menu_tab_left li a,
 #menu_tab_left li span {
   color: #343434;
-  font-size: 16pt;
-  line-height: 16pt;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-size: 20pt;
+  line-height: 20pt;
 }
 
 /*
@@ -2422,6 +2422,8 @@ select {
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
+  font-family: "lato-bolder", "Open Sans", sans-serif;
+  font-size: 10pt;
 }
 
 /* plugins */
@@ -5622,6 +5624,7 @@ table.info_table.policy_sub_table {
 .agent_options_column_right {
   width: 50%;
   box-sizing: border-box;
+  min-width: 400px;
 }
 
 .agent_options_column_left {
@@ -5746,10 +5749,12 @@ a#qr_code_agent_view {
   margin-right: 5px;
 }
 
-#text-comentarios,
+.agent_description {
+  min-height: 4.8em !important;
+}
 .agent_custom_id {
-  padding-bottom: 2em;
-  background: #ececec !important;
+  padding-bottom: 0.7em;
+  padding-top: 0.5em;
   display: inline-block;
   border-radius: 5px !important;
   border: 1px solid #ccc;

From 91d388c8b3692fa4ff7ead15f23fcf3630731017 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Mon, 27 May 2019 17:47:45 +0200
Subject: [PATCH 14/61] Changed for create new user with advanced config
 enabled and forced automaticly disabled

---
 pandora_console/include/auth/mysql.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 1ab383b672..461f449184 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -1337,8 +1337,9 @@ function fill_permissions_ldap($sr)
                     'tags'         => implode(',', $ldap_adv_perm['tags']),
                     'no_hierarchy' => (bool) $ldap_adv_perm['no_hierarchy'] ? 1 : 0,
                 ];
-                return $permissions;
             }
+
+            return $permissions;
         }
 
         foreach ($result as $perms) {

From f0fb6d7fd989a0196fbfaa17431d770d5c48ab67 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 18:03:56 +0200
Subject: [PATCH 15/61] wip styles

---
 .../godmode/agentes/agent_manager.php         | 16 ++++++++-
 .../godmode/wizards/Wizard.main.php           | 12 ++++---
 pandora_console/include/functions_html.php    |  4 +--
 pandora_console/include/functions_ui.php      | 26 +++++++++++++-
 pandora_console/include/styles/pandora.css    | 35 +++++++++++++++++--
 5 files changed, 83 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 7707a2b944..e764a1280c 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -322,7 +322,21 @@ $table_primary_group .= '</span></div></div></div>';
 
 $table_interval = '<div class="label_select"><p class="input_label">'.__('Interval').': </p>';
 $table_interval .= '<div class="label_select_parent">';
-$table_interval .= html_print_extended_select_for_time('intervalo', $intervalo, '', '', '0', 10, true);
+$table_interval .= html_print_extended_select_for_time(
+    'intervalo',
+    $intervalo,
+    '',
+    '',
+    '0',
+    10,
+    true,
+    false,
+    true,
+    'w40p'
+);
+
+
+
 if ($intervalo < SECONDS_5MINUTES) {
     $table_interval .= clippy_context_help('interval_agent_min');
 }
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index f7f5e9a5c8..f76678ffb6 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -783,13 +783,17 @@ class Wizard
     /**
      * Print a form.
      *
-     * @param array   $data   Definition of target form to be printed.
-     * @param boolean $return Return as string or direct output.
+     * @param array   $data            Definition of target form to be printed.
+     * @param boolean $return          Return as string or direct output.
+     * @param boolean $print_white_box Print a white box.
      *
      * @return string HTML code.
      */
-    public function printForm(array $data, bool $return=false, bool $print_white_box=false)
-    {
+    public function printForm(
+        array $data,
+        bool $return=false,
+        bool $print_white_box=false
+    ) {
         $form = $data['form'];
         $inputs = $data['inputs'];
         $js = $data['js'];
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 6ce6a5d57c..53ab0bbb75 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -1079,7 +1079,7 @@ function html_print_extended_select_for_time(
                 'class' => $uniq_name.'_toggler '.$class,
                 'alt'   => __('Custom'),
                 'title' => __('Custom'),
-                'style' => 'width: 18px;'.$style_icon,
+                'style' => 'width: 18px; margin-bottom: -5px;'.$style_icon,
             ],
             false,
             false,
@@ -1114,7 +1114,7 @@ function html_print_extended_select_for_time(
                 'class' => $uniq_name.'_toggler',
                 'alt'   => __('List'),
                 'title' => __('List'),
-                'style' => 'width: 18px;'.$style_icon,
+                'style' => 'width: 18px;margin-bottom: -5px;'.$style_icon,
             ]
         ).'</a>';
     echo '</div>';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ce7d182e53..2f0eeeea09 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2795,7 +2795,31 @@ function ui_print_page_header(
     $buffer = '<div id="'.$type2.'" style="">';
 
     if (!empty($breadcrumbs)) {
-        $buffer .= '<div class="breadcrumbs_container">'.$breadcrumbs.'</div>';
+        if (is_array($breadcrumbs)) {
+            $bc = [];
+            $i = 0;
+            foreach ($breadcrumbs as $content) {
+                if ($content['selected'] == 1) {
+                        $class = 'selected';
+                } else {
+                    $class = '';
+                }
+
+                $bc[$i] = '';
+                $bc[$i] .= '<span><a class="breadcrumb_link '.$class.'" href="'.$content['link'].'">';
+                $bc[$i] .= $content['label'];
+                $bc[$i] .= '</a>';
+                $bc[$i] .= '</span>';
+                $i++;
+            }
+
+            $buffer .= implode(
+                '<span class="breadcrumb_link">&nbsp/&nbsp</span>',
+                $this->breadcrum
+            );
+        } else {
+            $buffer .= '<div class="breadcrumbs_container">'.$breadcrumbs.'</div>';
+        }
     }
 
     $buffer .= '<div id="menu_tab_left">';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2cf494c72a..6f0db7791f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -431,6 +431,30 @@ select:-internal-list-box {
  * - GLOBAL STYLES                           									-
  * ---------------------------------------------------------------------
  */
+.w10p {
+  max-width: 10%;
+}
+
+.w20p {
+  max-width: 20%;
+}
+
+.w30p {
+  max-width: 30%;
+}
+
+.w40p {
+  max-width: 40%;
+}
+
+.w50p {
+  max-width: 50%;
+}
+
+.w100p {
+  max-width: 100%;
+}
+
 div#page {
   background: #fbfbfb;
   background-image: none;
@@ -1436,8 +1460,8 @@ div#agent_wizard_subtabs {
 #menu_tab_left li span {
   color: #343434;
   font-family: "lato-bolder", "Open Sans", sans-serif !important;
-  font-size: 20pt;
-  line-height: 20pt;
+  font-size: 18pt;
+  line-height: 18pt;
 }
 
 /*
@@ -2862,6 +2886,7 @@ a.tip {
 a.tip > img {
   margin-left: 2px;
   margin-right: 2px;
+  margin-bottom: -0.3em;
 }
 
 .head_tip {
@@ -5544,6 +5569,10 @@ table.info_table.policy_sub_table {
   flex-wrap: wrap;
 }
 
+.label_simple_items a.tip > img {
+  margin-bottom: 0px;
+}
+
 .label_simple_items > * {
   margin-right: 5px;
 }
@@ -5553,6 +5582,8 @@ table.info_table.policy_sub_table {
   font-weight: bold;
   padding-right: 10px;
   margin: 0px 0px 5px 0px;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
 }
 
 .input_label_simple {

From 5be124f3156a209dee497224a6ff14747cf7ecb1 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 19:00:48 +0200
Subject: [PATCH 16/61] Styles review

---
 .../godmode/agentes/agent_manager.php         |  87 ++--
 .../godmode/agentes/configurar_agente.php     |  35 +-
 pandora_console/images/arrow_right_green.png  | Bin 0 -> 311 bytes
 .../default/module_alertsfired_rounded.png    | Bin 0 -> 251 bytes
 .../default/module_critical_rounded.png       | Bin 0 -> 250 bytes
 .../default/module_no_data_rounded.png        | Bin 0 -> 251 bytes
 .../status_sets/default/module_ok_rounded.png | Bin 0 -> 251 bytes
 .../default/module_unknown_rounded.png        | Bin 0 -> 246 bytes
 .../default/module_warning_rounded.png        | Bin 0 -> 249 bytes
 pandora_console/include/ajax/module.php       |   2 +-
 pandora_console/include/functions_graph.php   |  48 +-
 pandora_console/include/functions_modules.php |   2 +-
 .../include/functions_reporting.php           |  24 +-
 pandora_console/include/functions_ui.php      | 100 ++--
 .../include/graphs/functions_d3.php           |  32 ++
 .../include/graphs/functions_gd.php           |   6 +-
 pandora_console/include/graphs/pandora.d3.js  | 224 +++++++-
 pandora_console/include/styles/discovery.css  |   1 -
 pandora_console/include/styles/pandora.css    | 264 +++++++++-
 .../agentes/estado_generalagente.php          | 491 +++++++++---------
 .../operation/agentes/ver_agente.php          |  77 ++-
 .../operation/users/user_edit_header.php      |   9 +-
 22 files changed, 1028 insertions(+), 374 deletions(-)
 create mode 100644 pandora_console/images/arrow_right_green.png
 create mode 100644 pandora_console/images/status_sets/default/module_alertsfired_rounded.png
 create mode 100644 pandora_console/images/status_sets/default/module_critical_rounded.png
 create mode 100644 pandora_console/images/status_sets/default/module_no_data_rounded.png
 create mode 100644 pandora_console/images/status_sets/default/module_ok_rounded.png
 create mode 100644 pandora_console/images/status_sets/default/module_unknown_rounded.png
 create mode 100644 pandora_console/images/status_sets/default/module_warning_rounded.png

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index e764a1280c..8138e69a50 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Extension to schedule tasks on Pandora FMS Console
+ *
+ * @category   Agent editor/ builder.
+ * @package    Pandora FMS
+ * @subpackage Classic agent management view.
+ * @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) 2005-2010 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.
-// Load global vars
+// Begin.
 enterprise_include('godmode/agentes/agent_manager.php');
 
 require_once 'include/functions_clippy.php';
@@ -30,23 +45,19 @@ if (is_ajax()) {
 
         $id_agent = (int) get_parameter('id_agent');
         $string = (string) get_parameter('q');
-        // q is what autocomplete plugin gives
+        // Field q is what autocomplete plugin gives.
         $filter = [];
-
-        switch ($config['dbtype']) {
-            case 'mysql':
-            case 'postgresql':
-                $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%" OR alias LIKE "%'.$string.'%")';
-            break;
-
-            case 'oracle':
-                $filter[] = '(upper(nombre) LIKE upper(\'%'.$string.'%\') OR upper(direccion) LIKE upper(\'%'.$string.'%\') OR upper(comentarios) LIKE upper(\'%'.$string.'%\') OR upper(alias) LIKE upper(\'%'.$string.'%\'))';
-            break;
-        }
-
+        $filter[] = '(nombre COLLATE utf8_general_ci LIKE "%'.$string.'%" OR direccion LIKE "%'.$string.'%" OR comentarios LIKE "%'.$string.'%" OR alias LIKE "%'.$string.'%")';
         $filter[] = 'id_agente != '.$id_agent;
 
-        $agents = agents_get_agents($filter, ['id_agente', 'nombre', 'direccion']);
+        $agents = agents_get_agents(
+            $filter,
+            [
+                'id_agente',
+                'nombre',
+                'direccion',
+            ]
+        );
         if ($agents === false) {
             $agents = [];
         }
@@ -768,6 +779,7 @@ $table->head = [];
 $table->style = [];
 $table->style[0] = 'font-weight: bold;';
 $table->data = [];
+$table->rowstyle = [];
 
 $fields = db_get_all_fields_in_table('tagent_custom_fields');
 
@@ -775,6 +787,7 @@ if ($fields === false) {
     $fields = [];
 }
 
+$i = 0;
 foreach ($fields as $field) {
     $id_custom_field = $field['id_field'];
 
@@ -806,6 +819,10 @@ foreach ($fields as $field) {
         $custom_value = '';
     }
 
+    if (!empty($custom_value)) {
+        $table->rowstyle[($i + 1)] = 'display: table-row;';
+    }
+
     if ($field['is_password_type']) {
         $data_field[1] = html_print_input_text_extended(
             'customvalue_'.$field['id_field'],
@@ -853,16 +870,24 @@ foreach ($fields as $field) {
         );
     };
 
-    $table->rowid[] = 'name_field-'.$id_custom_field;
-    array_push($table->data, $data);
+    $table->rowid[] = 'name_field-'.$i;
+    $table->data[] = $data;
 
-    $table->rowid[] = 'field-'.$id_custom_field;
-    array_push($table->data, $data_field);
+    $table->rowid[] = 'field-'.($i + 1);
+    $table->data[] = $data_field;
+    $i += 2;
 }
 
 if (!empty($fields)) {
     echo '<div class="ui_toggle">';
-            ui_toggle(html_print_table($table, true), __('Custom fields'), '', true, false, 'white_box white_box_opened');
+            ui_toggle(
+                html_print_table($table, true),
+                __('Custom fields'),
+                '',
+                true,
+                false,
+                'white_box white_box_opened'
+            );
     echo '</div>';
 }
 
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 1ad8a09108..5d89bec92c 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -575,20 +575,24 @@ if ($id_agente) {
     }
 
     $help_header = '';
+    $tab_name = '';
     // This add information to the header.
     switch ($tab) {
         case 'main':
             $tab_description = '- '.__('Setup');
             $help_header = 'main_tab';
+            $tab_name = 'Setup';
         break;
 
         case 'collection':
             $tab_description = '- '.__('Collection');
+            $tab_name = 'Collection';
         break;
 
         case 'inventory':
             $tab_description = '- '.__('Inventory');
             $help_header = 'inventory_tab';
+            $tab_name = 'Inventory';
         break;
 
         case 'plugins':
@@ -599,6 +603,7 @@ if ($id_agente) {
         case 'module':
             $type_module_t = get_parameter('moduletype', '');
             $tab_description = '- '.__('Modules');
+            $tab_name = 'Modules';
             if ($type_module_t == 'webux') {
                 $help_header = 'wux_console';
             } else {
@@ -609,10 +614,12 @@ if ($id_agente) {
         case 'alert':
             $tab_description = '- '.__('Alert');
             $help_header = 'manage_alert_list';
+            $tab_name = 'Alerts';
         break;
 
         case 'template':
             $tab_description = '- '.__('Templates');
+            $tab_name = 'Module templates';
         break;
 
         case 'gis':
@@ -633,16 +640,19 @@ if ($id_agente) {
                 case 'snmp_explorer':
                     $tab_description = '- '.__('SNMP Wizard');
                     $help_header = 'agent_snmp_explorer_tab';
+                    $tab_name = 'SNMP Wizard';
                 break;
 
                 case 'snmp_interfaces_explorer':
                     $tab_description = '- '.__('SNMP Interfaces wizard');
                     $help_header = 'agent_snmp_interfaces_explorer_tab';
+                    $tab_name = 'SNMP Interfaces wizard';
                 break;
 
                 case 'wmi_explorer':
                     $tab_description = '- '.__('WMI Wizard');
                     $help_header = 'agent_snmp_wmi_explorer_tab';
+                    $tab_name = 'WMI Wizard';
                 break;
 
                 default:
@@ -682,7 +692,7 @@ if ($id_agente) {
         '',
         $config['item_title_size_text'],
         '',
-        ''
+        __('Resources').ui_print_breadcrums($tab_name)
     );
 } else {
     // Create agent.
@@ -691,7 +701,13 @@ if ($id_agente) {
         'images/bricks.png',
         false,
         'create_agent',
-        true
+        true,
+        '',
+        false,
+        '',
+        GENERIC_SIZE_TEXT,
+        '',
+        __('Resources').ui_print_breadcrums('Create agent')
     );
 }
 
@@ -1222,7 +1238,6 @@ 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);
@@ -1233,18 +1248,10 @@ if ($update_module || $create_module) {
                 $m_hide = $m['hide'];
             }
 
-            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'], '');
-                }
+            if ($m_hide == '1') {
+                $macros[$k]['value'] = io_input_password(get_parameter($m['macro'], ''));
             } else {
-                if ($m_hide == '1') {
-                    $macros[$k]['value'] = io_input_password($macros_names[$k]);
-                } else {
-                    $macros[$k]['value'] = $macros_names[$k];
-                }
+                $macros[$k]['value'] = get_parameter($m['macro'], '');
             }
         }
 
diff --git a/pandora_console/images/arrow_right_green.png b/pandora_console/images/arrow_right_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..a772cd6cf42bb95b5d45a7ad3c3da24994f1204c
GIT binary patch
literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?H!3HGDmOlFkq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c72Wi7aSW-rm6Wi6DZ%BL$-6608G<Ao=I|epZrri>-rrB$
zPHhGYKe9GNFn5SHSjcv0H?Vn6Na470P1d1?vBR>%v_mrX!GTHP<}%4g<DFtvn2)eI
zoZ%GN%`oM+(-g%g5=VMYcP;^v=hq*RI^v`8q|>mYbH)*to~^tNSxN%-4aa8L3sgVw
zQjcIX=yKe~?r@o(Bc?@-`HV>S@dmaPZ+R|Exx-K*Ti7O$%n;|?Val*vafw93Re>Ph
z10Avp7#GCMap+=fSu{g~xuBB$iB!O~{|-KlEKCfHYz*QNrKeffJzxfUlEKr}&t;uc
GLK6VyHE=ip

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_alertsfired_rounded.png b/pandora_console/images/status_sets/default/module_alertsfired_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a9b5ae0cdbf28de7a92696c9381bfddecbcc168
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vZ@aSW-r_2$M#-UbDM*2FCvj`6NpBYRLVrs0s_ofAhK
zOIWg{We?6erEHc_()d`t(o!!ZUN0cQr%Ah8+Wu;om-@;nmi#A!cD$`vz<S4HrfS&7
z3Du4LhE?Gf57&o23k+5*S~}b2XgiNd#)Sor&1}3<2*wNfFOwR+Pg!GFW$=CZj<gQ}
qJKmnTr(U-zdg%+(hQrT<5*U88OKrVgzcLu;PzFy|KbLh*2~7arx?)BE

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_critical_rounded.png b/pandora_console/images/status_sets/default/module_critical_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fceda18dad688b1eccc63bebbf6b27430565f5c
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vN<aSW-r_2z~lZ-aqA>q9xN1B^lw8dxMGCpIXXxv2zj
zmNEzxFt|r>F*0A@fAaL#OD|6^m3<Y{<o)Q`i(4_?i#2;K&3mV3-jmB<4UZD@&8s-E
z_t0^Py;5^NT-VyPLQ{C>rO;`QoY|yIGA=A|Y-Zy{Fuw5LQh#vQRMCz9-9M4-JaQ?s
o$}8u~#70ZIwsY6y`Z2OG#6OnWnk?Aa2XrTcr>mdKI;Vst0D06|UjP6A

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_no_data_rounded.png b/pandora_console/images/status_sets/default/module_no_data_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd5e433ece26563296312403d351e64ecc4b0471
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vZ@aSW-r_2$Mx-Ub7K)`y2!78v$i5Zqv4(kFO><0#iu
z119N!;PV_Z2Su2;WB#k@U-!N`-CH}$r%Ahe_PtgoFZGpEE%&C(y?x650@Jo2G0%k+
zCz=l|m)NU4=fica&ns36@4RH@|51^dSIQ*g!UD%;HU#4r`(CvNwkpv*a%cZ)u9LJm
rms^_he)7FmH_fWu2d+O8Nnj9&liDgYZ{-c3Lm50>{an^LB{Ts5@*7@o

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_ok_rounded.png b/pandora_console/images/status_sets/default/module_ok_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..d47f2ef4ff90a0c2d335c60e338b2f1158c22948
GIT binary patch
literal 251
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vZ@aSW-r_2xz(Z-ausu|ktZGleGJ0<{fIf;tbHJ$)A4
zIKU=#kVEb>>s&F5e>wO2r2Y5beZZJ36cc%eXS4Q_Ekdi$RC@fmvF13l?gOt=N}3}4
zJB5FUEG};q{uh-hXKFT4JNBujUCIK-W;R|alZ*>UjQ<O2neGK|I{M<?o%xSu9sGM^
pP5L)G$+U27*L+49v*`@X49A~IZEbz}K?dkh22WQ%mvv4FO#tsIUdaFe

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_unknown_rounded.png b/pandora_console/images/status_sets/default/module_unknown_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ec6d98f39a059562c5107196a774513ecd58dad
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vK;aSW-r_2z~nZ-W6(>%&H-f(8~9g~sUf9tQ-kuVUb|
zVBnnWAg<Tk(D*L?(<M{u+RSZ-oiqwUD;KZooqF+-W%0aezAoq3Zyne>_39-Hxlbt{
zRNdwI)c<U~WtF|lX<bSD^dA!%*?6T)GA=A|Y(_BtHs9m=;C6c6;^zhRUDa&om4sG*
l?_9;_cd?pj`B~Ki3==e^wjNCs-3N3dgQu&X%Q~loCIHe5UW@<$

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/module_warning_rounded.png b/pandora_console/images/status_sets/default/module_warning_rounded.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28924178df6993295d3ef46c601b8e89ed6863d
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Yy!3HERP1;@sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vc^aSW-r_2z~lZ-aqA>%-=mj4~TaU73V7G_+V9;`B&J
zW#Z)Fc)-QX%gB6v|H;!|FTFgyR90)!gHw;5MJ%~;DKjhioUgIyyH)&A2YaUl2205m
zt^c6tww_J>&(>8oS+88yl}uj#V?rYvuarr~g$0hy2*%&$c|srF&9Zc>-f4eSx4HIV
o%K3Zh$CcIwevvtlSj=U>py(^MH8r_+1JIcap00i_>zopr0Q5dzRR910

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 7b11249f18..0b208e079b 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -964,7 +964,7 @@ if (check_login()) {
                 $title
             );
 
-            $data[5] = ui_print_status_image($status, $title, true);
+            $data[5] = ui_print_status_image($status, $title, true, false, false, true);
             if (!$show_context_help_first_time) {
                 $show_context_help_first_time = true;
 
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 81a3365fc5..86de873965 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -2479,7 +2479,7 @@ function truncate_negatives(&$element)
  * @param bool return or echo flag
  * @param bool show_not_init flag
  */
-function graph_agent_status($id_agent=false, $width=300, $height=200, $return=false, $show_not_init=false, $data_agents=false)
+function graph_agent_status($id_agent=false, $width=300, $height=200, $return=false, $show_not_init=false, $data_agents=false, $donut_narrow_graph=false)
 {
     global $config;
 
@@ -2545,25 +2545,37 @@ function graph_agent_status($id_agent=false, $width=300, $height=200, $return=fa
         $data = [];
     }
 
-    $out = pie_graph(
-        $data,
-        $width,
-        $height,
-        __('other'),
-        ui_get_full_url(false, false, false, false),
-        '',
-        $config['fontpath'],
-        $config['font_size'],
-        1,
-        'hidden',
-        $colors,
-        0
-    );
-
-    if ($return) {
+    if ($donut_narrow_graph == true) {
+        $data_total = array_sum($data);
+        $out = print_donut_narrow_graph(
+            $colors,
+            $width,
+            $height,
+            $data,
+            $data_total
+        );
         return $out;
     } else {
-        echo $out;
+        $out = pie_graph(
+            $data,
+            $width,
+            $height,
+            __('other'),
+            ui_get_full_url(false, false, false, false),
+            '',
+            $config['fontpath'],
+            $config['font_size'],
+            1,
+            'hidden',
+            $colors,
+            0
+        );
+
+        if ($return) {
+            return $out;
+        } else {
+            echo $out;
+        }
     }
 }
 
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 18c89e11c5..9204253220 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2322,7 +2322,7 @@ function modules_get_status($id_agent_module, $db_status, $data, &$status, &$tit
         $status = STATUS_MODULE_OK;
         $title = __('NORMAL');
     } else if ($db_status == AGENT_MODULE_STATUS_UNKNOWN) {
-        $status = STATUS_AGENT_DOWN;
+        $status = STATUS_MODULE_UNKNOWN;
         $last_status = modules_get_agentmodule_last_status($id_agent_module);
         switch ($last_status) {
             case AGENT_STATUS_NORMAL:
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 46c920c4bb..3c2fb05baf 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -2844,6 +2844,7 @@ function reporting_event_report_agent(
     if ($label != '') {
         $label = reporting_label_macro($content, $label);
     }
+
     $return['label'] = $label;
 
     if ($event_graph_by_user_validator) {
@@ -9627,32 +9628,39 @@ function reporting_tiny_stats($counts_info, $return=false, $type='agent', $separ
         $total_count = 0;
     }
 
-    $out .= '<b>'.'<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 7pt">'.$total_count.'</span>';
+    $out .= '<div id="bullets_modules">';
+    // $out .='<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 13pt">'.$total_count.$separator.'</span>';
     if (isset($fired_count) && $fired_count > 0) {
-        $out .= ' '.$separator.' <span class="orange forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 7pt">'.$fired_count.'</span>';
+        $out .= '<div><div class="bullet_modules orange_background"></div>';
+        $out .= '<span class="forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 12pt">'.$fired_count.'</span></div>';
     }
 
     if (isset($critical_count) && $critical_count > 0) {
-        $out .= ' '.$separator.' <span class="red forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 7pt">'.$critical_count.'</span>';
+        $out .= '<div><div class="bullet_modules red_background"></div>';
+        $out .= '<span class="forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 12pt">'.$critical_count.'</span></div>';
     }
 
     if (isset($warning_count) && $warning_count > 0) {
-        $out .= ' '.$separator.' <span class="yellow forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 7pt">'.$warning_count.'</span>';
+        $out .= '<div><div class="bullet_modules yellow_background"></div>';
+        $out .= '<span class="forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 12pt">'.$warning_count.'</span></div>';
     }
 
     if (isset($unknown_count) && $unknown_count > 0) {
-        $out .= ' '.$separator.' <span class="grey forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 7pt">'.$unknown_count.'</span>';
+        $out .= '<div><div class="bullet_modules grey_background"></div>';
+        $out .= '<span class="forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 12pt">'.$unknown_count.'</span></div>';
     }
 
     if (isset($not_init_count) && $not_init_count > 0) {
-        $out .= ' '.$separator.' <span class="blue forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 7pt">'.$not_init_count.'</span>';
+        $out .= '<div><div class="bullet_modules blue_background"></div>';
+        $out .= '<span class="forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 12pt">'.$not_init_count.'</span></div>';
     }
 
     if (isset($normal_count) && $normal_count > 0) {
-        $out .= ' '.$separator.' <span class="green forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 7pt">'.$normal_count.'</span>';
+        $out .= '<div><div class="bullet_modules green_background"></div>';
+        $out .= '<span class="forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 12pt">'.$normal_count.'</span></div>';
     }
 
-    $out .= '</b>';
+    $out .= '</div>';
 
     if ($return) {
         return $out;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2f0eeeea09..23bdb79d82 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2408,8 +2408,37 @@ function ui_get_status_images_path()
  *
  * @return string HTML code if return parameter is true.
  */
-function ui_print_status_image($type, $title='', $return=false, $options=false, $path=false)
+function ui_print_status_image($type, $title='', $return=false, $options=false, $path=false, $rounded_image=false)
 {
+    // This is for the List of Modules in Agent View
+    if ($rounded_image === true) {
+        switch ($type) {
+            case 'module_ok.png':
+                $type = 'module_ok_rounded.png';
+            break;
+
+            case 'module_critical.png':
+                $type = 'module_critical_rounded.png';
+            break;
+
+            case 'module_warning.png':
+                $type = 'module_warning_rounded.png';
+            break;
+
+            case 'module_no_data.png':
+                $type = 'module_no_data_rounded.png';
+            break;
+
+            case 'module_unknown.png':
+                $type = 'module_unknown_rounded.png';
+            break;
+
+            default:
+                $type = $type;
+            break;
+        }
+    }
+
     if ($path === false) {
         $imagepath_array = ui_get_status_images_path();
         $imagepath = $imagepath_array[0];
@@ -2750,16 +2779,21 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
 /**
  * Return a standard page header (Pandora FMS 3.1 version)
  *
- * @param  string Title
- * @param  string Icon path
- * @param  boolean Return (false will print using a echo)
- * @param  boolean help (Help ID to print the Help link)
- * @param  boolean Godmode (false = operation mode).
- * @param  string Options (HTML code for make tabs or just a brief info string
+ * @param string  $title       Title.
+ * @param string  $icon        Icon path.
+ * @param boolean $return      Return (false will print using a echo).
+ * @param boolean $help        Help (Help ID to print the Help link).
+ * @param boolean $godmode     Godmode (false = operation mode).
+ * @param string  $options     Options (HTML code for make tabs or just a brief
+ * info string.
+ * @param mixed   $modal       Modal.
+ * @param mixed   $message     Message.
+ * @param mixed   $numChars    NumChars.
+ * @param mixed   $alias       Alias.
+ * @param mixed   $breadcrumbs Breadcrumbs.
+ *
  * @return string Header HTML
  */
-
-
 function ui_print_page_header(
     $title,
     $icon='',
@@ -2795,31 +2829,8 @@ function ui_print_page_header(
     $buffer = '<div id="'.$type2.'" style="">';
 
     if (!empty($breadcrumbs)) {
-        if (is_array($breadcrumbs)) {
-            $bc = [];
-            $i = 0;
-            foreach ($breadcrumbs as $content) {
-                if ($content['selected'] == 1) {
-                        $class = 'selected';
-                } else {
-                    $class = '';
-                }
-
-                $bc[$i] = '';
-                $bc[$i] .= '<span><a class="breadcrumb_link '.$class.'" href="'.$content['link'].'">';
-                $bc[$i] .= $content['label'];
-                $bc[$i] .= '</a>';
-                $bc[$i] .= '</span>';
-                $i++;
-            }
-
-            $buffer .= implode(
-                '<span class="breadcrumb_link">&nbsp/&nbsp</span>',
-                $this->breadcrum
-            );
-        } else {
-            $buffer .= '<div class="breadcrumbs_container">'.$breadcrumbs.'</div>';
-        }
+        $buffer .= '<div class="menu_tab_left_bc">';
+        $buffer .= '<div class="breadcrumbs_container">'.$breadcrumbs.'</div>';
     }
 
     $buffer .= '<div id="menu_tab_left">';
@@ -2859,6 +2870,10 @@ function ui_print_page_header(
 
     $buffer .= '</li></ul></div>';
 
+    if (!empty($breadcrumbs)) {
+        $buffer .= '</div>';
+    }
+
     if (is_array($options)) {
         $buffer .= '<div id="menu_tab"><ul class="mn">';
         foreach ($options as $key => $option) {
@@ -4482,3 +4497,20 @@ function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
                 <a href="'.$url_down.'">'.html_print_image($arrow_down, true, ['alt' => 'down']).'</a>
             </span>';
 }
+
+
+/**
+ * Show breadcrums in the page titles
+ *
+ * @return string  HTML anchor with the name of the section.
+ */
+function ui_print_breadcrums($tab_name)
+{
+    if ($tab_name != '') {
+        $section = str_replace('_', ' ', $tab_name);
+        $section = ucwords($section);
+        $section = ' / <span class="breadcrumb_active">'.___($section).'</span>';
+    }
+
+    return $section;
+}
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 2ad669308f..a3d0d9fc59 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -720,3 +720,35 @@ function print_clock_digital_1($time_format, $timezone, $clock_animation, $width
                 return $output;
 
 }
+
+
+function print_donut_narrow_graph($colors, $width, $height, $data, $data_total)
+{
+    if (empty($data)) {
+        return graph_nodata_image($width, $height, 'pie');
+    }
+
+    $data = json_encode($data);
+    $data = json_decode(json_encode($data));
+
+    $colors = json_encode($colors);
+    $colors = json_decode(json_encode($colors));
+
+    $series = count($data);
+    if (($series != count($colors)) || ($series == 0)) {
+        return;
+    }
+
+    $graph_id = uniqid('graph_');
+
+    $out = "<div id='$graph_id'></div>";
+    $out .= include_javascript_d3(true);
+    $out .= "<script type='text/javascript'>
+						donutNarrowGraph($colors, $width, $height, $data_total)
+						.donutbody(d3.select($graph_id))
+						.data($data)
+						.render();	
+			</script>";
+
+    return $out;
+}
diff --git a/pandora_console/include/graphs/functions_gd.php b/pandora_console/include/graphs/functions_gd.php
index 262ed22bb3..10f566185d 100755
--- a/pandora_console/include/graphs/functions_gd.php
+++ b/pandora_console/include/graphs/functions_gd.php
@@ -344,9 +344,9 @@ function drawRating($rating, $width, $height, $font, $out_of_lim_str, $mode, $fo
     $image = imagecreate($width, $height);
 
     // colors
-    $back = imagecolorallocate($image, 255, 255, 255);
+    $back = imagecolorallocate($image, 241, 241, 241);
 
-    $bordercolor = imagecolorallocate($image, 174, 174, 174);
+    $bordercolor = imagecolorallocate($image, 241, 241, 241);
     $text = imagecolorallocate($image, 74, 74, 74);
     $red = imagecolorallocate($image, 255, 60, 75);
     $green = imagecolorallocate($image, 50, 205, 50);
@@ -483,7 +483,7 @@ function gd_progress_bar($width, $height, $progress, $title, $font, $out_of_lim_
         break;
 
         case 1:
-            drawRating($progress, $width, $height, $font, $out_of_lim_str, $mode, 6, $value_text, $color);
+            drawRating($progress, $width, $height, $font, $out_of_lim_str, $mode, 9, $value_text, $color);
 
         break;
 
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 6bc3d72d66..427de827e3 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -2113,8 +2113,7 @@ function print_circular_progress_bar(
 
   var progress = startPercent;
 
-  if (transition == 0)
-    updateProgress(endPercent);
+  if (transition == 0) updateProgress(endPercent);
   else {
     (function loops() {
       updateProgress(progress);
@@ -2762,3 +2761,224 @@ function valueToBytes(value) {
   // This will actually do the rounding and the decimals.
   return value.toFixed(2) + shorts[pos] + "B";
 }
+
+function donutNarrowGraph(colores, width, height, total) {
+  // Default settings
+  var donutbody = d3.select("body");
+  var data = {};
+  // var showTitle = true;
+
+  if (width == "") {
+    width = 180;
+  }
+
+  if (height == "") {
+    height = 180;
+  }
+
+  var radius = Math.min(width, height) / 2;
+
+  var currentVal;
+  //var color = d3.scale.category20();
+
+  var colores_index = [];
+  var colores_value = [];
+
+  $.each(colores, function(index, value) {
+    colores_index.push(index);
+    colores_value.push(value);
+  });
+
+  var color = d3.scale
+    .ordinal()
+    .domain(colores_index)
+    .range(colores_value);
+
+  var pie = d3.layout
+    .pie()
+    .sort(null)
+    .value(function(d) {
+      return d.value;
+    });
+
+  var svg, g, arc;
+
+  var object = {};
+
+  // Method for render/refresh graph
+  object.render = function() {
+    if (!svg) {
+      // Show normal status by default. This variable must be initialized here, before clearing data.
+      var normal_status = data.Normal;
+
+      // Don't draw 0 or invalid values. console.log(data);
+      var data_map = $.map(data, function(value, index) {
+        if (value == 0 || isNaN(value)) {
+          return index;
+        }
+      });
+
+      $.each(data_map, function(i, val) {
+        delete data[val];
+      });
+      //New data: console.log(data);
+
+      arc = d3.svg
+        .arc()
+        .outerRadius(radius)
+        .innerRadius(radius - radius / 2.5);
+
+      svg = donutbody
+        .append("svg")
+        .attr("width", width)
+        .attr("height", height)
+        .append("g")
+        .attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
+
+      g = svg
+        .selectAll(".arc")
+        .data(pie(d3.entries(data)))
+        .enter()
+        .append("g")
+        .attr("class", "arc");
+
+      g.append("path")
+        // Attach current value to g so that we can use it for animation
+        .each(function(d) {
+          this._current = d;
+        })
+        .attr("d", arc)
+        .attr("stroke", "white")
+        .style("stroke-width", 2)
+        .style("fill", function(d) {
+          return color(d.data.key);
+        });
+      // This is to show labels on the graph
+      /* g.append("text")
+        .attr("transform", function(d) {
+          return "translate(" + arc.centroid(d) + ")";
+        })
+        .attr("dy", ".35em")
+        .style("text-anchor", "middle");
+      g.select("text").text(function(d) {
+        return d.data.key;
+      });*/
+
+      // Show normal status by default.
+      var percentage_normal;
+      svg
+        .append("text")
+        .datum(data)
+        .attr("x", 0)
+        .attr("y", 0 + radius / 10)
+        .attr("class", "text-tooltip")
+        .style("text-anchor", "middle")
+        .attr("font-weight", "bold")
+        .style("font-family", "Arial, Verdana")
+        //.attr("fill", "#82b92e")
+        .style("font-size", function(d) {
+          if (normal_status) {
+            percentage_normal = (normal_status * 100) / total;
+            if (Number.isInteger(percentage_normal)) {
+              percentage_normal = percentage_normal.toFixed(0);
+              return radius / 3 + "px";
+            } else {
+              percentage_normal = percentage_normal.toFixed(1);
+              return radius / 3.5 + "px";
+            }
+          }
+        })
+        .text(function(d) {
+          if (normal_status) {
+            return percentage_normal + "%";
+          } else {
+            return "0%";
+          }
+        });
+
+      g.on("mouseover", function(obj) {
+        //console.log(obj);
+        var percentage;
+        svg
+          .select("text.text-tooltip")
+          // This is to paint the text of the corresponding color.
+          /* .attr("fill", function(d) {
+            return color(obj.data.key);
+          })*/
+          .style("font-size", function(d) {
+            percentage = (d[obj.data.key] * 100) / total;
+            if (Number.isInteger(percentage)) {
+              percentage = percentage.toFixed(0);
+              return radius / 3 + "px";
+            } else {
+              percentage = percentage.toFixed(1);
+              return radius / 3.5 + "px";
+            }
+          })
+          .text(percentage + "%");
+      });
+
+      g.on("mouseout", function(obj) {
+        svg.select("text.text-tooltip").text(function(d) {
+          if (normal_status) {
+            return percentage_normal + "%";
+          } else {
+            return "0%";
+          }
+        });
+        // .attr("fill", "#82b92e");
+      });
+    } else {
+      g.data(pie(d3.entries(data)))
+        .exit()
+        .remove();
+
+      g.select("path")
+        .transition()
+        .duration(200)
+        .attrTween("d", function(a) {
+          var i = d3.interpolate(this._current, a);
+          this._current = i(0);
+          return function(t) {
+            return arc(i(t));
+          };
+        });
+
+      g.select("text").attr("transform", function(d) {
+        return "translate(" + arc.centroid(d) + ")";
+      });
+
+      svg.select("text.text-tooltip").datum(data);
+    }
+    return object;
+  };
+
+  // Getter and setter methods
+  object.data = function(value) {
+    if (!arguments.length) return data;
+    data = value;
+    return object;
+  };
+
+  object.donutbody = function(value) {
+    if (!arguments.length) return donutbody;
+    donutbody = value;
+    return object;
+  };
+
+  object.width = function(value) {
+    if (!arguments.length) return width;
+    width = value;
+    radius = Math.min(width, height) / 2;
+    return object;
+  };
+
+  object.height = function(value) {
+    if (!arguments.length) return height;
+    height = value;
+    radius = Math.min(width, height) / 2;
+    return object;
+  };
+
+  return object;
+}
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index fe8431a24a..0209a43a8e 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -125,7 +125,6 @@ div.arrow_box:before {
   border-top-right-radius: 7px;
   border-top-left-radius: 7px;
   box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1);
-  flex-direction: column;
 }
 
 #menu_tab_frame_view_bc .breadcrumbs_container {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6f0db7791f..4a771b3017 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1302,7 +1302,8 @@ div.title_line {
  * ---------------------------------------------------------------------
  */
 #menu_tab_frame,
-#menu_tab_frame_view {
+#menu_tab_frame_view,
+#menu_tab_frame_view_bc {
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
@@ -1320,8 +1321,43 @@ div.title_line {
   box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.1);
 }
 
+/* Breadcrum */
+#menu_tab_frame_view_bc {
+  min-height: 55px;
+  align-items: unset;
+}
+
+#menu_tab_frame_view_bc .breadcrumbs_container {
+  align-self: flex-start;
+}
+
+.menu_tab_left_bc {
+  flex-direction: column;
+  display: flex;
+  justify-content: space-between;
+  margin-right: 20px;
+  overflow: hidden;
+}
+
+.breadcrumbs_container {
+  padding-left: 10px;
+  padding-top: 4px;
+  text-indent: 0.25em;
+  color: #848484;
+  font-size: 10pt !important;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
+
+.breadcrumb_active {
+  color: #82b92e;
+  font-size: 10pt !important;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
+/* End - Breadcrum */
+
 #menu_tab {
   margin-right: 10px;
+  min-width: 510px;
 }
 
 #menu_tab .mn,
@@ -1446,9 +1482,9 @@ div#agent_wizard_subtabs {
 
 #menu_tab_left li.view {
   margin-left: 0px !important;
-  overflow-y: hidden;
   padding-left: 10px;
   padding-bottom: 4px;
+  white-space: nowrap;
 }
 
 #menu_tab_left li.view img.bottom {
@@ -3320,13 +3356,18 @@ div.div_groups_status {
 #menu_tab li.nomn_high {
   padding-right: 8px;
   padding-left: 8px;
-  padding-top: 6px;
   font-weight: bold;
   text-decoration: none;
   font-size: 14px;
   margin-top: 0;
   min-width: 30px;
-  height: 40px;
+  min-height: 50px;
+  max-height: 53px;
+}
+
+#menu_tab_frame_view_bc #menu_tab li.nomn,
+#menu_tab_frame_view_bc #menu_tab li.nomn_high {
+  min-height: 53px;
 }
 
 #menu_tab li:hover {
@@ -3342,7 +3383,7 @@ div.div_groups_status {
 
 #menu_tab li.nomn img,
 #menu_tab li img {
-  margin-top: 3px;
+  margin-top: 10px;
   margin-left: 3px;
 }
 
@@ -3698,7 +3739,7 @@ ul.events_tabs:after {
 
 ul.events_tabs > li {
   margin: 0 !important;
-  width: 20%;
+  width: 100%;
   text-align: center;
   float: none !important;
   outline-width: 0;
@@ -3707,7 +3748,7 @@ ul.events_tabs > li {
 ul.events_tabs > li.ui-state-default {
   background: #fff !important;
   border: none !important;
-  border-bottom: 2px solid black !important;
+  border-bottom: 2px solid #cacaca !important;
 }
 
 ul.events_tabs > li a {
@@ -4877,7 +4918,7 @@ input:checked + .p-slider:before {
 /* New white rounded boxes */
 .white_box {
   background-color: #fff;
-  border: 1px solid #f3f3f3;
+  border: 1px solid #e1e1e1;
   border-radius: 5px;
   padding: 20px 50px;
 }
@@ -5569,10 +5610,6 @@ table.info_table.policy_sub_table {
   flex-wrap: wrap;
 }
 
-.label_simple_items a.tip > img {
-  margin-bottom: 0px;
-}
-
 .label_simple_items > * {
   margin-right: 5px;
 }
@@ -5582,8 +5619,6 @@ table.info_table.policy_sub_table {
   font-weight: bold;
   padding-right: 10px;
   margin: 0px 0px 5px 0px;
-  padding-top: 0.5em;
-  padding-bottom: 0.5em;
 }
 
 .input_label_simple {
@@ -5655,7 +5690,6 @@ table.info_table.policy_sub_table {
 .agent_options_column_right {
   width: 50%;
   box-sizing: border-box;
-  min-width: 400px;
 }
 
 .agent_options_column_left {
@@ -5802,7 +5836,7 @@ a#qr_code_agent_view {
 
 .ui_toggle > a:first-child {
   background-color: #fff;
-  border: 1px solid #f3f3f3;
+  border: 1px solid #e1e1e1;
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
   margin-bottom: -1px;
@@ -5904,3 +5938,201 @@ a#qr_code_agent_view {
   padding: 15px;
   border-top: none;
 }
+
+/*
+ * ---------------------------------------------------------------------
+ * - AGENT VIEW
+ * ---------------------------------------------------------------------
+ */
+
+/* First row in agent view */
+#agent_details_first_row {
+  display: flex;
+  margin-bottom: 20px;
+  width: 100%;
+}
+
+.agent_details_col {
+  display: table-cell;
+  background-color: #fff;
+  border: 1px solid #e2e2e2;
+  border-radius: 5px;
+}
+
+.agent_details_col_left {
+  width: 38%;
+}
+
+.agent_details_col_right {
+  width: 62%;
+  margin-left: 20px;
+}
+
+.buttons_agent_view {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.buttons_agent_view a img {
+  border: 1px solid #dcdcdc;
+  border-radius: 4px;
+  padding: 1px;
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
+  max-width: 21px;
+  margin-left: 5px;
+}
+
+/* Agent details in agent view */
+.agent_details_header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-bottom: 1px solid #e2e2e2;
+  padding: 6px 20px;
+}
+
+.agent_details_content {
+  display: flex;
+  align-items: center;
+  padding: 20px;
+}
+
+.agent_details_agent_name {
+  display: flex;
+  align-items: center;
+}
+
+.agent_details_graph {
+  width: 205px;
+  text-align: center;
+}
+
+.agent_details_info {
+  display: flex;
+  justify-content: space-around;
+}
+
+.agent_details_info p {
+  display: flex;
+  align-items: center;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.agent_details_info img {
+  padding-right: 5px;
+}
+
+.agent_details_bullets #bullets_modules {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
+
+.agent_details_bullets #bullets_modules > div {
+  display: flex;
+  align-items: center;
+  padding-bottom: 20px;
+}
+
+.agent_details_bullets #bullets_modules > div:last-child {
+  padding-bottom: 0px;
+}
+
+#agent_contact_main tr td img {
+  max-width: 100%;
+}
+
+/* White tables to show graphs */
+.white_table_graph {
+  margin-bottom: 20px;
+  display: grid;
+  grid-template-rows: max-content;
+}
+
+.white_table_graph_header {
+  padding: 10px 20px;
+  background-color: #fff;
+  color: #000;
+  border: 1px solid #e2e2e2;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  font-weight: bold;
+}
+
+.white_table_graph_header img,
+.white_table_graph_header span {
+  vertical-align: middle;
+}
+
+.white_table_graph_header span {
+  padding-left: 10px;
+}
+
+.white_table_graph_content {
+  border: 1px solid #e2e2e2;
+  border-top: none;
+  background-color: #fff;
+  padding: 20px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  display: flex;
+  align-items: center;
+}
+
+/* White tables */
+.white_table,
+.white_table tr:first-child > th {
+  background-color: #fff;
+  color: #000;
+}
+
+.white_table {
+  border: 1px solid #e2e2e2;
+  border-radius: 4px;
+  margin-bottom: 20px;
+}
+
+.white_table thead tr:first-child > th {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+.white_table tbody tr:first-child > td {
+  border-top: 1px solid #e2e2e2;
+}
+
+.white_table tbody tr:first-child td {
+  padding-top: 25px;
+}
+
+.white_table tbody tr:last-child td {
+  padding-bottom: 25px;
+}
+
+.white_table tr td:first-child,
+.white_table tr th:first-child {
+  padding-left: 50px;
+}
+
+.white_table tr td:last-child,
+.white_table tr th:last-child {
+  padding-right: 50px;
+}
+
+.white_table th,
+.white_table td {
+  padding: 10px 20px;
+}
+
+.white_table_droppable > thead > tr > th > img {
+  vertical-align: middle;
+}
+
+.white_table_droppable tr th:first-child {
+  padding-left: 20px;
+}
+
+.white_table_no_border {
+  border: none !important;
+}
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 30705e7267..d51057833f 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -60,18 +60,6 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') && ! check_
 }
 
 // START: TABLE AGENT BUILD
-$table_agent = new stdClass();
-$table_agent->id = 'agent_details_main';
-$table_agent->width = '95%';
-$table_agent->cellspacing = 0;
-$table_agent->cellpadding = 0;
-$table_agent->class = 'databox filters';
-$table_agent->style[0] = 'width: 16px; text-align:center; padding: 0px;';
-$table_agent->style[5] = 'width: 16px; text-align:center; padding: 0px;';
-$table_agent->styleTable = 'padding:0px;';
-$table_agent->data = [];
-$data = [];
-
 $agent_name = ui_print_agent_name($agent['id_agente'], true, 500, 'font-size: medium;font-weight:bold', true);
 $in_planned_downtime = db_get_sql(
     'SELECT executed FROM tplanned_downtime 
@@ -103,19 +91,13 @@ if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
     $agent_name .= '&nbsp;'.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png').'</em>';
 }
 
+$table_agent_header = '<div class="agent_details_agent_name">';
 if (!$config['show_group_name']) {
-    $data[0] = ui_print_group_icon($agent['id_grupo'], true);
-} else {
-    $data[0] = '';
+    $table_agent_header .= ui_print_group_icon($agent['id_grupo'], true, 'groups_small', 'padding-right: 6px;');
 }
 
-$table_agent->cellstyle[count($table_agent->data)][0] = 'width: 16px; text-align:center; padding: 0px;';
-
-$data[2] = $agent_name;
-$table_agent->colspan[count($table_agent->data)][2] = 3;
-
-$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 100px; word-break: break-all;';
-
+$table_agent_header .= $agent_name;
+$table_agent_header .= '</div>';
 
 $status_img = agents_detail_view_status_img(
     $agent['critical_count'],
@@ -124,39 +106,19 @@ $status_img = agents_detail_view_status_img(
     $agent['total_count'],
     $agent['notinit_count']
 );
-$data[2] .= '&nbsp;&nbsp;'.$status_img;
 
-$table_agent->data[] = $data;
-$table_agent->rowclass[] = '';
+$table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
 
-
-$data = [];
-
-// $data[0] = reporting_tiny_stats ($agent, true, 'agent', '<div style="height: 5px;"></div>');
-// $table_agent->rowspan[count($table_agent->data)][0] = 6;
 // Fixed width non interactive charts
-$status_chart_width = 150;
-$graph_width = 150;
+$status_chart_width = 180;
+$graph_width = 180;
 
-$data[0] = '<div style="margin: 0 auto 6px auto; width: 150px;">';
-$data[0] .= '<div id="status_pie" style="margin: auto; width: '.$status_chart_width.'px;">';
-$data[0] .= graph_agent_status($id_agente, $graph_width, 120, true);
-$data[0] .= '</div>';
-$data[0] .= '<br>'.reporting_tiny_stats($agent, true);
-$data[0] .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not  shown in real time.'), true);
-$data[0] .= '</div>';
-$table_agent->rowspan[count($table_agent->data)][0] = 6;
-$table_agent->colspan[count($table_agent->data)][0] = 2;
-$table_agent->cellstyle[count($table_agent->data)][0] = 'width: 150px; text-align:center; padding: 0px; vertical-align: top;';
+$table_agent_graph = '<div id="status_pie" style="width: '.$status_chart_width.'px;">';
+$table_agent_graph .= graph_agent_status($id_agente, $graph_width, $graph_width, true, false, false, true);
+$table_agent_graph .= '</div>';
 
-
-$data[2] = ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['title' => __('OS').': '.get_os_name($agent['id_os'])]);
-$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align: right; padding: 0px;';
-$data[3] = empty($agent['os_version']) ? get_os_name((int) $agent['id_os']) : $agent['os_version'];
-$table_agent->colspan[count($table_agent->data)][3] = 2;
-
-$table_agent->data[] = $data;
-$table_agent->rowclass[] = '';
+$table_agent_os = '<p>'.ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['title' => __('OS').': '.get_os_name($agent['id_os'])]);
+$table_agent_os .= empty($agent['os_version']) ? get_os_name((int) $agent['id_os']) : $agent['os_version'].'</p>';
 
 $addresses = agents_get_addresses($id_agente);
 $address = agents_get_address($id_agente);
@@ -168,42 +130,34 @@ foreach ($addresses as $k => $add) {
 }
 
 if (!empty($address)) {
-    $data = [];
-    $data[2] = html_print_image('images/world.png', true, ['title' => __('IP address')]);
-    $table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align: right; padding: 0px;';
-    $data[3] = '<span style="vertical-align:top; display: inline-block;">';
-    $data[3] .= empty($address) ? '<em>'.__('N/A').'</em>' : $address;
-    $data[3] .= '</span>';
-    $table_agent->colspan[count($table_agent->data)][3] = 2;
-    $table_agent->data[] = $data;
-    $table_agent->rowclass[] = '';
+    $table_agent_ip = '<p>'.html_print_image('images/world.png', true, ['title' => __('IP address')]);
+    $table_agent_ip .= '<span style="vertical-align:top; display: inline-block;">';
+    $table_agent_ip .= empty($address) ? '<em>'.__('N/A').'</em>' : $address;
+    $table_agent_ip .= '</span></p>';
 }
 
-$data = [];
-$data[2] = html_print_image('images/version.png', true, ['title' => __('Agent Version')]);
-$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align: right; padding: 0px;';
-$data[3] = '<span style="vertical-align:top; display: inline-block;">';
-$data[3] .= empty($agent['agent_version']) ? '<i>'.__('N/A').'</i>' : $agent['agent_version'];
-$data[3] .= '</span>';
-$table_agent->colspan[count($table_agent->data)][3] = 2;
-$table_agent->data[] = $data;
-$table_agent->rowclass[] = '';
+$table_agent_version = '<p>'.html_print_image('images/version.png', true, ['title' => __('Agent Version')]);
+$table_agent_version .= '<span style="vertical-align:top; display: inline-block;">';
+$table_agent_version .= empty($agent['agent_version']) ? '<i>'.__('N/A').'</i>' : $agent['agent_version'];
+$table_agent_version .= '</span></p>';
 
-$data = [];
-$data[2] = html_print_image(
+$table_agent_description = '<p>'.html_print_image(
     'images/default_list.png',
     true,
     ['title' => __('Description')]
 );
-$table_agent->cellstyle[count($table_agent->data)][2] = 'width: 16px; text-align: right; padding: 0px;';
-$data[3] = '<span style="vertical-align:top; display: inline-block;">';
-$data[3] .= empty($agent['comentarios']) ? '<em>'.__('N/A').'</em>' : $agent['comentarios'];
-$data[3] .= '</span>';
-$table_agent->colspan[count($table_agent->data)][3] = 2;
-
-$table_agent->data[] = $data;
-$table_agent->rowclass[] = '';
+$table_agent_description .= '<span style="vertical-align:top; display: inline-block;">';
+$table_agent_description .= empty($agent['comentarios']) ? '<em>'.__('N/A').'</em>' : $agent['comentarios'];
+$table_agent_description .= '</span></p>';
 
+$table_agent_count_modules = reporting_tiny_stats($agent, true);
+// $table_agent_count_modules .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not  shown in real time.'), true);
+$table_agent = '<div class="agent_details_header">'.$table_agent_header.'</div>
+                <div class="agent_details_content">
+                    <div class="agent_details_graph">'.$table_agent_graph.'</div>
+                    <div class="agent_details_bullets">'.$table_agent_count_modules.'</div>
+                </div>
+                <div class="agent_details_info">'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.'</div>';
 // END: TABLE AGENT BUILD
 // START: TABLE CONTACT BUILD
 $table_contact = new stdClass();
@@ -211,12 +165,22 @@ $table_contact->id = 'agent_contact_main';
 $table_contact->width = '100%';
 $table_contact->cellspacing = 0;
 $table_contact->cellpadding = 0;
-$table_contact->class = 'databox data';
-$table_contact->style[0] = 'width: 30%;height:30px;';
+$table_contact->class = 'white_table white_table_no_border';
+$table_contact->style[0] = 'width: 30%;';
 $table_contact->style[1] = 'width: 70%;';
+$table_contact->headstyle[1] = 'padding-top:6px; padding-bottom:6px';
 
 $table_contact->head[0] = ' <span>'.__('Agent contact').'</span>';
-$table_contact->head_colspan[0] = 2;
+
+$buttons_refresh_agent_view = '<div class="buttons_agent_view">';
+$buttons_refresh_agent_view .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">'.html_print_image('images/refresh.png', true, ['title' => __('Refresh data'), 'alt' => '']).'</a><br>';
+if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
+    $buttons_refresh_agent_view .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">'.html_print_image('images/target.png', true, ['title' => __('Force remote checks'), 'alt' => '']).'</a>';
+}
+
+$buttons_refresh_agent_view .= '</div>';
+
+$table_contact->head[1] = $buttons_refresh_agent_view;
 
 $data = [];
 $data[0] = '<b>'.__('Interval').'</b>';
@@ -236,12 +200,41 @@ if ($agent['ultimo_contacto_remoto'] == '01-01-1970 00:00:00') {
 
 $table_contact->data[] = $data;
 
+
+$data = [];
+$table_contact->colspan[2][0] = 2;
 $data[0] = '<b>'.__('Next contact').'</b>';
 $progress = agents_get_next_contact($id_agente);
-$data[1] = progress_bar($progress, 200, 20, '', 1, false, '#666666');
+$table_contact->data[] = $data;
 
+
+$data = [];
+$table_contact->colspan[3][0] = 2;
+$data[0] = progress_bar($progress, 500, 30, '', 1, false, '#82b92e');
+// modo 1 para que muestre texto
 if ($progress > 100) {
-    $data[1] .= clippy_context_help('agent_out_of_limits');
+    $data[0] .= clippy_context_help('agent_out_of_limits');
+}
+
+$table_contact->data[] = $data;
+
+$data = [];
+$data[0] = '<b>'.__('Group').'</b>';
+$data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$agent['id_grupo'].'">'.groups_get_name($agent['id_grupo']).'</a>';
+$table_contact->data[] = $data;
+
+$data = [];
+$data[0] = '<b>'.__('Secondary groups').'</b>';
+$secondary_groups = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
+if (!$secondary_groups) {
+    $data[1] = '<em>'.__('N/A').'</em>';
+} else {
+    $secondary_links = [];
+    foreach ($secondary_groups['for_select'] as $id => $name) {
+        $secondary_links[] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id.'">'.$name.'</a>';
+    }
+
+    $data[1] = implode(', ', $secondary_links);
 }
 
 $table_contact->data[] = $data;
@@ -251,124 +244,101 @@ $table_contact->data[] = $data;
 $table_data = new stdClass();
 $table_data->id = 'agent_data_main';
 $table_data->width = '100%';
-$table_data->styleTable = 'height:180px';
 $table_data->cellspacing = 0;
 $table_data->cellpadding = 0;
-$table_data->class = 'databox data';
-$table_data->style[0] = 'width: 30%;';
-$table_data->style[1] = 'width: 40%;';
+$table_data->class = 'white_table white_table_droppable';
+$table_data->style = array_fill(0, 3, 'width: 25%;');
 
-$table_data->head[0] = ' <span>'.__('Agent info').'</span>';
-$table_data->head_colspan[0] = 3;
-
-$data = [];
-$data[0] = '<b>'.__('Group').'</b>';
-$data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$agent['id_grupo'].'">'.groups_get_name($agent['id_grupo']).'</a>';
-// ACCESS RATE GRAPH
-$access_agent = db_get_value_sql(
-    'SELECT COUNT(id_agent)
-	FROM tagent_access
-	WHERE id_agent = '.$id_agente
-);
-if ($config['agentaccess'] && $access_agent > 0) {
-    $data[2] = '<fieldset width=99% class="databox agente" style="">
-		<legend>'.__('Agent access rate (24h)').'</legend>'.graphic_agentaccess($id_agente, '95%', 100, SECONDS_1DAY, true).'</fieldset>';
-    $table_data->style[0] = 'width: 20%;';
-    $table_data->style[1] = 'width: 30%;';
-    $table_data->style[2] = 'width: 50%;';
-    $table_data->rowspan[0][2] = 5;
-}
-
-$table_data->data[] = $data;
-
-if (!empty($addresses)) {
-    $data = [];
-    $data[0] = '<b>'.__('Other IP addresses').'</b>';
-    $data[1] = '<div style="max-height: 45px; overflow-y: scroll; height:45px;">'.implode('<br>', $addresses).'</div>';
-    $table_data->data[] = $data;
-}
-
-$data = [];
-$data[0] = '<b>'.__('Parent').'</b>';
-if ($agent['id_parent'] == 0) {
-    $data[1] = '<em>'.__('N/A').'</em>';
-} else {
-    $data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_parent'].'">'.agents_get_alias($agent['id_parent']).'</a>';
-}
-
-$table_data->data[] = $data;
+$table_data->head[0] = html_print_image('images/arrow_down_green.png', true, $options);
+$table_data->head[0] .= ' <span style="vertical-align: middle; font-weight:bold; padding-left:20px">'.__('Agent info').'</span>';
+$table_data->head_colspan[0] = 4;
 
 $has_remote_conf = enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']]);
 
 if (enterprise_installed()) {
     $data = [];
-    $data[0] = '<b>'.__('Remote configuration').'</b>';
-    if (!$has_remote_conf) {
-        $data[1] = __('Disabled');
-    } else {
-        $data[1] = __('Enabled');
-    }
 
-    $table_data->data[] = $data;
-
-    $data = [];
-    $data[0] = '<b>'.__('Secondary groups').'</b>';
-    $secondary_groups = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
-    if (!$secondary_groups) {
+    $data[0] = '<b>'.__('Parent').'</b>';
+    if ($agent['id_parent'] == 0) {
         $data[1] = '<em>'.__('N/A').'</em>';
     } else {
-        $secondary_links = [];
-        foreach ($secondary_groups['for_select'] as $id => $name) {
-            $secondary_links[] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60&amp;group_id='.$id.'">'.$name.'</a>';
-        }
+        $data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_parent'].'">'.agents_get_alias($agent['id_parent']).'</a>';
+    }
 
-        $data[1] = implode(', ', $secondary_links);
+
+    $data[2] = '<b>'.__('Remote configuration').'</b>';
+    if (!$has_remote_conf) {
+        $data[3] = __('Disabled');
+    } else {
+        $data[3] = __('Enabled');
     }
 
     $table_data->data[] = $data;
 }
 
-if ($config['activate_gis'] || $agent['url_address'] != '') {
-    $data = [];
-    // Position Information
-    if ($config['activate_gis']) {
+// Gis and url address
+$data_opcional = [];
+// Position Information
+if ($config['activate_gis']) {
+    $data_opcional[] = '<b>'.__('Position (Long, Lat)').'</b>';
         $dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
 
-        $data[0] = '<b>'.__('Position (Long, Lat)').'</b>';
-
-        if ($dataPositionAgent === false) {
-            $data[1] = __('There is no GIS data.');
+    if ($dataPositionAgent === false) {
+        $data_opcional[] = __('There is no GIS data.');
+    } else {
+        $data_opcional[] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente='.$id_agente.'">';
+        if ($dataPositionAgent['description'] != '') {
+            $data_opcional[] .= $dataPositionAgent['description'];
         } else {
-            $data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;tab=gis&amp;id_agente='.$id_agente.'">';
-            if ($dataPositionAgent['description'] != '') {
-                $data[1] .= $dataPositionAgent['description'];
-            } else {
-                $data[1] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
-            }
-
-            $data[1] .= '</a>';
+            $data_opcional[] .= $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'];
         }
 
-        $table_data->data[] = $data;
+        $data_opcional[] .= '</a>';
     }
 
-    // If the url description is setted
+        array_push($data_opcional);
+}
+
+// If the url description is setted
+if ($agent['url_address'] != '') {
+    // $data_opcional = [];
+    $data_opcional[] = '<b>'.__('Url address').'</b>';
     if ($agent['url_address'] != '') {
-        $data = [];
-        $data[0] = '<b>'.__('Url address').'</b>';
-        $data[1] = '<a href='.$agent['url_address'].'>'.$agent['url_address'].'</a>';
-        $table_data->data[] = $data;
+        $data_opcional[] = '<a href='.$agent['url_address'].'>'.$agent['url_address'].'</a>';
     }
+
+        array_push($data_opcional);
+}
+
+
+// Other IP address and timezone offset
+if (!empty($addresses)) {
+    // $data_opcional = [];
+    $data_opcional[] = '<b>'.__('Other IP addresses').'</b>';
+    if (!empty($addresses)) {
+        $data_opcional[] = '<div style="max-height: 30px; overflow-y: scroll; height:30px;">'.implode('<br>', $addresses).'</div>';
+    }
+
+     array_push($data_opcional);
 }
 
 // Timezone Offset
 if ($agent['timezone_offset'] != 0) {
-    $data = [];
-    $data[0] = '<b>'.__('Timezone Offset').'</b>';
-    $data[1] = $agent['timezone_offset'];
-    $table->data[] = $data;
+    $data_opcional[] = '<b>'.__('Timezone Offset').'</b>';
+    if ($agent['timezone_offset'] != 0) {
+        $data_opcional[] = $agent['timezone_offset'];
+    }
+
+    array_push($data_opcional);
 }
 
+
+$data_opcional = array_chunk($data_opcional, 4);
+foreach ($data_opcional as $key => $value) {
+    $table_data->data[] = $data_opcional[$key];
+}
+
+
 // Custom fields
 $fields = db_get_all_rows_filter(
     'tagent_custom_fields',
@@ -378,6 +348,7 @@ if ($fields === false) {
     $fields = [];
 }
 
+$custom_fields = [];
 foreach ($fields as $field) {
     $data = [];
     $data[0] = '<b>'.$field['name'].ui_print_help_tip(__('Custom field'), true).'</b>';
@@ -398,10 +369,44 @@ foreach ($fields as $field) {
         $data[1] = $custom_value[0]['description'];
     }
 
-    $table_data->data[] = $data;
+    $custom_fields[] = $data;
+}
+
+$custom_fields_count = count($custom_fields);
+
+for ($i = 0; $i <= $custom_fields_count; $i++) {
+    $first_column = $custom_fields[$i];
+    $j = ($i + 1);
+    $second_column = $custom_fields[$j];
+
+    if (is_array($second_column)) {
+        $columns = array_merge($first_column, $second_column);
+    } else {
+        $columns = $first_column;
+        $filas = count($table_data->data);
+        $table_data->colspan[$filas][1] = 3;
+    }
+
+    $table_data->data[] = $columns;
+
+    $i++;
 }
 
 // END: TABLE DATA BUILD
+// START: ACCESS RATE GRAPH
+$access_agent = db_get_value_sql(
+    'SELECT COUNT(id_agent)
+    FROM tagent_access
+    WHERE id_agent = '.$id_agente
+);
+if ($config['agentaccess'] && $access_agent > 0) {
+    $table_access_rate = '<div class="white_table_graph" id="table_access_rate">
+                            <div class="white_table_graph_header">'.html_print_image('images/arrow_down_green.png', true).'<span>'.__('Agent access rate (24h)').'</span></div>
+                            <div class="white_table_graph_content">'.graphic_agentaccess($id_agente, '95%', 100, SECONDS_1DAY, true).'</div>
+                         </div>';
+}
+
+// END: ACCESS RATE GRAPH
 // START: TABLE INCIDENTS
 $last_incident = db_get_row_sql(
     "
@@ -416,31 +421,24 @@ if ($last_incident != false) {
     $table_incident->width = '100%';
     $table_incident->cellspacing = 0;
     $table_incident->cellpadding = 0;
-    $table_incident->class = 'databox';
-    $table_incident->style[0] = 'width: 30%;';
-    $table_incident->style[1] = 'width: 70%;';
+    $table_incident->class = 'white_table';
+    $table_incident->style = array_fill(0, 3, 'width: 25%;');
 
-    $table_incident->head[0] = ' <span>'.'<a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;id='.$last_incident['id_incidencia'].'">'.__('Active incident on this agent').'</a>'.'</span>';
-    $table_incident->head_colspan[0] = 2;
+    $table_incident->head[0] = ' <span><a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;id='.$last_incident['id_incidencia'].'">'.__('Active incident on this agent').'</a>'.'</span>';
+    $table_incident->head_colspan[0] = 4;
 
     $data = [];
     $data[0] = '<b>'.__('Author').'</b>';
     $data[1] = $last_incident['id_creator'];
+    $data[2] = '<b>'.__('Timestamp').'</b>';
+    $data[3] = $last_incident['inicio'];
     $table_incident->data[] = $data;
 
     $data = [];
     $data[0] = '<b>'.__('Title').'</b>';
     $data[1] = '<a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;id='.$last_incident['id_incidencia'].'">'.$last_incident['titulo'].'</a>';
-    $table_incident->data[] = $data;
-
-    $data = [];
-    $data[0] = '<b>'.__('Timestamp').'</b>';
-    $data[1] = $last_incident['inicio'];
-    $table_incident->data[] = $data;
-
-    $data = [];
-    $data[0] = '<b>'.__('Priority').'</b>';
-    $data[1] = incidents_print_priority_img($last_incident['prioridad'], true);
+    $data[2] = '<b>'.__('Priority').'</b>';
+    $data[3] = incidents_print_priority_img($last_incident['prioridad'], true);
     $table_incident->data[] = $data;
 }
 
@@ -456,8 +454,8 @@ if (!empty($network_interfaces_by_agents) && !empty($network_interfaces_by_agent
 if (!empty($network_interfaces)) {
     $table_interface = new stdClass();
     $table_interface->id = 'agent_interface_info';
-    $table_interface->class = 'databox data';
-    $table_interface->width = '98%';
+    $table_interface->class = 'info_table';
+    $table_interface->width = '100%';
     $table_interface->style = [];
     $table_interface->style['interface_status'] = 'width: 30px;padding-top:0px;padding-bottom:0px;';
     $table_interface->style['interface_graph'] = 'width: 20px;padding-top:0px;padding-bottom:0px;';
@@ -476,10 +474,10 @@ if (!empty($network_interfaces)) {
     $table_interface->head = [];
     $options = [
         'class' => 'closed',
-        'style' => 'vertical-align:righ; cursor:pointer;',
+        'style' => 'cursor:pointer;',
     ];
-    $table_interface->head[0] = html_print_image('images/graphmenu_arrow.png', true, $options).'&nbsp;&nbsp;';
-    $table_interface->head[0] .= '<span style="vertical-align: middle;">'.__('Interface information').' (SNMP)</span>';
+    $table_interface->head[0] = html_print_image('images/arrow_down_green.png', true, $options).'&nbsp;&nbsp;';
+    $table_interface->head[0] .= '<span style="vertical-align: middle; font-weight:bold;">'.__('Interface information').' (SNMP)</span>';
     $table_interface->head_colspan = [];
     $table_interface->head_colspan[0] = 8;
     $table_interface->data = [];
@@ -600,69 +598,80 @@ if (!empty($network_interfaces)) {
 
         $table_interface->data[] = $data;
     }
+}
 
+// END: TABLE INTERFACES
     // This javascript piece of code is used to make expandible the body of the table
-    ?>
+?>
     <script type="text/javascript">
         $(document).ready (function () {
             $("#agent_interface_info").find("tbody").hide();
             $("#agent_interface_info").find("thead").click (function () {
-                    var arrow = $("#agent_interface_info").find("thead").find("img");
-                    if (arrow.hasClass("closed")) {
-                        arrow.removeClass("closed");
-                        arrow.prop("src", "images/arrow-down-white.png");
-                        $("#agent_interface_info").find("tbody").show();
-                    } else {
-                        arrow.addClass("closed");
-                        arrow.prop("src", "images/graphmenu_arrow.png");
-                        $("#agent_interface_info").find("tbody").hide();
-                    }
-                })
-                .css('cursor', 'pointer');
+                close_table('#agent_interface_info');
+            })
+            .css('cursor', 'pointer');
+
+            $("#agent_data_main").find("thead").click (function () {
+                close_table('#agent_data_main');
+            })
+            .css('cursor', 'pointer');
+
+            $("#table_events").find(".white_table_graph_header").click (function () {
+                close_table_white('#table_events');
+            })
+            .css('cursor', 'pointer');
+
+            $("#table_access_rate").find(".white_table_graph_header").click (function () {
+                close_table_white('#table_access_rate');
+            })
+            .css('cursor', 'pointer');
+ 
+            function close_table(id){
+                var arrow = $(id).find("thead").find("img");
+                if (arrow.hasClass("closed")) {
+                    arrow.removeClass("closed");
+                    arrow.prop("src", "images/arrow_down_green.png");
+                    $(id).find("tbody").show();
+                } else {
+                    arrow.addClass("closed");
+                    arrow.prop("src", "images/arrow_right_green.png");
+                    $(id).find("tbody").hide();
+                }
+            }
+
+            function close_table_white(id){
+                var arrow = $(id).find(".white_table_graph_header").find("img");
+                if (arrow.hasClass("closed")) {
+                    arrow.removeClass("closed");
+                    arrow.prop("src", "images/arrow_down_green.png");
+                    $(id).find(".white_table_graph_content").show();
+                } else {
+                    arrow.addClass("closed");
+                    arrow.prop("src", "images/arrow_right_green.png");
+                    $(id).find(".white_table_graph_content").hide();
+                }
+            }
+            
         });
     </script>
     <?php
-}
+    $table_events = '<div class="white_table_graph" id="table_events">
+                <div class="white_table_graph_header">'.html_print_image('images/arrow_down_green.png', true).'<span>'.__('Events (24h)').'</span></div>
+                <div class="white_table_graph_content">'.graph_graphic_agentevents($id_agente, 100, 45, SECONDS_1DAY, '', true, true).'</div>
+            </div>';
 
-// END: TABLE INTERFACES
-$table = new stdClass();
-$table->id = 'agent_details';
-$table->width = '100%';
-$table->cellspacing = 0;
-$table->cellpadding = 0;
-$table->class = 'agents';
-$table->style = array_fill(0, 3, 'vertical-align: top;');
 
-$data = [];
-$data[0][0] = html_print_table($table_agent, true);
-$data[0][0] .= '<br /> <table width=95% class="databox agente" style="">
-		<tr><th>'.__('Events (24h)').'</th></tr>'.'<tr><td style="text-align:center;padding-left:20px;padding-right:20px;"><br />'.graph_graphic_agentevents($id_agente, 100, 45, SECONDS_1DAY, '', true, true).'<br /></td></tr>'.'</table>';
+    $agent_contact = html_print_table($table_contact, true);
 
-$table->style[0] = 'width:40%; vertical-align:top;';
-$data[0][1] = html_print_table($table_contact, true);
-$data[0][1] .= empty($table_data->data) ? '' : '<br>'.html_print_table($table_data, true);
-$data[0][1] .= !isset($table_incident) ? '' : '<br>'.html_print_table($table_incident, true);
+    $agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true);
 
-$table->rowspan[1][0] = 0;
+    $agent_incidents = !isset($table_incident) ? '' : html_print_table($table_incident, true);
 
-$data[0][2] = '<div style="width:100%; text-align:right">';
-$data[0][2] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">'.html_print_image('images/refresh.png', true, ['border' => '0', 'title' => __('Refresh data'), 'alt' => '']).'</a><br>';
-if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
-    $data[0][2] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">'.html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force remote checks'), 'alt' => '']).'</a>';
-}
-
-$data[0][2] .= '</div>';
-
-$table->data = $data;
-$table->rowclass[] = '';
-
-$table->cellstyle[1][0] = 'text-align:center;';
-
-html_print_table($table);
-$data2[1][0] = !isset($table_interface) ? '' : html_print_table($table_interface, true);
-$table->data = $data2;
-$table->styleTable = '';
-html_print_table($table);
-
-unset($table);
+    echo '<div id="agent_details_first_row">
+        <div class="agent_details_col agent_details_col_left">'.$table_agent.'</div>
+        <div class="agent_details_col agent_details_col_right">'.$agent_contact.'</div>
+    </div>'.$agent_info.'<div style="display:grid; grid-template-columns: 1fr 1fr; grid-column-gap: 20px;">'.$table_access_rate.$table_events.'</div>'.$agent_incidents;
 
+    if (isset($table_interface)) {
+        echo html_print_table($table_interface, true);
+    }
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 43abb4602b..12ebe35082 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1331,6 +1331,7 @@ if (isset($ehorus_tab) && !empty($ehorus_tab)) {
 }
 
 // Tabs for extensions.
+$tab_name_extensions = '';
 foreach ($config['extensions'] as $extension) {
     if (isset($extension['extension_ope_tab']) && !isset($extension['extension_god_tab'])) {
         if (check_acl_one_of_groups($config['id_user'], $all_groups, $extension['extension_ope_tab']['acl'])) {
@@ -1373,6 +1374,7 @@ foreach ($config['extensions'] as $extension) {
             $image = $extension['extension_ope_tab']['icon'];
             $name = $extension['extension_ope_tab']['name'];
             $id = $extension['extension_ope_tab']['id'];
+            $tab_name_extensions = $name;
 
             $id_extension = get_parameter('id_extension', '');
 
@@ -1395,15 +1397,82 @@ foreach ($config['extensions'] as $extension) {
 }
 
 switch ($tab) {
-    case 'wux_console_tab':
-        $help_header = 'wux_console_tab';
+    case 'custom_fields':
+        $tab_name = 'Custom fields';
+    break;
+
+    case 'gis':
+        $tab_name = 'GIS data';
+    break;
+
+    case 'manage':
+        $tab_name = 'Manage';
     break;
 
     case 'main':
+        $tab_name = 'Main';
         $help_header = 'agent_'.$tab.'_tab';
     break;
 
+    case 'data_view':
+        $tab_name = '';
+    break;
+
+    case 'alert':
+        $tab_name = 'Alerts';
+    break;
+
+    case 'inventory':
+        $tab_name = 'Inventory';
+    break;
+
+    case 'collection':
+        $tab_name = 'Collection';
+    break;
+
+    case 'policy':
+        $tab_name = 'Policies';
+    break;
+
+    case 'ux_console_tab':
+        $tab_name = 'UX Console';
+    break;
+
+    case 'wux_console_tab':
+        $tab_name = 'WUX Console';
+        $help_header = 'wux_console_tab';
+    break;
+
+    case 'url_route_analyzer_tab':
+        $tab_name = 'URL Route Analyzer';
+    break;
+
+    case 'graphs';
+        $tab_name = 'Graphs';
+    break;
+
+    case 'incident':
+        $tab_name = 'Incidents';
+    break;
+
+    case 'url_address':
+        $tab_name = 'Url address';
+    break;
+
+    case 'log_viewer':
+        $tab_name = 'Log viewer';
+    break;
+
+    case 'ehorus':
+        $tab_name = 'eHorus';
+    break;
+
+    case 'extension':
+        $tab_name = $tab_name_extensions;
+    break;
+
     default:
+        $tab_name = '';
         $help_header = '';
     break;
 }
@@ -1417,7 +1486,9 @@ ui_print_page_header(
     $onheader,
     false,
     '',
-    $config['item_title_size_text']
+    $config['item_title_size_text'],
+    '',
+    __('Resources').ui_print_breadcrums($tab_name)
 );
 
 
diff --git a/pandora_console/operation/users/user_edit_header.php b/pandora_console/operation/users/user_edit_header.php
index aac28b76f5..fd3e04188b 100644
--- a/pandora_console/operation/users/user_edit_header.php
+++ b/pandora_console/operation/users/user_edit_header.php
@@ -99,10 +99,12 @@ if (is_metaconsole()) {
             ).'</a>',
         ],
     ];
+    $tab_name = 'User Management';
 
     $helpers = '';
     if ($_GET['sec2'] === 'operation/users/user_edit_notifications') {
         $helpers = 'user_edit_notifications';
+        $tab_name = 'User Notifications';
     }
 
     ui_print_page_header(
@@ -111,6 +113,11 @@ if (is_metaconsole()) {
         false,
         $helpers,
         false,
-        $buttons
+        $buttons,
+        false,
+        '',
+        GENERIC_SIZE_TEXT,
+        '',
+        __('Workspace').ui_print_breadcrums($tab_name)
     );
 }

From 954dd0b43a8a6198f5b1e4d074a91e6e06e1df44 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 19:08:41 +0200
Subject: [PATCH 17/61] UI_toggle updated

---
 pandora_console/include/functions_ui.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 23bdb79d82..a1fd3f18bf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2474,17 +2474,15 @@ function ui_toggle($code, $name, $title='', $hidden_default=true, $return=false,
     // Generate unique Id
     $uniqid = uniqid('');
 
+    $image_a = html_print_image('images/arrow_down_green.png', true, false, true);
+    $image_b = html_print_image('images/arrow_right_green.png', true, false, true);
     // Options
     if ($hidden_default) {
         $style = 'display:none';
-        $image_a = html_print_image('images/down.png', true, false, true);
-        $image_b = html_print_image('images/go.png', true, false, true);
-        $original = 'images/go.png';
+        $original = 'images/arrow_right_green.png';
     } else {
         $style = '';
-        $image_a = html_print_image('images/down.png', true, false, true);
-        $image_b = html_print_image('images/go.png', true, false, true);
-        $original = 'images/down.png';
+        $original = 'images/arrow_down_green.png';
     }
 
     // Link to toggle

From f1499082faed809a5fd9143ba5b48893d9fee902 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 21:30:46 +0200
Subject: [PATCH 18/61] agent view rebuilt

---
 .../godmode/agentes/agent_manager.php         | 118 ++++---
 pandora_console/include/functions_ui.php      |  45 +++
 pandora_console/include/styles/pandora.css    |  49 ++-
 pandora_console/include/styles/progress.css   |  18 +
 .../agentes/estado_generalagente.php          | 312 +++++++++++++-----
 .../operation/agentes/estado_monitores.php    |   8 +-
 6 files changed, 414 insertions(+), 136 deletions(-)
 create mode 100644 pandora_console/include/styles/progress.css

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 8138e69a50..d78b6c2a36 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -89,7 +89,7 @@ if (is_ajax()) {
         $out = false;
         foreach ($idSNMP as $id) {
             foreach ($snmp[$id] as $key => $value) {
-                // Check if it has "ifXXXX" syntax and skip it
+                // Check if it has "ifXXXX" syntax and skip it.
                 if (! preg_match('/if/', $key)) {
                     continue;
                 }
@@ -109,7 +109,7 @@ if (is_ajax()) {
         echo io_json_mb_encode($out);
     }
 
-    // And and remove groups use the same function
+    // And and remove groups use the same function.
     $add_secondary_groups = get_parameter('add_secondary_groups');
     $remove_secondary_groups = get_parameter('remove_secondary_groups');
     if ($add_secondary_groups || $remove_secondary_groups) {
@@ -125,12 +125,12 @@ if (is_ajax()) {
                 'agents_update_secondary_groups',
                 [
                     $id_agent,
-                    $add_secondary_groups ? $groups_to_add : [],
-                    $remove_secondary_groups ? $groups_to_add : [],
+                    ($add_secondary_groups) ? $groups_to_add : [],
+                    ($remove_secondary_groups) ? $groups_to_add : [],
                 ]
             );
             // Echo 0 in case of error. 0 Otherwise.
-            echo $ret ? 1 : 0;
+            echo ($ret) ? 1 : 0;
         }
     }
 
@@ -160,7 +160,7 @@ if ($new_agent) {
 }
 
 if (!$new_agent) {
-    // Agent remote configuration editor
+    // Agent remote configuration editor.
     enterprise_include_once('include/functions_config_agents.php');
     if (enterprise_installed()) {
         $filename = config_agents_get_agent_config_filenames($id_agente);
@@ -168,10 +168,10 @@ if (!$new_agent) {
 }
 
 $disk_conf_delete = (bool) get_parameter('disk_conf_delete');
-// Agent remote configuration DELETE
+// Agent remote configuration DELETE.
 if ($disk_conf_delete) {
     // TODO: Get this working on computers where the Pandora server(s) are not on the webserver
-    // TODO: Get a remote_config editor working in the open version
+    // TODO: Get a remote_config editor working in the open version.
     @unlink($filename['md5']);
     @unlink($filename['conf']);
 }
@@ -217,7 +217,7 @@ if (!$new_agent && $alias != '') {
     $agent_options_update = 'agent_options_update';
 
     // Delete link from here.
-    $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=$id_agente&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
+    $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=".$id_agente."&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
 
     // Help link.
     $table_agent_name .= ui_print_help_icon(
@@ -424,43 +424,43 @@ if (enterprise_installed()) {
     $table_adv_secondary_groups = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': '.ui_print_help_icon('secondary_groups', true).'</p></div>';
     $table_adv_secondary_groups_left = html_print_select_groups(
         false,
-        // Use the current user to select the groups
+        // Use the current user to select the groups.
         'AR',
-        // ACL permission
+        // ACL permission.
         false,
-        // Not all group
+        // Not all group.
         'secondary_groups',
-        // HTML id
+        // HTML id.
         '',
-        // No select any by default
+        // No select any by default.
         '',
-        // Javascript onChange code
+        // Javascript onChange code.
         '',
-        // Do not user no selected value
+        // Do not user no selected value.
         0,
-        // Do not use no selected value
+        // Do not use no selected value.
         true,
-        // Return HTML (not echo)
+        // Return HTML (not echo).
         true,
-        // Multiple selection
+        // Multiple selection.
         true,
-        // Sorting by default
+        // Sorting by default.
         '',
-        // CSS classnames (default)
+        // CSS classnames (default).
         false,
-        // Not disabled (default)
+        // Not disabled (default).
         'width:50%; min-width:170px;',
-        // Inline styles (default)
+        // Inline styles (default).
         false,
-        // Option style select (default)
+        // Option style select (default).
         false,
-        // Do not truncate the users tree (default)
+        // Do not truncate the users tree (default).
         'id_grupo',
-        // Key to get as value (default)
+        // Key to get as value (default).
         false,
-        // Not strict user (default)
+        // Not strict user (default).
         $secondary_groups_selected['plain']
-        // Do not show the primary group in this selection
+        // Do not show the primary group in this selection.
     );
 
     $table_adv_secondary_groups_arrows = html_print_input_image(
@@ -489,32 +489,32 @@ if (enterprise_installed()) {
 
     $table_adv_secondary_groups_right .= html_print_select(
         $secondary_groups_selected['for_select'],
-        // Values
+        // Values.
         'secondary_groups_selected',
-        // HTML id
+        // HTML id.
         '',
-        // Selected
+        // Selected.
         '',
-        // Javascript onChange code
+        // Javascript onChange code.
         '',
-        // Nothing selected
+        // Nothing selected.
         0,
-        // Nothing selected
+        // Nothing selected.
         true,
-        // Return HTML (not echo)
+        // Return HTML (not echo).
         true,
-        // Multiple selection
+        // Multiple selection.
         true,
-        // Sort
+        // Sort.
         '',
-        // Class
+        // Class.
         false,
-        // Disabled
+        // Disabled.
         'width:50%; min-width:170px;'
-        // Style
+        // Style.
     );
 
-    // safe operation mode
+    // Safe operation mode.
     if ($id_agente) {
         $sql_modules = db_get_all_rows_sql(
             'SELECT id_agente_modulo as id_module, nombre as name FROM tagente_modulo 
@@ -538,12 +538,12 @@ if (enterprise_installed()) {
         $table_adv_safe .= __('Module').'&nbsp;'.html_print_select($safe_mode_modules, 'safe_mode_module', $safe_mode_module, '', '', 0, true).'</div>';
     }
 
-    // Remote configuration
+    // Remote configuration.
     $table_adv_remote = '<div class="label_select"><p class="input_label">'.__('Remote configuration').': </p>';
 
     if (!$new_agent && isset($filename) && file_exists($filename['md5'])) {
         $table_adv_remote .= date('F d Y H:i:s', fileatime($filename['md5']));
-        // Delete remote configuration
+        // Delete remote configuration.
         $table_adv_remote .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&disk_conf_delete=1&id_agente='.$id_agente.'">';
         $table_adv_remote .= html_print_image(
             'images/cross.png',
@@ -602,12 +602,25 @@ $params['cascade_protection'] = true;
 $table_adv_parent .= '<div class="label_simple_items">';
 $table_adv_parent .= ui_print_agent_autocomplete_input($params);
 if (enterprise_installed()) {
-    $table_adv_parent .= html_print_checkbox_switch('cascade_protection', 1, $cascade_protection, true).__('Cascade protection').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
+    $table_adv_parent .= html_print_checkbox_switch(
+        'cascade_protection',
+        1,
+        $cascade_protection,
+        true
+    ).__('Cascade protection').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
 }
 
-$table_adv_parent .= __('Module').'&nbsp;'.html_print_select($modules_values, 'cascade_protection_module', $cascade_protection_module, '', '', 0, true).'</div></div>';
+$table_adv_parent .= __('Module').'&nbsp;'.html_print_select(
+    $modules_values,
+    'cascade_protection_module',
+    $cascade_protection_module,
+    '',
+    '',
+    0,
+    true
+).'</div></div>';
 
-// Learn mode / Normal mode
+// Learn mode / Normal mode.
 $table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': '.ui_print_help_icon('module_definition', true).'</p>';
 $table_adv_module_mode .= '<div class="switch_radio_button">';
 $table_adv_module_mode .= html_print_radio_button_extended(
@@ -642,9 +655,14 @@ $table_adv_module_mode .= html_print_radio_button_extended(
 );
 $table_adv_module_mode .= '</div></div>';
 
-// Status (Disabled / Enabled)
+// Status (Disabled / Enabled).
 $table_adv_status = '<div class="label_select_simple label_simple_one_item"><p class="input_label input_label_simple">'.__('Disabled').': '.ui_print_help_tip(__('If the remote configuration is enabled, it will also go into standby mode when disabling it.'), true).'</p>';
-$table_adv_status .= html_print_checkbox_switch('disabled', 1, $disabled, true).'</div>';
+$table_adv_status .= html_print_checkbox_switch(
+    'disabled',
+    1,
+    $disabled,
+    true
+).'</div>';
 
 // Url address.
 if (enterprise_installed()) {
@@ -681,11 +699,11 @@ foreach ($listIcons as $index => $value) {
 }
 
 $path = 'images/gis_map/icons/';
-// TODO set better method the path
+// TODO set better method the path.
 $table_adv_agent_icon = '<div class="label_select"><p class="input_label">'.__('Agent icon').': '.ui_print_help_tip(__('Agent icon for GIS Maps.'), true).'</p>';
 if ($icon_path == '') {
     $display_icons = 'none';
-    // Hack to show no icon. Use any given image to fix not found image errors
+    // Hack to show no icon. Use any given image to fix not found image errors.
     $path_without = 'images/spinner.png';
     $path_default = 'images/spinner.png';
     $path_ok = 'images/spinner.png';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index a1fd3f18bf..fb1c60bdd1 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2458,6 +2458,51 @@ function ui_print_status_image($type, $title='', $return=false, $options=false,
 }
 
 
+/**
+ * Generates a progress bar CSS based.
+ * Requires css progress.css
+ *
+ * @param integer $progress Progress.
+ * @param string  $width    Width.
+ * @param string  $height   Height.
+ * @param string  $color    Color.
+ * @param boolean $return   Return or paint (if false).
+ *
+ * @return string HTML code.
+ */
+function ui_progress(
+    $progress,
+    $width='100%',
+    $height='2em',
+    $color='#80ba27',
+    $return=true
+) {
+    if (!$progress) {
+        $progress = 0;
+    }
+
+    if ($progress > 100) {
+        $progress = 100;
+    }
+
+    if ($progress < 0) {
+        $progress = 0;
+    }
+
+    ui_require_css_file('progress');
+    $output .= '<div class="progress_main">';
+    $output .= '<span class="progress_text">'.$progress.'%</span>';
+    $output .= '<div class="progress" style="width: '.$progress.'%;"></div>';
+    $output .= '</div>';
+
+    if (!$return) {
+        echo $output;
+    }
+
+    return $output;
+}
+
+
 /**
  * Print a code into a DIV and enable a toggle to show and hide it
  *
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4a771b3017..f132c0db94 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5945,6 +5945,43 @@ a#qr_code_agent_view {
  * ---------------------------------------------------------------------
  */
 
+.bullet_modules {
+  width: 15px;
+  height: 15px;
+  border-radius: 50%;
+  margin-right: 5px;
+  margin-top: -2px;
+}
+
+div#bullets_modules {
+  display: inline-block;
+  margin-left: 2em;
+}
+
+div#bullets_modules div {
+  display: inline-block;
+  margin: 0 0.5em;
+}
+
+.orange_background {
+  background: #ffa631;
+}
+.red_background {
+  background: #fc4444;
+}
+.yellow_background {
+  background: #fad403;
+}
+.grey_background {
+  background: #b2b2b2;
+}
+.blue_background {
+  background: #3ba0ff;
+}
+.green_background {
+  background: #80ba27;
+}
+
 /* First row in agent view */
 #agent_details_first_row {
   display: flex;
@@ -5960,12 +5997,19 @@ a#qr_code_agent_view {
 }
 
 .agent_details_col_left {
-  width: 38%;
+  width: 40%;
+  min-width: 500px;
+}
+
+.agent_details_content .agent_details_bullets {
+  position: relative;
+  left: -20%;
 }
 
 .agent_details_col_right {
   width: 62%;
   margin-left: 20px;
+  min-width: 670px;
 }
 
 .buttons_agent_view {
@@ -5985,7 +6029,7 @@ a#qr_code_agent_view {
 /* Agent details in agent view */
 .agent_details_header {
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-end;
   align-items: center;
   border-bottom: 1px solid #e2e2e2;
   padding: 6px 20px;
@@ -6005,6 +6049,7 @@ a#qr_code_agent_view {
 .agent_details_graph {
   width: 205px;
   text-align: center;
+  margin: 0 auto;
 }
 
 .agent_details_info {
diff --git a/pandora_console/include/styles/progress.css b/pandora_console/include/styles/progress.css
new file mode 100644
index 0000000000..0919269d37
--- /dev/null
+++ b/pandora_console/include/styles/progress.css
@@ -0,0 +1,18 @@
+span.progress_text {
+  position: absolute;
+  font-family: "lato-bolder", "Open Sans", sans-serif;
+  font-size: 2em;
+}
+
+div.progress_main {
+  text-align: center;
+  height: 2.5em;
+  border: 1px solid #80ba27;
+}
+
+div.progress {
+  width: 0%;
+  background: #80ba27;
+  height: 100%;
+  float: left;
+}
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index d51057833f..c578259e60 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Extension to schedule tasks on Pandora FMS Console
+ *
+ * @category   Agent view status.
+ * @package    Pandora FMS
+ * @subpackage Classic agent management view.
+ * @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) 2005-2010 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.
-// Load global vars
+// Begin.
 global $config;
 
 require_once 'include/functions_agents.php';
@@ -27,7 +42,12 @@ require_once $config['homedir'].'/include/functions_clippy.php';
 
 check_login();
 
-$strict_user = (bool) db_get_value('strict_acl', 'tusuario', 'id_user', $config['id_user']);
+$strict_user = (bool) db_get_value(
+    'strict_acl',
+    'tusuario',
+    'id_user',
+    $config['id_user']
+);
 
 $id_agente = get_parameter_get('id_agente', -1);
 
@@ -50,7 +70,10 @@ if ($is_extra === ENTERPRISE_NOT_HOOK) {
     $is_extra = false;
 }
 
-if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') && ! check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') && !$is_extra) {
+if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')
+    && ! check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')
+    && !$is_extra
+) {
     db_pandora_audit(
         'ACL Violation',
         'Trying to access Agent General Information'
@@ -59,8 +82,17 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR') && ! check_
     return;
 }
 
-// START: TABLE AGENT BUILD
-$agent_name = ui_print_agent_name($agent['id_agente'], true, 500, 'font-size: medium;font-weight:bold', true);
+/*
+ * START: TABLE AGENT BUILD.
+ */
+
+$agent_name = ui_print_agent_name(
+    $agent['id_agente'],
+    true,
+    500,
+    'font-size: medium;font-weight:bold',
+    true
+);
 $in_planned_downtime = db_get_sql(
     'SELECT executed FROM tplanned_downtime 
 	INNER JOIN tplanned_downtime_agents 
@@ -86,17 +118,31 @@ if ($agent['disabled']) {
 }
 
 if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
-    $agent_name .= '<em>'.'&nbsp;'.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png').'</em>';
-} else if (($in_planned_downtime && !$agent['disabled']) || ($in_planned_downtime && !$agent['quiet'])) {
-    $agent_name .= '&nbsp;'.ui_print_help_tip(__('Agent in planned downtime'), true, 'images/minireloj-16.png').'</em>';
+    $agent_name .= '<em>&nbsp;'.ui_print_help_tip(
+        __('Agent in planned downtime'),
+        true,
+        'images/minireloj-16.png'
+    ).'</em>';
+} else if (($in_planned_downtime && !$agent['disabled'])
+    || ($in_planned_downtime && !$agent['quiet'])
+) {
+    $agent_name .= '&nbsp;'.ui_print_help_tip(
+        __('Agent in planned downtime'),
+        true,
+        'images/minireloj-16.png'
+    ).'</em>';
 }
 
 $table_agent_header = '<div class="agent_details_agent_name">';
 if (!$config['show_group_name']) {
-    $table_agent_header .= ui_print_group_icon($agent['id_grupo'], true, 'groups_small', 'padding-right: 6px;');
+    $table_agent_header .= ui_print_group_icon(
+        $agent['id_grupo'],
+        true,
+        'groups_small',
+        'padding-right: 6px;'
+    );
 }
 
-$table_agent_header .= $agent_name;
 $table_agent_header .= '</div>';
 
 $status_img = agents_detail_view_status_img(
@@ -109,16 +155,33 @@ $status_img = agents_detail_view_status_img(
 
 $table_agent_header .= '<div class="icono_right">'.$status_img.'</div>';
 
-// Fixed width non interactive charts
+// Fixed width non interactive charts.
 $status_chart_width = 180;
 $graph_width = 180;
 
 $table_agent_graph = '<div id="status_pie" style="width: '.$status_chart_width.'px;">';
-$table_agent_graph .= graph_agent_status($id_agente, $graph_width, $graph_width, true, false, false, true);
+$table_agent_graph .= graph_agent_status(
+    $id_agente,
+    $graph_width,
+    $graph_width,
+    true,
+    false,
+    false,
+    true
+);
 $table_agent_graph .= '</div>';
 
-$table_agent_os = '<p>'.ui_print_os_icon($agent['id_os'], false, true, true, false, false, false, ['title' => __('OS').': '.get_os_name($agent['id_os'])]);
-$table_agent_os .= empty($agent['os_version']) ? get_os_name((int) $agent['id_os']) : $agent['os_version'].'</p>';
+$table_agent_os = '<p>'.ui_print_os_icon(
+    $agent['id_os'],
+    false,
+    true,
+    true,
+    false,
+    false,
+    false,
+    ['title' => __('OS').': '.get_os_name($agent['id_os'])]
+);
+$table_agent_os .= (empty($agent['os_version'])) ? get_os_name((int) $agent['id_os']) : $agent['os_version'].'</p>';
 
 $addresses = agents_get_addresses($id_agente);
 $address = agents_get_address($id_agente);
@@ -158,8 +221,15 @@ $table_agent = '<div class="agent_details_header">'.$table_agent_header.'</div>
                     <div class="agent_details_bullets">'.$table_agent_count_modules.'</div>
                 </div>
                 <div class="agent_details_info">'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.'</div>';
-// END: TABLE AGENT BUILD
-// START: TABLE CONTACT BUILD
+
+/*
+ * END: TABLE AGENT BUILD.
+ */
+
+/*
+ *START: TABLE CONTACT BUILD.
+ */
+
 $table_contact = new stdClass();
 $table_contact->id = 'agent_contact_main';
 $table_contact->width = '100%';
@@ -168,7 +238,7 @@ $table_contact->cellpadding = 0;
 $table_contact->class = 'white_table white_table_no_border';
 $table_contact->style[0] = 'width: 30%;';
 $table_contact->style[1] = 'width: 70%;';
-$table_contact->headstyle[1] = 'padding-top:6px; padding-bottom:6px';
+$table_contact->headstyle[1] = 'padding-top:6px; padding-bottom:6px;padding-right: 10px;';
 
 $table_contact->head[0] = ' <span>'.__('Agent contact').'</span>';
 
@@ -210,8 +280,8 @@ $table_contact->data[] = $data;
 
 $data = [];
 $table_contact->colspan[3][0] = 2;
-$data[0] = progress_bar($progress, 500, 30, '', 1, false, '#82b92e');
-// modo 1 para que muestre texto
+$data[0] = ui_progress($progress);
+
 if ($progress > 100) {
     $data[0] .= clippy_context_help('agent_out_of_limits');
 }
@@ -239,8 +309,14 @@ if (!$secondary_groups) {
 
 $table_contact->data[] = $data;
 
-// END: TABLE CONTACT BUILD
-// START: TABLE DATA BUILD
+/*
+ * END: TABLE CONTACT BUILD
+ */
+
+/*
+ * START: TABLE DATA BUILD
+ */
+
 $table_data = new stdClass();
 $table_data->id = 'agent_data_main';
 $table_data->width = '100%';
@@ -249,11 +325,18 @@ $table_data->cellpadding = 0;
 $table_data->class = 'white_table white_table_droppable';
 $table_data->style = array_fill(0, 3, 'width: 25%;');
 
-$table_data->head[0] = html_print_image('images/arrow_down_green.png', true, $options);
+$table_data->head[0] = html_print_image(
+    'images/arrow_down_green.png',
+    true,
+    $options
+);
 $table_data->head[0] .= ' <span style="vertical-align: middle; font-weight:bold; padding-left:20px">'.__('Agent info').'</span>';
 $table_data->head_colspan[0] = 4;
 
-$has_remote_conf = enterprise_hook('config_agents_has_remote_configuration', [$agent['id_agente']]);
+$has_remote_conf = enterprise_hook(
+    'config_agents_has_remote_configuration',
+    [$agent['id_agente']]
+);
 
 if (enterprise_installed()) {
     $data = [];
@@ -276,12 +359,14 @@ if (enterprise_installed()) {
     $table_data->data[] = $data;
 }
 
-// Gis and url address
+// Gis and url address.
 $data_opcional = [];
-// Position Information
+// Position Information.
 if ($config['activate_gis']) {
     $data_opcional[] = '<b>'.__('Position (Long, Lat)').'</b>';
-        $dataPositionAgent = gis_get_data_last_position_agent($agent['id_agente']);
+        $dataPositionAgent = gis_get_data_last_position_agent(
+            $agent['id_agente']
+        );
 
     if ($dataPositionAgent === false) {
         $data_opcional[] = __('There is no GIS data.');
@@ -299,7 +384,7 @@ if ($config['activate_gis']) {
         array_push($data_opcional);
 }
 
-// If the url description is setted
+// If the url description is set.
 if ($agent['url_address'] != '') {
     // $data_opcional = [];
     $data_opcional[] = '<b>'.__('Url address').'</b>';
@@ -311,7 +396,7 @@ if ($agent['url_address'] != '') {
 }
 
 
-// Other IP address and timezone offset
+// Other IP address and timezone offset.
 if (!empty($addresses)) {
     // $data_opcional = [];
     $data_opcional[] = '<b>'.__('Other IP addresses').'</b>';
@@ -322,7 +407,7 @@ if (!empty($addresses)) {
      array_push($data_opcional);
 }
 
-// Timezone Offset
+// Timezone Offset.
 if ($agent['timezone_offset'] != 0) {
     $data_opcional[] = '<b>'.__('Timezone Offset').'</b>';
     if ($agent['timezone_offset'] != 0) {
@@ -339,7 +424,7 @@ foreach ($data_opcional as $key => $value) {
 }
 
 
-// Custom fields
+// Custom fields.
 $fields = db_get_all_rows_filter(
     'tagent_custom_fields',
     ['display_on_front' => 1]
@@ -392,28 +477,52 @@ for ($i = 0; $i <= $custom_fields_count; $i++) {
     $i++;
 }
 
-// END: TABLE DATA BUILD
-// START: ACCESS RATE GRAPH
+/*
+ * END: TABLE DATA BUILD
+ */
+
+/*
+ * START: ACCESS RATE GRAPH
+ */
+
 $access_agent = db_get_value_sql(
     'SELECT COUNT(id_agent)
     FROM tagent_access
     WHERE id_agent = '.$id_agente
 );
+
 if ($config['agentaccess'] && $access_agent > 0) {
     $table_access_rate = '<div class="white_table_graph" id="table_access_rate">
-                            <div class="white_table_graph_header">'.html_print_image('images/arrow_down_green.png', true).'<span>'.__('Agent access rate (24h)').'</span></div>
-                            <div class="white_table_graph_content">'.graphic_agentaccess($id_agente, '95%', 100, SECONDS_1DAY, true).'</div>
-                         </div>';
+                            <div class="white_table_graph_header">'.html_print_image(
+        'images/arrow_down_green.png',
+        true
+    ).'<span>'.__('Agent access rate (24h)').'</span></div>
+                            <div class="white_table_graph_content">'.graphic_agentaccess(
+        $id_agente,
+        '95%',
+        100,
+        SECONDS_1DAY,
+        true
+    ).'</div>
+</div>';
 }
 
-// END: ACCESS RATE GRAPH
-// START: TABLE INCIDENTS
+/*
+ * END: ACCESS RATE GRAPH
+ */
+
+/*
+ * START: TABLE INCIDENTS
+ */
+
 $last_incident = db_get_row_sql(
-    "
-	SELECT * FROM tincidencia
-	WHERE estado IN (0,1)
-		AND id_agent = $id_agente
-	ORDER BY actualizacion DESC"
+    sprintf(
+        'SELECT * FROM tincidencia
+	     WHERE estado IN (0,1)
+		 AND id_agent = %d
+        ORDER BY actualizacion DESC',
+        $id_agente
+    )
 );
 
 if ($last_incident != false) {
@@ -424,7 +533,7 @@ if ($last_incident != false) {
     $table_incident->class = 'white_table';
     $table_incident->style = array_fill(0, 3, 'width: 25%;');
 
-    $table_incident->head[0] = ' <span><a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;id='.$last_incident['id_incidencia'].'">'.__('Active incident on this agent').'</a>'.'</span>';
+    $table_incident->head[0] = ' <span><a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident_detail&amp;id='.$last_incident['id_incidencia'].'">'.__('Active incident on this agent').'</a></span>';
     $table_incident->head_colspan[0] = 4;
 
     $data = [];
@@ -442,8 +551,14 @@ if ($last_incident != false) {
     $table_incident->data[] = $data;
 }
 
-// END: TABLE INCIDENTS
-// START: TABLE INTERFACES
+/*
+ * END: TABLE INCIDENTS
+ */
+
+/*
+ * START: TABLE INTERFACES
+ */
+
 $network_interfaces_by_agents = agents_get_network_interfaces([$agent]);
 
 $network_interfaces = [];
@@ -476,7 +591,11 @@ if (!empty($network_interfaces)) {
         'class' => 'closed',
         'style' => 'cursor:pointer;',
     ];
-    $table_interface->head[0] = html_print_image('images/arrow_down_green.png', true, $options).'&nbsp;&nbsp;';
+    $table_interface->head[0] = html_print_image(
+        'images/arrow_down_green.png',
+        true,
+        $options
+    ).'&nbsp;&nbsp;';
     $table_interface->head[0] .= '<span style="vertical-align: middle; font-weight:bold;">'.__('Interface information').' (SNMP)</span>';
     $table_interface->head_colspan = [];
     $table_interface->head_colspan[0] = 8;
@@ -497,7 +616,7 @@ if (!empty($network_interfaces)) {
                 $params_json = json_encode($params);
                 $params_encoded = base64_encode($params_json);
                 $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
-                $graph_link = "<a href=\"javascript:winopeng('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle')\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
+                $graph_link = "<a href=\"javascript:winopeng('operation/agentes/interface_traffic_graph_win.php?params=".$params_encoded."','".$win_handle."')\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
             } else {
                 $graph_link = '';
             }
@@ -520,9 +639,9 @@ if (!empty($network_interfaces)) {
 
         $status_condition = ' AND (estado = 0 OR estado = 1) ';
         $unixtime = (get_system_time() - SECONDS_1DAY);
-        // last hour
+        // Last hour.
         $time_condition = 'AND (utimestamp > '.$unixtime.')';
-        // Tags ACLS
+        // Tags ACLs.
         if ($id_group > 0 && in_array(0, $user_groups_ids)) {
             $group_array = (array) $id_group;
         } else {
@@ -545,18 +664,16 @@ if (!empty($network_interfaces)) {
         $id_modules_array[] = $interface['status_module_id'];
 
         $unixtime = (get_system_time() - SECONDS_1DAY);
-        // last hour
+        // Last hour.
         $time_condition = 'WHERE (te.utimestamp > '.$unixtime.')';
 
         $sqlEvents = sprintf(
-            '
-			SELECT *
+            'SELECT *
 			FROM tevento te
 			INNER JOIN tagente_estado tae
 				ON te.id_agentmodule = tae.id_agente_modulo
 					AND tae.id_agente_modulo IN (%s)
-			%s
-		',
+			%s',
             implode(',', $id_modules_array),
             $time_condition
         );
@@ -600,8 +717,12 @@ if (!empty($network_interfaces)) {
     }
 }
 
-// END: TABLE INTERFACES
-    // This javascript piece of code is used to make expandible the body of the table
+/*
+ * END: TABLE INTERFACES
+ */
+
+    // This javascript piece of code is used to make expandible
+    // the body of the table.
 ?>
     <script type="text/javascript">
         $(document).ready (function () {
@@ -654,24 +775,51 @@ if (!empty($network_interfaces)) {
             
         });
     </script>
-    <?php
-    $table_events = '<div class="white_table_graph" id="table_events">
-                <div class="white_table_graph_header">'.html_print_image('images/arrow_down_green.png', true).'<span>'.__('Events (24h)').'</span></div>
-                <div class="white_table_graph_content">'.graph_graphic_agentevents($id_agente, 100, 45, SECONDS_1DAY, '', true, true).'</div>
-            </div>';
+<?php
+/*
+ * EVENTS.
+ */
 
+$table_events = '<div class="white_table_graph" id="table_events">
+            <div class="white_table_graph_header">'.html_print_image(
+    'images/arrow_down_green.png',
+    true
+).'<span>'.__('Events (24h)').'</span></div>
+            <div class="white_table_graph_content">'.graph_graphic_agentevents(
+    $id_agente,
+    100,
+    45,
+    SECONDS_1DAY,
+    '',
+    true,
+    true
+).'</div>
+        </div>';
 
-    $agent_contact = html_print_table($table_contact, true);
+/*
+ * EVENTS TABLE END.
+ */
 
-    $agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true);
+$agent_contact = html_print_table($table_contact, true);
 
-    $agent_incidents = !isset($table_incident) ? '' : html_print_table($table_incident, true);
+$agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true);
 
-    echo '<div id="agent_details_first_row">
-        <div class="agent_details_col agent_details_col_left">'.$table_agent.'</div>
-        <div class="agent_details_col agent_details_col_right">'.$agent_contact.'</div>
-    </div>'.$agent_info.'<div style="display:grid; grid-template-columns: 1fr 1fr; grid-column-gap: 20px;">'.$table_access_rate.$table_events.'</div>'.$agent_incidents;
+$agent_incidents = !isset($table_incident) ? '' : html_print_table($table_incident, true);
 
-    if (isset($table_interface)) {
-        echo html_print_table($table_interface, true);
-    }
+echo '<div id="agent_details_first_row">
+    <div class="agent_details_col agent_details_col_left">'.$table_agent.'</div>
+    <div class="agent_details_col agent_details_col_right">'.$agent_contact.'</div>
+    </div>'.$agent_info;
+
+// Show both graphs, events and access rate.
+if ($table_access_rate) {
+    echo '<div style="display:grid; grid-template-columns: 1fr 1fr; grid-column-gap: 20px;">'.$table_access_rate.$table_events.'</div>';
+} else {
+    echo '<div style="width: 100%">'.$table_events.'</div>';
+}
+
+echo $agent_incidents;
+
+if (isset($table_interface)) {
+    echo html_print_table($table_interface, true);
+}
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index b311885acb..c387a437d7 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -134,7 +134,12 @@ $sort = get_parameter('sort', 'up');
 
 echo "<h4 style='padding-top:0px !important;'>";
 
-echo ui_print_help_tip(__('To see the list of modules paginated, enable this option in the Styles Configuration.'), true).__('Full list of monitors').'&nbsp;'.reporting_tiny_stats($agent, true, 'modules');
+echo ui_print_help_tip(
+    __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
+    true
+);
+echo '<span>'.__('Full list of monitors').'</span>';
+echo reporting_tiny_stats($agent, true, 'modules');
 
 $modules_not_init = agents_monitor_notinit($id_agente);
 if (!empty($modules_not_init)) {
@@ -514,4 +519,3 @@ function print_form_filter_monitors(
 
     echo $form_text;
 }
-

From f57915285fd30c26d77ffff3c2adf219c2bc0710 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 27 May 2019 22:36:55 +0200
Subject: [PATCH 19/61] review styles agent view

---
 pandora_console/include/ajax/events.php       |  12 +-
 pandora_console/include/functions_events.php  |   2 +-
 pandora_console/include/functions_html.php    |   7 +-
 .../include/functions_reporting.php           | 106 ++++++++++++------
 pandora_console/include/functions_ui.php      |   4 +-
 pandora_console/include/styles/pandora.css    |   8 ++
 pandora_console/include/styles/progress.css   |   1 +
 .../agentes/estado_generalagente.php          |  12 +-
 .../operation/agentes/estado_monitores.php    |  63 +++++++++--
 9 files changed, 166 insertions(+), 49 deletions(-)

diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index 6ba163c7ed..ef4bc1592b 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -717,9 +717,15 @@ if ($table_events) {
         'event_condition',
         'AND'
     );
-    echo '<div id="div_all_events_24h">';
-        echo '<label><b>'.__('Show all Events 24h').'</b></label>';
-        echo html_print_checkbox('all_events_24h', $all_events_24h, $all_events_24h, true, false, '', true);
+    echo '<div style="display: flex;" id="div_all_events_24h">';
+        echo '<label style="margin-right: 1em;"><b>'.__('Show all Events 24h').'</b></label>';
+        echo html_print_switch(
+            [
+                'name'  => 'all_events_24h',
+                'value' => $all_events_24h,
+                'id'    => 'checkbox-all_events_24h',
+            ]
+        );
     echo '</div>';
     $date_subtract_day = (time() - (24 * 60 * 60));
 
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 52eb525bc1..4d2238f274 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -997,7 +997,7 @@ function events_print_event_table(
         $table->cellpadding = 0;
         $table->cellspacing = 0;
         $table->width = $width;
-        $table->class = 'databox data';
+        $table->class = 'info_table';
         if (!$tactical_view) {
             $table->title = __('Latest events');
         }
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 53ab0bbb75..ca3eb3f971 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2989,6 +2989,7 @@ function html_print_switch($attributes=[])
         'class',
         'name',
         'onclick',
+        'onchange',
     ];
     foreach ($valid_attrs as $va) {
         if (!isset($attributes[$va])) {
@@ -2998,7 +2999,11 @@ function html_print_switch($attributes=[])
         $html_expand .= ' '.$va.'="'.$attributes[$va].'"';
     }
 
-    return "<label class='p-switch'>
+    if (!isset($attributes['style'])) {
+        $attributes['style'] = '';
+    }
+
+    return "<label class='p-switch' style='".$attributes['style']."'>
 			<input type='checkbox' $html_expand>
 			<span class='p-slider'></span>
 		</label>";
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 3c2fb05baf..5c3a13ec6f 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -9500,13 +9500,23 @@ function reporting_get_agent_module_info($id_agent)
 /**
  * Print tiny statistics of the status of one agent, group, etc.
  *
- * @param mixed Array with the counts of the total modules, normal modules, critical modules, warning modules, unknown modules and fired alerts
- * @param bool return or echo flag
+ * @param mixed   $counts_info Array with the counts of the total modules,
+ * normal modules, critical modules, warning modules, unknown modules and
+ * fired alerts.
+ * @param boolean $return      Return or echo flag.
+ * @param string  $type        agent or modules or ??.
+ * @param string  $separator   Sepearator (classic view).
+ * @param boolean $modern      Use modern interfaces or old one.
  *
- * @return string html formatted tiny stats of modules/alerts of an agent
+ * @return string HTML formatted tiny stats of modules/alerts of an agent.
  */
-function reporting_tiny_stats($counts_info, $return=false, $type='agent', $separator=':', $strict_user=false)
-{
+function reporting_tiny_stats(
+    $counts_info,
+    $return=false,
+    $type='agent',
+    $separator=':',
+    $modern=false
+) {
     global $config;
 
     $out = '';
@@ -9623,44 +9633,74 @@ function reporting_tiny_stats($counts_info, $return=false, $type='agent', $separ
         $out .= html_print_div($params, true);
     }
 
-    // If total count is less than 0, is an error. Never show negative numbers
+    // If total count is less than 0, is an error. Never show negative numbers.
     if ($total_count < 0) {
         $total_count = 0;
     }
 
-    $out .= '<div id="bullets_modules">';
-    // $out .='<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 13pt">'.$total_count.$separator.'</span>';
-    if (isset($fired_count) && $fired_count > 0) {
-        $out .= '<div><div class="bullet_modules orange_background"></div>';
-        $out .= '<span class="forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 12pt">'.$fired_count.'</span></div>';
-    }
+    if ($modern === true) {
+        $out .= '<div id="bullets_modules">';
+        // $out .='<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 13pt">'.$total_count.$separator.'</span>';
+        if (isset($fired_count) && $fired_count > 0) {
+            $out .= '<div><div class="bullet_modules orange_background"></div>';
+            $out .= '<span class="forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 12pt">'.$fired_count.'</span></div>';
+        }
 
-    if (isset($critical_count) && $critical_count > 0) {
-        $out .= '<div><div class="bullet_modules red_background"></div>';
-        $out .= '<span class="forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 12pt">'.$critical_count.'</span></div>';
-    }
+        if (isset($critical_count) && $critical_count > 0) {
+            $out .= '<div><div class="bullet_modules red_background"></div>';
+            $out .= '<span class="forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 12pt">'.$critical_count.'</span></div>';
+        }
 
-    if (isset($warning_count) && $warning_count > 0) {
-        $out .= '<div><div class="bullet_modules yellow_background"></div>';
-        $out .= '<span class="forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 12pt">'.$warning_count.'</span></div>';
-    }
+        if (isset($warning_count) && $warning_count > 0) {
+            $out .= '<div><div class="bullet_modules yellow_background"></div>';
+            $out .= '<span class="forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 12pt">'.$warning_count.'</span></div>';
+        }
 
-    if (isset($unknown_count) && $unknown_count > 0) {
-        $out .= '<div><div class="bullet_modules grey_background"></div>';
-        $out .= '<span class="forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 12pt">'.$unknown_count.'</span></div>';
-    }
+        if (isset($unknown_count) && $unknown_count > 0) {
+            $out .= '<div><div class="bullet_modules grey_background"></div>';
+            $out .= '<span class="forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 12pt">'.$unknown_count.'</span></div>';
+        }
 
-    if (isset($not_init_count) && $not_init_count > 0) {
-        $out .= '<div><div class="bullet_modules blue_background"></div>';
-        $out .= '<span class="forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 12pt">'.$not_init_count.'</span></div>';
-    }
+        if (isset($not_init_count) && $not_init_count > 0) {
+            $out .= '<div><div class="bullet_modules blue_background"></div>';
+            $out .= '<span class="forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 12pt">'.$not_init_count.'</span></div>';
+        }
 
-    if (isset($normal_count) && $normal_count > 0) {
-        $out .= '<div><div class="bullet_modules green_background"></div>';
-        $out .= '<span class="forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 12pt">'.$normal_count.'</span></div>';
-    }
+        if (isset($normal_count) && $normal_count > 0) {
+            $out .= '<div><div class="bullet_modules green_background"></div>';
+            $out .= '<span class="forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 12pt">'.$normal_count.'</span></div>';
+        }
 
-    $out .= '</div>';
+        $out .= '</div>';
+    } else {
+        // Classic ones.
+        $out .= '<b>'.'<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 7pt">'.$total_count.'</span>';
+        if (isset($fired_count) && $fired_count > 0) {
+            $out .= ' '.$separator.' <span class="orange forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 7pt">'.$fired_count.'</span>';
+        }
+
+        if (isset($critical_count) && $critical_count > 0) {
+            $out .= ' '.$separator.' <span class="red forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 7pt">'.$critical_count.'</span>';
+        }
+
+        if (isset($warning_count) && $warning_count > 0) {
+            $out .= ' '.$separator.' <span class="yellow forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 7pt">'.$warning_count.'</span>';
+        }
+
+        if (isset($unknown_count) && $unknown_count > 0) {
+            $out .= ' '.$separator.' <span class="grey forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 7pt">'.$unknown_count.'</span>';
+        }
+
+        if (isset($not_init_count) && $not_init_count > 0) {
+            $out .= ' '.$separator.' <span class="blue forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 7pt">'.$not_init_count.'</span>';
+        }
+
+        if (isset($normal_count) && $normal_count > 0) {
+            $out .= ' '.$separator.' <span class="green forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 7pt">'.$normal_count.'</span>';
+        }
+
+        $out .= '</b>';
+    }
 
     if ($return) {
         return $out;
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index fb1c60bdd1..153f314647 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2473,7 +2473,7 @@ function ui_print_status_image($type, $title='', $return=false, $options=false,
 function ui_progress(
     $progress,
     $width='100%',
-    $height='2em',
+    $height='2.5em',
     $color='#80ba27',
     $return=true
 ) {
@@ -2490,7 +2490,7 @@ function ui_progress(
     }
 
     ui_require_css_file('progress');
-    $output .= '<div class="progress_main">';
+    $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.';">';
     $output .= '<span class="progress_text">'.$progress.'%</span>';
     $output .= '<div class="progress" style="width: '.$progress.'%;"></div>';
     $output .= '</div>';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index f132c0db94..4a6bd33de0 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -6001,6 +6001,10 @@ div#bullets_modules div {
   min-width: 500px;
 }
 
+.agent_details_col.agent_details_col_left {
+  width: 50%;
+}
+
 .agent_details_content .agent_details_bullets {
   position: relative;
   left: -20%;
@@ -6012,6 +6016,10 @@ div#bullets_modules div {
   min-width: 670px;
 }
 
+.agent_details_col.agent_details_col_right {
+  width: 50%;
+}
+
 .buttons_agent_view {
   display: flex;
   justify-content: flex-end;
diff --git a/pandora_console/include/styles/progress.css b/pandora_console/include/styles/progress.css
index 0919269d37..14cf494e85 100644
--- a/pandora_console/include/styles/progress.css
+++ b/pandora_console/include/styles/progress.css
@@ -2,6 +2,7 @@ span.progress_text {
   position: absolute;
   font-family: "lato-bolder", "Open Sans", sans-serif;
   font-size: 2em;
+  margin-left: -0.5em;
 }
 
 div.progress_main {
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index c578259e60..fabd3898a9 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -213,7 +213,15 @@ $table_agent_description .= '<span style="vertical-align:top; display: inline-bl
 $table_agent_description .= empty($agent['comentarios']) ? '<em>'.__('N/A').'</em>' : $agent['comentarios'];
 $table_agent_description .= '</span></p>';
 
-$table_agent_count_modules = reporting_tiny_stats($agent, true);
+$table_agent_count_modules = reporting_tiny_stats(
+    $agent,
+    true,
+    'agent',
+    // Useless.
+    ':',
+    true
+);
+
 // $table_agent_count_modules .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not  shown in real time.'), true);
 $table_agent = '<div class="agent_details_header">'.$table_agent_header.'</div>
                 <div class="agent_details_content">
@@ -280,7 +288,7 @@ $table_contact->data[] = $data;
 
 $data = [];
 $table_contact->colspan[3][0] = 2;
-$data[0] = ui_progress($progress);
+$data[0] = ui_progress($progress, '80%');
 
 if ($progress > 100) {
     $data[0] .= clippy_context_help('agent_out_of_limits');
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index c387a437d7..80e3b33da6 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -139,7 +139,13 @@ echo ui_print_help_tip(
     true
 );
 echo '<span>'.__('Full list of monitors').'</span>';
-echo reporting_tiny_stats($agent, true, 'modules');
+echo reporting_tiny_stats(
+    $agent,
+    true,
+    'modules',
+    ':',
+    true
+);
 
 $modules_not_init = agents_monitor_notinit($id_agente);
 if (!empty($modules_not_init)) {
@@ -207,6 +213,7 @@ ui_toggle(
             $("#status_module_group").enable();
             $("#status_filter_monitor").enable();
         }
+        filter_modules();
     }
 
     function order_module_list(sort_field_param, sort_rows_param) {
@@ -495,7 +502,17 @@ function print_form_filter_monitors(
 
     $table->data[0][3] = html_print_input_text('status_text_monitor', $status_text_monitor, '', 30, 100, true);
     $table->data[0][4] = __('Module group');
-    $rows = db_get_all_rows_sql("SELECT * FROM tmodule_group where id_mg in (SELECT id_module_group from tagente_modulo where id_agente = $id_agent )  ORDER BY name");
+    $rows = db_get_all_rows_sql(
+        sprintf(
+            'SELECT * 
+         FROM tmodule_group 
+         WHERE id_mg IN (SELECT id_module_group
+                         FROM tagente_modulo 
+                        WHERE id_agente = %d )
+         ORDER BY name',
+            $id_agent
+        )
+    );
 
     $rows_select[-1] = __('All');
     if (!empty($rows)) {
@@ -504,11 +521,43 @@ function print_form_filter_monitors(
         }
     }
 
-    $table->data[0][5] = html_print_select($rows_select, 'status_module_group', $status_module_group, '', '', 0, true);
-    $table->data[0][6] = __('Show in hierachy mode');
-    $table->data[0][6] .= html_print_checkbox('status_hierachy_mode', '', false, true, false, 'onChange=change_module_filter();');
-    $table->data[0][7] = html_print_button(__('Filter'), 'filter', false, 'filter_modules();', 'class="sub search"', true);
-    $table->data[0][8] = '&nbsp;'.html_print_button(__('Reset'), 'filter', false, 'reset_filter_modules();', 'class="sub upd" style="margin-top:0px;"', true);
+    $table->data[0][5] = html_print_select(
+        $rows_select,
+        'status_module_group',
+        $status_module_group,
+        '',
+        '',
+        0,
+        true
+    );
+    $table->data[0][6] = '<div style="display: flex;align-content: center;">';
+    $table->data[0][6] .= __('Show in hierachy mode');
+    $table->data[0][6] .= html_print_switch(
+        [
+            'name'     => 'status_hierachy_mode',
+            'value'    => $all_events_24h,
+            'onchange' => 'change_module_filter()',
+            'id'       => 'checkbox-status_hierachy_mode',
+            'style'    => 'margin-left: 1em;',
+        ]
+    );
+    $table->data[0][6] .= '</div>';
+    $table->data[0][7] = html_print_button(
+        __('Filter'),
+        'filter',
+        false,
+        'filter_modules();',
+        'class="sub search"',
+        true
+    );
+    $table->data[0][8] = '&nbsp;'.html_print_button(
+        __('Reset'),
+        'filter',
+        false,
+        'reset_filter_modules();',
+        'class="sub upd" style="margin-top:0px;"',
+        true
+    );
     $form_text .= html_print_table($table, true);
 
     $filter_hidden = false;

From bdd7cc1317e870b75bc63435b83cdea290c9a661 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 09:48:09 +0200
Subject: [PATCH 20/61] Flex agent view

---
 pandora_console/include/functions_ui.php      | 322 +++++++++++-------
 pandora_console/include/styles/pandora.css    |  30 +-
 pandora_console/include/styles/progress.css   |   1 +
 .../agentes/estado_generalagente.php          |   4 +-
 4 files changed, 222 insertions(+), 135 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 153f314647..30cadf25f2 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1,23 +1,33 @@
 <?php
-
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-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.
-
 /**
- * @package    Include
- * @subpackage UI
+ * Library. User interface functions.
+ *
+ * @category   Library.
+ * @package    Pandora FMS
+ * @subpackage User interface.
+ * @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.
+ * ============================================================================
  */
 
-// Check to avoid error when load this library in error screen situations
+// Begin.
+// Check to avoid error when load this library in error screen situations.
 if (isset($config['homedir'])) {
     include_once $config['homedir'].'/include/functions_agents.php';
     include_once $config['homedir'].'/include/functions_modules.php';
@@ -28,6 +38,14 @@ if (isset($config['homedir'])) {
 }
 
 
+/**
+ * Transform bbcode to HTML.
+ *
+ * @param string $text         Text.
+ * @param array  $allowed_tags Allowed_tags.
+ *
+ * @return string HTML.
+ */
 function ui_bbcode_to_html($text, $allowed_tags=['[url]'])
 {
     $return = $text;
@@ -129,7 +147,7 @@ function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInA
             'UTF-8'
         );
 
-        // Recover the html entities to avoid XSS attacks
+        // Recover the html entities to avoid XSS attacks.
         $truncateText = ($text_has_entities) ? io_safe_input($truncateText).$suffix.io_safe_input($truncateText2) : $truncateText.$suffix.$truncateText2;
 
         if ($showTextInTitle) {
@@ -170,6 +188,8 @@ function ui_print_truncate_text($text, $numChars=GENERIC_SIZE_TEXT, $showTextInA
  *
  * @param string  $string String to be display with a smaller font.
  * @param boolean $return Flag to return as string or not.
+ *
+ * @return string HTML.
  */
 function printSmallFont($string, $return=true)
 {
@@ -199,12 +219,13 @@ function printSmallFont($string, $return=true)
 /**
  * Prints a generic message between tags.
  *
- * @param mixed The string message or array ('title', 'message', 'icon', 'no_close', 'force_style')  to be displayed
- * @param string the class to user
- * @param string Any other attributes to be set for the tag.
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $message    The string message or array [
+ *      'title', 'message', 'icon', 'no_close', 'force_style'] to be displayed.
+ * @param string  $class      The class to be used.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *      than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -285,7 +306,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
 
     $id = 'info_box_'.uniqid();
 
-    // Use the no_meta parameter because this image is only in the base console
+    // Use the no_meta parameter because this image is only in the base console.
     $output = '<table cellspacing="0" cellpadding="0" id="'.$id.'" '.$attributes.'
 		class="info_box '.$id.' '.$class.' textodialogo" style="'.$force_style.'">
 		<tr>
@@ -293,7 +314,8 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
 			<td class="title" style="text-transform: uppercase; padding-top: 10px;"><b>'.$text_title.'</b></td>
 			<td class="icon" style="text-align: right; padding-right: 3px;">';
     if (!$no_close_bool) {
-        // Use the no_meta parameter because this image is only in the base console
+        // Use the no_meta parameter because this image is only in
+        // the base console.
         $output .= '<a href="javascript: close_info_box(\''.$id.'\')">'.html_print_image('images/blade.png', true, false, false, false, true).'</a>';
     }
 
@@ -330,11 +352,12 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
 /**
  * Prints an error message.
  *
- * @param mixed The string error message or array ('title', 'message', 'icon', 'no_close') to be displayed
- * @param string Any other attributes to be set for the tag.
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $message    The string error message or array
+ *         ('title', 'message', 'icon', 'no_close') to be displayed.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *         than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -347,11 +370,12 @@ function ui_print_error_message($message, $attributes='', $return=false, $tag='h
 /**
  * Prints an operation success message.
  *
- * @param mixed The string message or array ('title', 'message', 'icon', 'no_close') to be displayed
- * @param string Any other attributes to be set for the tag.
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $message    The string message or array
+ *         ('title', 'message', 'icon', 'no_close') to be displayed.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *         than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -364,11 +388,12 @@ function ui_print_success_message($message, $attributes='', $return=false, $tag=
 /**
  * Prints an operation info message.
  *
- * @param mixed The string message or array ('title', 'message', 'icon', 'no_close') to be displayed
- * @param string Any other attributes to be set for the tag.
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $message    The string message or array
+ *         ('title', 'message', 'icon', 'no_close') to be displayed.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *         than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -378,6 +403,18 @@ function ui_print_info_message($message, $attributes='', $return=false, $tag='h3
 }
 
 
+/**
+ * Prints an operation info message - empty data.
+ *
+ * @param mixed   $message    The string message or array
+ *         ('title', 'message', 'icon', 'no_close') to be displayed.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *         than h3 like div or h2).
+ *
+ * @return string HTML code if return parameter is true.
+ */
 function ui_print_empty_data($message, $attributes='', $return=false, $tag='h3')
 {
     return ui_print_message($message, 'info', $attributes, $return, $tag);
@@ -387,14 +424,16 @@ function ui_print_empty_data($message, $attributes='', $return=false, $tag='h3')
 /**
  * Evaluates a result using empty() and then prints an error or success message
  *
- * @param mixed The results to evaluate. 0, NULL, false, '' or
- * array() is bad, the rest is good
- * @param mixed The string or array ('title', 'message') to be displayed if the result was good
- * @param mixed The string or array ('title', 'message') to be displayed if the result was bad
- * @param string Any other attributes to be set for the h3
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $result     The results to evaluate. 0, NULL, false, '' or
+ *                            array() is bad, the rest is good.
+ * @param mixed   $good       The string or array ('title', 'message') to be
+ *                            displayed if the result was good.
+ * @param mixed   $bad        The string or array ('title', 'message') to be
+ *                            displayed if the result was bad.
+ * @param string  $attributes Any other attributes to be set for the h3.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *                            than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -419,11 +458,12 @@ function ui_print_result_message($result, $good='', $bad='', $attributes='', $re
 /**
  * Prints an warning message.
  *
- * @param mixed The string warning message or array ('title', 'message', 'icon', 'no_close') to be displayed
- * @param string Any other attributes to be set for the tag.
- * @param bool Whether to output the string or return it
- * @param string What tag to use (you could specify something else than
- * h3 like div or h2)
+ * @param mixed   $message    The string message or array
+ *         ('title', 'message', 'icon', 'no_close') to be displayed.
+ * @param string  $attributes Any other attributes to be set for the tag.
+ * @param boolean $return     Whether to output the string or return it.
+ * @param string  $tag        What tag to use (you could specify something else
+ *         than h3 like div or h2).
  *
  * @return string HTML code if return parameter is true.
  */
@@ -438,13 +478,13 @@ function ui_print_warning_message($message, $attributes='', $return=false, $tag=
  * with as title the correctly formatted full timestamp and a time comparation
  * in the tag
  *
- * @param int Any type of timestamp really, but we prefer unixtime
- * @param bool Whether to output the string or return it
- * @param array An array with different options for this function
- *    Key html_attr: which html attributes to add (defaults to none)
- *    Key tag: Which html tag to use (defaults to span)
- *    Key prominent: Overrides user preference and display "comparation" or "timestamp"
- *    key units: The type of units.
+ * @param integer $unixtime Any type of timestamp really, but we prefer unixtime.
+ * @param boolean $return   Whether to output the string or return it.
+ * @param array   $option   An array with different options for this function
+ *        Key html_attr: which html attributes to add (defaults to none)
+ *        Key tag: Which html tag to use (defaults to span)
+ *        Key prominent: Overrides user preference and display "comparation" or "timestamp"
+ *        key units: The type of units.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -452,7 +492,8 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
 {
     global $config;
 
-    // TODO: Add/use a javascript timer for the seconds so it automatically updates as time passes by
+    // TODO: Add/use a javascript timer for the seconds so it automatically
+    // updates as time passes by.
     if (isset($option['html_attr'])) {
         $attributes = $option['html_attr'];
     } else {
@@ -481,7 +522,7 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
         $unixtime = time_w_fixed_tz($unixtime);
     }
 
-    // prominent_time is either timestamp or comparation
+    // Prominent_time is either timestamp or comparation.
     if ($unixtime <= 0) {
         $title = __('Unknown').'/'.__('Never');
         $data = __('Unknown');
@@ -507,13 +548,13 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
     switch ($tag) {
         default:
             // Usually tags have title attributes, so by default we add,
-            // then fall through to add attributes and data
+            // then fall through to add attributes and data.
             $output .= ' title="'.$title.'" '.$style.'>'.$data.'</'.$tag.'>';
         break;
         case 'h1':
         case 'h2':
         case 'h3':
-            // Above tags don't have title attributes
+            // Above tags don't have title attributes.
             $output .= ' '.$attributes.' '.$style.'>'.$data.'</'.$tag.'>';
         break;
     }
@@ -529,8 +570,8 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
 /**
  * Prints a username with real name, link to the user_edit page etc.
  *
- * @param string The username to render
- * @param bool Whether to return or print
+ * @param string  $username The username to render.
+ * @param boolean $return   Whether to return or print.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -546,6 +587,13 @@ function ui_print_username($username, $return=false)
 }
 
 
+/**
+ * Show a notification.
+ *
+ * @param boolean $return Return or direct echo.
+ *
+ * @return string HTML.
+ */
 function ui_print_tags_warning($return=false)
 {
     $msg = '<div id="notify_conf" class="notify">';
@@ -563,11 +611,14 @@ function ui_print_tags_warning($return=false)
 /**
  * Print group icon within a link
  *
- * @param int Group id
- * @param bool Whether to return or print
- * @param string What path to use (relative to images/). Defaults to groups_small
- * @param string Style for group image
- * @param bool Whether the group have link or not
+ * @param integer $id_group         Group id.
+ * @param boolean $return           Whether to return or print.
+ * @param string  $path             What path to use (relative to images/).
+ *                                  Defaults to groups_small.
+ * @param string  $style            Style for group image.
+ * @param boolean $link             Whether the group have link or not.
+ * @param boolean $force_show_image Force show image.
+ * @param boolean $show_as_image    Show as image.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -583,7 +634,7 @@ function ui_print_group_icon($id_group, $return=false, $path='groups_small', $st
 
     $output = '';
 
-    // Don't show link in metaconsole
+    // Don't show link in metaconsole.
     if (defined('METACONSOLE')) {
         $link = false;
     }
@@ -630,9 +681,12 @@ function ui_print_group_icon($id_group, $return=false, $path='groups_small', $st
 /**
  * Print group icon within a link. Other version.
  *
- * @param int Group id
- * @param bool Whether to return or print
- * @param string What path to use (relative to images/). Defaults to groups_small
+ * @param integer $id_group Group id.
+ * @param boolean $return   Whether to return or print.
+ * @param string  $path     What path to use (relative to images/).
+ *                          Defaults to groups_small.
+ * @param string  $style    Extra styles.
+ * @param boolean $link     Add anchor.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -674,10 +728,15 @@ function ui_print_group_icon_path($id_group, $return=false, $path='images/groups
 /**
  * Get the icon of an operating system.
  *
- * @param int Operating system id
- * @param bool Whether to also append the name of the OS after the icon
- * @param bool Whether to return or echo the result
- * @param bool Whether to apply skin or not
+ * @param integer $id_os      Operating system id.
+ * @param boolean $name       Whether to also append the name of OS after icon.
+ * @param boolean $return     Whether to return or echo the result.
+ * @param boolean $apply_skin Whether to apply skin or not.
+ * @param boolean $networkmap Networkmap.
+ * @param boolean $only_src   Only_src.
+ * @param boolean $relative   Relative.
+ * @param boolean $options    Options.
+ * @param boolean $big_icons  Big_icons.
  *
  * @return string HTML with icon of the OS
  */
@@ -744,6 +803,18 @@ function ui_print_os_icon(
 }
 
 
+/**
+ * Print type agent icon.
+ *
+ * @param boolean $id_os          Id_os.
+ * @param boolean $remote_contact Remote_contact.
+ * @param boolean $contact        Contact.
+ * @param boolean $return         Return.
+ * @param integer $remote         Remote.
+ * @param string  $version        Version.
+ *
+ * @return string HTML.
+ */
 function ui_print_type_agent_icon(
     $id_os=false,
     $remote_contact=false,
@@ -753,15 +824,15 @@ function ui_print_type_agent_icon(
     $version=''
 ) {
     if ($id_os == 19) {
-        // Satellite
+        // Satellite.
         $options['title'] = __('Satellite');
         $output = html_print_image('images/op_satellite.png', true, $options, false, false, false, true);
     } else if ($remote_contact == $contact && $remote == 0 && $version == '') {
-        // Network
+        // Network.
         $options['title'] = __('Network');
         $output = html_print_image('images/network.png', true, $options, false, false, false, true);
     } else {
-        // Software
+        // Software.
         $options['title'] = __('Software');
         $output = html_print_image('images/data.png', true, $options, false, false, false, true);
     }
@@ -773,20 +844,31 @@ function ui_print_type_agent_icon(
 /**
  * Prints an agent name with the correct link
  *
- * @param int Agent id
- * @param bool Whether to return the string or echo it too
- * @param int Now uses styles to accomplish this
- * @param string Style of name in css.
- * @param string server url to concatenate at the begin of the link
- * @param string extra parameters to concatenate in the link
- * @param string name of the agent to avoid the query in some cases
- * @param bool if the agent will provided with link or not
- * @param bool use the agent alias or the name
+ * @param integer $id_agent         Agent id.
+ * @param boolean $return           Whether to return the string or echo it too.
+ * @param integer $cutoff           Now uses styles to accomplish this.
+ * @param string  $style            Style of name in css.
+ * @param boolean $cutname          Cut names.
+ * @param string  $server_url       Server url to concatenate at the begin of the link.
+ * @param string  $extra_params     Extra parameters to concatenate in the link.
+ * @param string  $known_agent_name Name of the agent to avoid the query in some cases.
+ * @param boolean $link             If the agent will provided with link or not.
+ * @param boolean $alias            Use the agent alias or the name.
  *
  * @return string HTML with agent name and link
  */
-function ui_print_agent_name($id_agent, $return=false, $cutoff='agent_medium', $style='', $cutname=false, $server_url='', $extra_params='', $known_agent_name=false, $link=true, $alias=true)
-{
+function ui_print_agent_name(
+    $id_agent,
+    $return=false,
+    $cutoff='agent_medium',
+    $style='',
+    $cutname=false,
+    $server_url='',
+    $extra_params='',
+    $known_agent_name=false,
+    $link=true,
+    $alias=true
+) {
     if ($known_agent_name === false) {
         if ($alias) {
             $agent_name = (string) agents_get_alias($id_agent);
@@ -808,14 +890,14 @@ function ui_print_agent_name($id_agent, $return=false, $cutoff='agent_medium', $
     }
 
     if ($link) {
-        $url = $server_url.'index.php?sec=estado&amp;'.'sec2=operation/agentes/ver_agente&amp;'.'id_agente='.$id_agent.$extra_params;
+        $url = $server_url.'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agent.$extra_params;
 
-        $output = '<a style="'.$style.'"'.' href="'.$url.'"'.' title="'.$agent_name_full.'"><b><span style="'.$style.'">'.$agent_name.'</span></b></a>';
+        $output = '<a style="'.$style.'" href="'.$url.'" title="'.$agent_name_full.'"><b><span style="'.$style.'">'.$agent_name.'</span></b></a>';
     } else {
         $output = '<b><span style="'.$style.'">'.$agent_name.'</span></b>';
     }
 
-    // TODO: Add a pretty javascript (using jQuery) popup-box with agent details
+    // TODO: Add a pretty javascript (using jQuery) popup-box with agent details.
     if ($return) {
         return $output;
     }
@@ -827,16 +909,19 @@ function ui_print_agent_name($id_agent, $return=false, $cutoff='agent_medium', $
 /**
  * Formats a row from the alert table and returns an array usable in the table function
  *
- * @param array A valid (non empty) row from the alert table
- * @param bool Whether or not this is a combined alert
- * @param bool Whether to print the agent information with the module information
- * @param string Tab where the function was called from (used for urls)
- * @param mixed Style for agent name or default (false)
+ * @param array   $alert       A valid (non empty) row from the alert table.
+ * @param boolean $agent       Whether or not this is a combined alert.
+ * @param string  $url         Tab where the function was called from (used for urls).
+ * @param mixed   $agent_style Style for agent name or default (false).
  *
  * @return array A formatted array with proper html for use in $table->data (6 columns)
  */
-function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
-{
+function ui_format_alert_row(
+    $alert,
+    $agent=true,
+    $url='',
+    $agent_style=false
+) {
     global $config;
 
     if (!isset($alert['server_data'])) {
@@ -856,7 +941,7 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
     include_once $config['homedir'].'/include/functions_alerts.php';
     $isFunctionPolicies = enterprise_include_once('include/functions_policies.php');
     $id_group = (int) get_parameter('ag_group', 0);
-    // 0 is the All group (selects all groups)
+    // 0 is the All group (selects all groups).
     if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         if ($agent) {
             $index = [
@@ -956,13 +1041,13 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
         $server = db_get_row('tmetaconsole_setup', 'id', $alert['server_data']['id']);
 
         if (metaconsole_connect($server) == NOERR) {
-            // Get agent data from node
+            // Get agent data from node.
             $agente = db_get_row('tagente', 'id_agente', $alert['id_agent']);
 
             metaconsole_restore_db();
         }
     } else {
-        // Get agent id
+        // Get agent id.
         $id_agent = modules_get_agentmodule_agent($alert['id_agent_module']);
         $agente = db_get_row('tagente', 'id_agente', $id_agent);
     }
@@ -972,9 +1057,11 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
 
     $data = [];
 
-    // Validate checkbox
+    // Validate checkbox.
     if (!defined('METACONSOLE')) {
-        if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+        if (check_acl($config['id_user'], $id_group, 'LW')
+            || check_acl($config['id_user'], $id_group, 'LM')
+        ) {
             $data[$index['validate']] = '';
 
             $data[$index['validate']] .= html_print_checkbox(
@@ -996,7 +1083,6 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
                 // Restore the default connection.
                 metaconsole_restore_db();
                 $errors++;
-                // break; It does not work in the php7 version remplace for:
                 return false;
             }
         }
@@ -1018,14 +1104,14 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
         }
     }
 
-    // Standby
+    // Standby.
     $data[$index['standby']] = '';
     if (isset($alert['standby']) && $alert['standby'] == 1) {
         $data[$index['standby']] = html_print_image('images/bell_pause.png', true, ['title' => __('Standby on')]);
     }
 
     if (!defined('METACONSOLE')) {
-        // Force alert execution
+        // Force alert execution.
         if (check_acl($config['id_user'], $id_group, 'AW') || check_acl($config['id_user'], $id_group, 'LM')) {
             if ($alert['force_execution'] == 0) {
                 $data[$index['force_execution']] = '<a href="'.$url.'&amp;id_alert='.$alert['id'].'&amp;force_execution=1&refr=60">'.html_print_image('images/target.png', true, ['border' => '0', 'title' => __('Force')]).'</a>';
@@ -2464,7 +2550,7 @@ function ui_print_status_image($type, $title='', $return=false, $options=false,
  *
  * @param integer $progress Progress.
  * @param string  $width    Width.
- * @param string  $height   Height.
+ * @param integer $height   Height in 'em'.
  * @param string  $color    Color.
  * @param boolean $return   Return or paint (if false).
  *
@@ -2473,7 +2559,7 @@ function ui_print_status_image($type, $title='', $return=false, $options=false,
 function ui_progress(
     $progress,
     $width='100%',
-    $height='2.5em',
+    $height='2.5',
     $color='#80ba27',
     $return=true
 ) {
@@ -2490,8 +2576,8 @@ function ui_progress(
     }
 
     ui_require_css_file('progress');
-    $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.';">';
-    $output .= '<span class="progress_text">'.$progress.'%</span>';
+    $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.'em;">';
+    $output .= '<span class="progress_text" style="font-size:'.($height - 0.5).'em;">'.$progress.'%</span>';
     $output .= '<div class="progress" style="width: '.$progress.'%;"></div>';
     $output .= '</div>';
 
@@ -4155,7 +4241,7 @@ function ui_get_error($error_code='')
 function ui_include_time_picker($echo_tags=false)
 {
     if (is_ajax() || $echo_tags) {
-        echo '<script type="text/javascript" src="'.ui_get_full_url(false, false, false, false).'include/javascript/jquery.ui-timepicker-addon.js'.'"></script>';
+        echo '<script type="text/javascript" src="'.ui_get_full_url(false, false, false, false).'include/javascript/jquery.ui-timepicker-addon.js"></script>';
     } else {
         ui_require_jquery_file('ui-timepicker-addon');
     }
@@ -4251,8 +4337,8 @@ function ui_print_module_string_value(
 
                 $title_dialog = modules_get_agentmodule_agent_alias($id_agente_module).' / '.$module_name;
                 $salida = '<div '."id='hidden_value_module_".$id_agente_module."'
-					style='display: none; width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left' title='".$title_dialog."'>".$value.'</div>'.'<span '."id='value_module_".$id_agente_module."'
-					style='white-space: nowrap;'>".'<span id="value_module_text_'.$id_agente_module.'">'.$sub_string.'</span> '."<a href='javascript: toggle_full_value(".$id_agente_module.")'>".html_print_image('images/zoom.png', true).'</a>'.'</span>';
+					style='display: none; width: 100%; height: 100%; overflow: auto; padding: 10px; font-size: 14px; line-height: 16px; font-family: mono,monospace; text-align: left' title='".$title_dialog."'>".$value.'</div><span '."id='value_module_".$id_agente_module."'
+					style='white-space: nowrap;'>".'<span id="value_module_text_'.$id_agente_module.'">'.$sub_string.'</span> '."<a href='javascript: toggle_full_value(".$id_agente_module.")'>".html_print_image('images/zoom.png', true).'</a></span>';
             }
         }
     }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4a6bd33de0..c3758e49ac 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5987,6 +5987,9 @@ div#bullets_modules div {
   display: flex;
   margin-bottom: 20px;
   width: 100%;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
 }
 
 .agent_details_col {
@@ -5994,15 +5997,22 @@ div#bullets_modules div {
   background-color: #fff;
   border: 1px solid #e2e2e2;
   border-radius: 5px;
+  flex: 0 1 auto;
+  margin: 5px auto;
 }
 
 .agent_details_col_left {
-  width: 40%;
-  min-width: 500px;
+  width: 49.5%;
+  min-width: 455px;
 }
-
-.agent_details_col.agent_details_col_left {
-  width: 50%;
+.agent_details_col_right {
+  width: 49.5%;
+  min-width: 455px;
+}
+@media screen and (max-width: 1200px) {
+  .agent_details_col {
+    flex: 1 1 auto;
+  }
 }
 
 .agent_details_content .agent_details_bullets {
@@ -6010,16 +6020,6 @@ div#bullets_modules div {
   left: -20%;
 }
 
-.agent_details_col_right {
-  width: 62%;
-  margin-left: 20px;
-  min-width: 670px;
-}
-
-.agent_details_col.agent_details_col_right {
-  width: 50%;
-}
-
 .buttons_agent_view {
   display: flex;
   justify-content: flex-end;
diff --git a/pandora_console/include/styles/progress.css b/pandora_console/include/styles/progress.css
index 14cf494e85..84c3224f27 100644
--- a/pandora_console/include/styles/progress.css
+++ b/pandora_console/include/styles/progress.css
@@ -6,6 +6,7 @@ span.progress_text {
 }
 
 div.progress_main {
+  display: inline-block;
   text-align: center;
   height: 2.5em;
   border: 1px solid #80ba27;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index fabd3898a9..325f0c654e 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Extension to schedule tasks on Pandora FMS Console
+ * Agent status - general overview.
  *
  * @category   Agent view status.
  * @package    Pandora FMS
@@ -409,7 +409,7 @@ if (!empty($addresses)) {
     // $data_opcional = [];
     $data_opcional[] = '<b>'.__('Other IP addresses').'</b>';
     if (!empty($addresses)) {
-        $data_opcional[] = '<div style="max-height: 30px; overflow-y: scroll; height:30px;">'.implode('<br>', $addresses).'</div>';
+        $data_opcional[] = '<div style="overflow-y: scroll;">'.implode('<br>', $addresses).'</div>';
     }
 
      array_push($data_opcional);

From 2cd19aa0cb687c486c17502dfc8f785e91fe492a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 10:47:31 +0200
Subject: [PATCH 21/61] updates styles

---
 pandora_console/include/functions_ui.php      | 1154 ++++++++++-------
 pandora_console/include/styles/pandora.css    |   36 +-
 .../agentes/estado_generalagente.php          |    5 +-
 .../operation/agentes/estado_monitores.php    |   52 +-
 4 files changed, 707 insertions(+), 540 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 30cadf25f2..2dc602b603 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1181,7 +1181,12 @@ function ui_format_alert_row(
         $actionText .= '</ul></div>';
     } else {
         if ($actionDefault != '') {
-            $actionText = db_get_sql("SELECT name FROM talert_actions WHERE id = $actionDefault").' <i>('.__('Default').')</i>';
+            $actionText = db_get_sql(
+                sprintf(
+                    'SELECT name FROM talert_actions WHERE id = %d',
+                    $actionDefault
+                )
+            ).' <i>('.__('Default').')</i>';
         }
     }
 
@@ -1212,12 +1217,12 @@ function ui_format_alert_row(
 /**
  * Prints a substracted string, length specified by cutoff, the full string will be in a rollover.
  *
- * @param string The string to be cut
- * @param int At how much characters to cut
- * @param bool Whether to return or print it out
- * @param int Size font (fixed) in px, applyed as CSS style (optional)
+ * @param string  $string   The string to be cut..
+ * @param integer $cutoff   At how much characters to cut.
+ * @param boolean $return   Whether to return or print it out.
+ * @param integer $fontsize Size font (fixed) in px, applyed as CSS style (optional).
  *
- * @return An HTML string
+ * @return string HTML string.
  */
 function ui_print_string_substr($string, $cutoff=16, $return=false, $fontsize=0)
 {
@@ -1238,7 +1243,8 @@ function ui_print_string_substr($string, $cutoff=16, $return=false, $fontsize=0)
         $font_size_mod = "style='font-size: ".$fontsize."pt'";
     }
 
-    $string = '<span '.$font_size_mod.' title="'.io_safe_input($string2).'">'.mb_substr($string2, 0, $cutoff, 'UTF-8').$string3.'</span>';
+    $string = '<span '.$font_size_mod.' title="'.io_safe_input($string2).'">';
+    $string .= mb_substr($string2, 0, $cutoff, 'UTF-8').$string3.'</span>';
 
     if ($return === false) {
         echo $string;
@@ -1252,9 +1258,9 @@ function ui_print_string_substr($string, $cutoff=16, $return=false, $fontsize=0)
  * Gets a helper text explaining the requirement needs for an alert template
  * to get it fired.
  *
- * @param int Alert template id.
- * @param bool Wheter to return or print it out.
- * @param bool Wheter to put the values in the string or not.
+ * @param integer $id_alert_template Alert template id.
+ * @param boolean $return            Wheter to return or print it out.
+ * @param boolean $print_values      Wheter to put the values in the string or not.
  *
  * @return An HTML string if return was true.
  */
@@ -1268,21 +1274,21 @@ function ui_print_alert_template_example($id_alert_template, $return=false, $pri
 
     switch ($template['type']) {
         case 'equal':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the value is <span id="value"></span>');
         break;
 
         case 'not_equal':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the value is not <span id="value"></span>');
         break;
 
         case 'regex':
             if ($template['matches_value']) {
-                // Do not translate the HTML attributes
+                // Do not translate the HTML attributes.
                 $output .= __('The alert would fire when the value matches <span id="value"></span>');
             } else {
-                // end if
+                // End if.
                 $output .= __('The alert would fire when the value doesn\'t match <span id="value"></span>');
             }
 
@@ -1291,42 +1297,46 @@ function ui_print_alert_template_example($id_alert_template, $return=false, $pri
 
         case 'max_min':
             if ($template['matches_value']) {
-                // Do not translate the HTML attributes
+                // Do not translate the HTML attributes.
                 $output .= __('The alert would fire when the value is between <span id="min"></span> and <span id="max"></span>');
             } else {
-                // end if
+                // End if.
                 $output .= __('The alert would fire when the value is not between <span id="min"></span> and <span id="max"></span>');
             }
         break;
 
         case 'max':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the value is over <span id="max"></span>');
-
         break;
 
         case 'min':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the value is under <span id="min"></span>');
-
         break;
 
         case 'warning':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the module is in warning status');
-
         break;
 
         case 'critical':
-            // Do not translate the HTML attributes
+            // Do not translate the HTML attributes.
             $output .= __('The alert would fire when the module is in critical status');
         break;
+
+        default:
+            // Do nothing.
+            $output .= __('Unknown option.');
+        break;
     }
 
     if ($print_values) {
         /*
-            Replace span elements with real values. This is done in such way to avoid
-         duplicating strings and make it easily modificable via Javascript. */
+         *   Replace span elements with real values. This is done in such way to avoid
+         * duplicating strings and make it easily modificable via Javascript.
+         */
+
         $output = str_replace('<span id="value"></span>', $template['value'], $output);
         $output = str_replace('<span id="max"></span>', $template['max_value'], $output);
         $output = str_replace('<span id="min"></span>', $template['min_value'], $output);
@@ -1344,16 +1354,23 @@ function ui_print_alert_template_example($id_alert_template, $return=false, $pri
 /**
  * Prints a help tip icon.
  *
- * @param string Id of the help article
- * @param bool Whether to return or output the result
- * @param string Home url if its necessary
- * @param string Image path
- * @param bool Route is relative or not
+ * @param string  $help_id     Id of the help article.
+ * @param boolean $return      Whether to return or output the result.
+ * @param string  $home_url    Home url if its necessary.
+ * @param string  $image       Image path.
+ * @param boolean $is_relative Route is relative or not.
+ * @param string  $id          Target id.
  *
  * @return string The help tip
  */
-function ui_print_help_icon($help_id, $return=false, $home_url='', $image='images/help_green.png', $is_relative=false, $id='')
-{
+function ui_print_help_icon(
+    $help_id,
+    $return=false,
+    $home_url='',
+    $image='images/help_green.png',
+    $is_relative=false,
+    $id=''
+) {
     global $config;
 
     // Do not display the help icon if help is disabled.
@@ -1398,12 +1415,13 @@ function ui_print_help_icon($help_id, $return=false, $home_url='', $image='image
  * file name should be like "name.css". The "name" would be the value
  * needed to pass to this function.
  *
- * @param string Script name to add without the "jquery." prefix and the ".js"
+ * @param string $name Script name to add without the "jquery." prefix and the ".js"
  * suffix. Example:
  * <code>
  * ui_require_css_file ('pandora');
  * // Would include include/styles/pandora.js
- * </code>
+ * </code>.
+ * @param string $path Path where script is placed.
  *
  * @return boolean True if the file was added. False if the file doesn't exist.
  */
@@ -1440,13 +1458,14 @@ function ui_require_css_file($name, $path='include/styles/')
  * file name should be like "name.js". The "name" would be the value
  * needed to pass to this function.
  *
- * @param string Script name to add without the "jquery." prefix and the ".js"
- * suffix. Example:
- * <code>
- * ui_require_javascript_file ('pandora');
- * // Would include include/javascript/pandora.js
- * </code>
- * @param bool Just echo the script tag of the file.
+ * @param string  $name     Script name to add without the "jquery." prefix and the ".js"
+ *      suffix. Example:
+ *      <code>
+ *      ui_require_javascript_file ('pandora');
+ *      // Would include include/javascript/pandora.js
+ *      </code>.
+ * @param string  $path     Path where script is placed.
+ * @param boolean $echo_tag Just echo the script tag of the file.
  *
  * @return boolean True if the file was added. False if the file doesn't exist.
  */
@@ -1458,7 +1477,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
 
     if ($echo_tag) {
         echo '<script type="text/javascript" src="'.ui_get_full_url(false, false, false, false).$filename.'"></script>';
-        return;
+        return null;
     }
 
     if (! isset($config['js'])) {
@@ -1469,7 +1488,7 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
         return true;
     }
 
-    // We checks two paths because it may fails on enterprise
+    // We checks two paths because it may fails on enterprise.
     if (! file_exists($filename) && ! file_exists($config['homedir'].'/'.$filename)) {
         return false;
     }
@@ -1491,12 +1510,14 @@ function ui_require_javascript_file($name, $path='include/javascript/', $echo_ta
  * file name should be like "name.js". The "name" would be the value
  * needed to pass to this function.
  *
- * @param string Script name to add without the "jquery." prefix and the ".js"
- * suffix. Example:
- * <code>
- * ui_require_javascript_file ('pandora');
- * // Would include include/javascript/pandora.js
- * </code>
+ * @param string  $name                 Script name to add without the "jquery."
+ *                                      prefix and the ".js"
+ *                  suffix. Example:
+ *                  <code>
+ *                  ui_require_javascript_file ('pandora');
+ *                  // Would include include/javascript/pandora.js
+ *                  </code>.
+ * @param boolean $disabled_metaconsole Disabled metaconsole.
  *
  * @return boolean True if the file was added. False if the file doesn't exist.
  */
@@ -1519,7 +1540,7 @@ function ui_require_javascript_file_enterprise($name, $disabled_metaconsole=fals
         return true;
     }
 
-    // We checks two paths because it may fails on enterprise
+    // We checks two paths because it may fails on enterprise.
     if (!file_exists($filename)
         && !file_exists($config['homedir'].'/'.$filename)
     ) {
@@ -1540,13 +1561,14 @@ function ui_require_javascript_file_enterprise($name, $disabled_metaconsole=fals
  * needed to pass to this function. Notice that this function does not manage
  * jQuery denpendencies.
  *
- * @param string Script name to add without the "jquery." prefix and the ".js"
- * suffix. Example:
- * <code>
- * ui_require_jquery_file ('form');
- * // Would include include/javascript/jquery.form.js
- * </code>
- * @param bool Just echo the script tag of the file.
+ * @param string  $name     Script name to add without the "jquery." prefix and the ".js"
+ *      suffix. Example:
+ *      <code>
+ *      ui_require_jquery_file ('form');
+ *      // Would include include/javascript/jquery.form.js
+ *      </code>.
+ * @param string  $path     Path where script is placed.
+ * @param boolean $echo_tag Just echo the script tag of the file.
  *
  * @return boolean True if the file was added. False if the file doesn't exist.
  */
@@ -1558,7 +1580,7 @@ function ui_require_jquery_file($name, $path='include/javascript/', $echo_tag=fa
 
     if ($echo_tag) {
         echo '<script type="text/javascript" src="'.ui_get_full_url(false, false, false, false).$filename.'"></script>';
-        return;
+        return null;
     }
 
     if (! isset($config['jquery'])) {
@@ -1569,8 +1591,10 @@ function ui_require_jquery_file($name, $path='include/javascript/', $echo_tag=fa
         return true;
     }
 
-    // We checks two paths because it may fails on enterprise
-    if (! file_exists($filename) && ! file_exists($config['homedir'].'/'.$filename)) {
+    // We checks two paths because it may fails on enterprise.
+    if (! file_exists($filename)
+        && ! file_exists($config['homedir'].'/'.$filename)
+    ) {
         return false;
     }
 
@@ -1589,8 +1613,8 @@ function ui_require_jquery_file($name, $path='include/javascript/', $echo_tag=fa
  * To add css just put them in include/styles and then add them to the
  * $config['css'] array
  *
- * @param string Callback will fill this with the current buffer.
- * @param bitfield Callback will fill this with a bitfield (see ob_start)
+ * @param string $string   Callback will fill this with the current buffer.
+ * @param mixed  $bitfield Callback will fill this with a bitfield (see ob_start).
  *
  * @return string String to return to the browser
  */
@@ -1600,7 +1624,7 @@ function ui_process_page_head($string, $bitfield)
     global $vc_public_view;
 
     if (isset($config['ignore_callback']) && $config['ignore_callback'] == true) {
-        return;
+        return '';
     }
 
     $output = '';
@@ -1610,7 +1634,7 @@ function ui_process_page_head($string, $bitfield)
         $config_refr = $config['refr'];
     }
 
-    // If user is logged or displayed view is the public view of visual console
+    // If user is logged or displayed view is the public view of visual console.
     if ($config_refr > 0
         && (isset($config['id_user']) || $vc_public_view == 1)
     ) {
@@ -1623,8 +1647,13 @@ function ui_process_page_head($string, $bitfield)
             || $_GET['sec2'] == 'enterprise/dashboard/main_dashboard'
         ) {
             $query = ui_get_url_refresh(false, false);
-            // $output .= '<meta http-equiv="refresh" content="' .
-                // $config_refr . '; URL=' . $query . '" />';
+
+            /*
+             * $output .= '<meta http-equiv="refresh" content="' .
+             * $config_refr . '; URL=' . $query . '" />';
+             */
+
+            // End.
         }
     }
 
@@ -1644,7 +1673,8 @@ function ui_process_page_head($string, $bitfield)
 		<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
 
     if ($config['language'] != 'en') {
-        // Load translated strings - load them last so they overload all the objects
+        // Load translated strings - load them last so they overload all
+        // the objects.
         ui_require_javascript_file('time_'.$config['language']);
         ui_require_javascript_file('date'.$config['language']);
         ui_require_javascript_file('countdown_'.$config['language']);
@@ -1652,27 +1682,32 @@ function ui_process_page_head($string, $bitfield)
 
     $output .= "\n\t";
 
-    //
-    // Load CSS
-    //
+    /*
+     * Load CSS
+     */
+
     if (empty($config['css'])) {
         $config['css'] = [];
     }
 
     $login_ok = true;
     if (! isset($config['id_user']) && isset($_GET['login'])) {
-        if (isset($_POST['nick']) and isset($_POST['pass'])) {
+        if (isset($_POST['nick']) && isset($_POST['pass'])) {
             $nick = get_parameter_post('nick');
-            // This is the variable with the login
+            // This is the variable with the login.
             $pass = get_parameter_post('pass');
-            // This is the variable with the password
+            // This is the variable with the password.
             $nick = db_escape_string_sql($nick);
             $pass = db_escape_string_sql($pass);
 
-            // process_user_login is a virtual function which should be defined in each auth file.
-            // It accepts username and password. The rest should be internal to the auth file.
-            // The auth file can set $config["auth_error"] to an informative error output or reference their internal error messages to it
-            // process_user_login should return false in case of errors or invalid login, the nickname if correct
+            // Process_user_login is a virtual function which should be defined
+            // in each auth file.
+            // It accepts username and password. The rest should be internal to
+            // the auth file.
+            // The auth file can set $config["auth_error"] to an informative
+            // error output or reference their internal error messages to it
+            // process_user_login should return false in case of errors or
+            // invalid login, the nickname if correct.
             $nick_in_db = process_user_login($nick, $pass);
 
             if ($nick_in_db === false) {
@@ -1682,7 +1717,7 @@ function ui_process_page_head($string, $bitfield)
     }
 
     // First, if user has assigned a skin then try to use css files of
-    // skin subdirectory
+    // skin subdirectory.
     $isFunctionSkins = enterprise_include_once('include/functions_skins.php');
     if (!$login_ok) {
         if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
@@ -1691,8 +1726,8 @@ function ui_process_page_head($string, $bitfield)
     }
 
     $exists_css = false;
-    if ($login_ok and $isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
-        // Checks if user's skin is available
+    if ($login_ok && $isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
+        // Checks if user's skin is available.
         $exists_skin = enterprise_hook('skins_is_path_set');
         if ($exists_skin) {
             $skin_path = enterprise_hook('skins_get_skin_path');
@@ -1701,23 +1736,22 @@ function ui_process_page_head($string, $bitfield)
         }
     }
 
-    // Add the jquery UI styles CSS
+    // Add the jquery UI styles CSS.
     $config['css']['jquery-UI'] = 'include/styles/js/jquery-ui.min.css';
-    // Add the dialog styles CSS
+    // Add the dialog styles CSS.
     $config['css']['dialog'] = 'include/styles/dialog.css';
-    // Add the dialog styles CSS
+    // Add the dialog styles CSS.
     $config['css']['dialog'] = 'include/styles/js/introjs.css';
 
-    // If skin's css files exists then add them
+    // If skin's css files exists then add them.
     if ($exists_css) {
         foreach ($skin_styles as $filename => $name) {
             $style = substr($filename, 0, (strlen($filename) - 4));
             $config['css'][$style] = $skin_path.'include/styles/'.$filename;
         }
-    }
-    // Otherwise assign default and user's css
-    else {
-        // User style should go last so it can rewrite common styles
+    } else {
+        // Otherwise assign default and user's css.
+        // User style should go last so it can rewrite common styles.
         $config['css'] = array_merge(
             [
                 'common'         => 'include/styles/common.css',
@@ -1728,7 +1762,7 @@ function ui_process_page_head($string, $bitfield)
         );
     }
 
-    // We can't load empty and we loaded (conditionally) ie
+    // We can't load empty and we loaded (conditionally) ie.
     $loaded = [
         '',
         'ie',
@@ -1745,33 +1779,35 @@ function ui_process_page_head($string, $bitfield)
         $output .= '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'."\n\t";
     }
 
-    //
-    // End load CSS
-    //
-    //
-    // Load JS
-    //
+    /*
+     * End load CSS
+     */
+
+    /*
+     * Load JS
+     */
+
     if (empty($config['js'])) {
         $config['js'] = [];
-        // If it's empty, false or not init set array to empty just in case
+        // If it's empty, false or not init set array to empty just in case.
     }
 
-    // Pandora specific JavaScript should go first
+    // Pandora specific JavaScript should go first.
     $config['js'] = array_merge(['pandora' => 'include/javascript/pandora.js'], $config['js']);
-    // Load base64 javascript library
+    // Load base64 javascript library.
     $config['js']['base64'] = 'include/javascript/encode_decode_base64.js';
-    // Load webchat javascript library
+    // Load webchat javascript library.
     $config['js']['webchat'] = 'include/javascript/webchat.js';
-    // Load qrcode library
+    // Load qrcode library.
     $config['js']['qrcode'] = 'include/javascript/qrcode.js';
-    // Load intro.js library (for bubbles and clippy)
+    // Load intro.js library (for bubbles and clippy).
     $config['js']['intro'] = 'include/javascript/intro.js';
     $config['js']['clippy'] = 'include/javascript/clippy.js';
-    // Load Underscore.js library
+    // Load Underscore.js library.
     $config['js']['underscore'] = 'include/javascript/underscore-min.js';
 
-    // Load other javascript
-    // We can't load empty
+    // Load other javascript.
+    // We can't load empty.
     $loaded = [''];
     foreach ($config['js'] as $name => $filename) {
         if (in_array($name, $loaded)) {
@@ -1784,18 +1820,20 @@ function ui_process_page_head($string, $bitfield)
         $output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t";
     }
 
-    //
-    // End load JS
-    //
-    //
-    // Load jQuery
-    //
+    /*
+     * End load JS
+     */
+
+    /*
+     * Load jQuery
+     */
+
     if (empty($config['jquery'])) {
         $config['jquery'] = [];
-        // If it's empty, false or not init set array to empty just in case
+        // If it's empty, false or not init set array to empty just in case.
     }
 
-    // Pandora specific jquery should go first
+    // Pandora specific jquery should go first.
     $black_list_pages_old_jquery = ['operation/gis_maps/index'];
     if (in_array(get_parameter('sec2'), $black_list_pages_old_jquery)) {
         $config['jquery'] = array_merge(
@@ -1818,15 +1856,15 @@ function ui_process_page_head($string, $bitfield)
         );
     }
 
-    // Include the datapicker language if exists
+    // Include the datapicker language if exists.
     if (file_exists('include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js')) {
         $config['jquery']['datepicker_language'] = 'include/languages/datepicker/jquery.ui.datepicker-'.$config['language'].'.js';
     }
 
-    // Include countdown library
+    // Include countdown library.
     $config['jquery']['countdown'] = 'include/javascript/jquery.countdown.js';
 
-    // Then add each script as necessary
+    // Then add each script as necessary.
     $loaded = [''];
     foreach ($config['jquery'] as $name => $filename) {
         if (in_array($name, $loaded)) {
@@ -1839,9 +1877,10 @@ function ui_process_page_head($string, $bitfield)
         $output .= '<script type="text/javascript" src="'.$url_js.'"></script>'."\n\t";
     }
 
-    //
-    // End load JQuery
-    //
+    /*
+     * End load JQuery
+     */
+
     include_once __DIR__.'/graphs/functions_flot.php';
     $output .= include_javascript_dependencies_flot_graph(true);
 
@@ -1858,8 +1897,8 @@ function ui_process_page_head($string, $bitfield)
 /**
  * Callback function to add stuff to the body
  *
- * @param string Callback will fill this with the current buffer.
- * @param bitfield Callback will fill this with a bitfield (see ob_start)
+ * @param string $string   Callback will fill this with the current buffer.
+ * @param mixed  $bitfield Callback will fill this with a bitfield (see ob_start).
  *
  * @return string String to return to the browser
  */
@@ -1870,11 +1909,11 @@ function ui_process_page_body($string, $bitfield)
     if (isset($config['ignore_callback'])
         && $config['ignore_callback'] == true
     ) {
-        return;
+        return null;
     }
 
-    // Show custom background
-    $output = '<body'.($config['pure'] ? ' class="pure"' : '').'>';
+    // Show custom background.
+    $output = '<body'.(($config['pure']) ? ' class="pure"' : '').'>';
 
     $output .= $string;
 
@@ -1891,12 +1930,15 @@ function ui_process_page_body($string, $bitfield)
  * @param string  $url               URL of the pagination links. It must include all form
  *                values as GET form.
  * @param integer $offset            Current offset for the pagination. Default value would be
- *                taken from $_REQUEST['offset']
+ *                taken from $_REQUEST['offset'].
  * @param integer $pagination        Current pagination size. If a user requests a larger
- *            pagination than config["block_size"]
- * @param boolean $return            Whether to return or print this
+ *            pagination than config["block_size"].
+ * @param boolean $return            Whether to return or print this.
  * @param string  $offset_name       The name of parameter for the offset.
  * @param boolean $print_total_items Show the text with the total items. By default true.
+ * @param mixed   $other_class       Other_class.
+ * @param mixed   $script            Script.
+ * @param mixed   $parameter_script  Parameter_script.
  * @param string  $set_id            Set id of div.
  *
  * @return string The pagination div or nothing if no pagination needs to be done
@@ -1937,10 +1979,12 @@ function ui_pagination(
     }
 
     if (!empty($set_id)) {
-        $set_id = " id = '$set_id'";
+        $set_id = " id = '".$set_id."'";
     }
 
-    // Pagination links for users include delete, create and other params, now not use these params, and not retry the previous action when go to pagination link.
+    // Pagination links for users include delete, create and other params,
+    // now not use these params, and not retry the previous action when go to
+    // pagination link.
     $remove = [
         'user_del',
         'disable_user',
@@ -1950,7 +1994,10 @@ function ui_pagination(
 
     $finalUrl = [];
     foreach ($url as $key => $value) {
-        if (strpos($value, $remove[0]) === false && strpos($value, $remove[1]) === false && strpos($value, $remove[2]) === false) {
+        if (strpos($value, $remove[0]) === false
+            && strpos($value, $remove[1]) === false
+            && strpos($value, $remove[2]) === false
+        ) {
             array_push($finalUrl, $value);
         }
     }
@@ -1964,14 +2011,15 @@ function ui_pagination(
         Pagination needs $url to build the base URL to render links, its a base url, like
         " http://pandora/index.php?sec=godmode&sec2=godmode/admin_access_logs "
     */
+
     $block_limit = PAGINATION_BLOCKS_LIMIT;
-    // Visualize only $block_limit blocks
+    // Visualize only $block_limit blocks.
     if ($count <= $pagination) {
         if ($print_total_items) {
-            $output = "<div class='pagination $other_class' $set_id>";
-            // Show the count of items
+            $output = "<div class='pagination ".$other_class."' ".$set_id.'>';
+            // Show the count of items.
             $output .= '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
-            // End div and layout
+            // End div and layout.
             $output .= '</div>';
 
             if ($return === false) {
@@ -1992,16 +2040,16 @@ function ui_pagination(
         $end_page = ($number_of_pages - 1);
     }
 
-    $output = "<div class='pagination $other_class' $set_id>";
+    $output = "<div class='pagination ".$other_class."' ".$set_id.'>';
 
-    // Show the count of items
+    // Show the count of items.
     if ($print_total_items) {
         $output .= '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
     }
 
     $output .= "<div class='total_number'>";
 
-    // Show GOTO FIRST PAGE button
+    // Show GOTO FIRST PAGE button.
     if ($number_of_pages > $block_limit) {
         if (!empty($script)) {
             $script_modified = $script;
@@ -2016,19 +2064,22 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination-arrows $other_class offset_0'
-				href='javascript: $script_modified;'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class." offset_0'
+				href='javascript: ".$script_modified.";'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination-arrows $other_class offset_0' href='$url&amp;$offset_name=0'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class." offset_0' href='".$url.'&amp;'.$offset_name."=0'>".html_print_image('images/go_first_g.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
-    // Show PREVIOUS PAGE GROUP OF PAGES
-    // For example
-    // You are in the 12 page with a block of 5 pages
-    // << < 10 - 11 - [12] - 13 - 14 > >>
-    // Click in <
-    // Result << < 5 - 6 - 7 - 8 - [9] > >>
+    /*
+     * Show PREVIOUS PAGE GROUP OF PAGES
+     * For example
+     * You are in the 12 page with a block of 5 pages
+     * << < 10 - 11 - [12] - 13 - 14 > >>
+     * Click in <
+     * Result << < 5 - 6 - 7 - 8 - [9] > >>
+     */
+
     if ($ini_page >= $block_limit) {
         $offset_previous_page = (($ini_page - 1) * $pagination);
 
@@ -2045,14 +2096,14 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_previous_page'
-				href='javacript: $script_modified;'>".html_print_image('images/go_previous_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_previous_page."'
+				href='javacript: ".$script_modified.";'>".html_print_image('images/go_previous_g.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_previous_page' href='$url&amp;$offset_name=$offset_previous_page'>".html_print_image('images/go_previous_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_previous_page."' href='".$url.'&amp;'.$offset_name.'='.$offset_previous_page."'>".html_print_image('images/go_previous_g.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
-    // Show pages
+    // Show pages.
     for ($iterator = $ini_page; $iterator <= $end_page; $iterator++) {
         $actual_page = (int) ($offset / $pagination);
 
@@ -2077,10 +2128,10 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_$offset_page'
-				href='javascript: $script_modified;'>";
+            $output .= "<a class='pagination ".$other_class.' offset_'.$offset_page."'
+				href='javascript: ".$script_modified.";'>";
         } else {
-            $output .= "<a class='pagination $other_class offset_$offset_page' href='$url&amp;$offset_name=$offset_page'>";
+            $output .= "<a class='pagination ".$other_class.' offset_'.$offset_page."' href='".$url.'&amp;'.$offset_name.'='.$offset_page."'>";
         }
 
         $output .= $iterator;
@@ -2088,12 +2139,15 @@ function ui_pagination(
         $output .= '</a></div>';
     }
 
-    // Show NEXT PAGE GROUP OF PAGES
-    // For example
-    // You are in the 12 page with a block of 5 pages
-    // << < 10 - 11 - [12] - 13 - 14 > >>
-    // Click in >
-    // Result << < [15] - 16 - 17 - 18 - 19 > >>
+    /*
+     * Show NEXT PAGE GROUP OF PAGES
+     * For example
+     * You are in the 12 page with a block of 5 pages
+     * << < 10 - 11 - [12] - 13 - 14 > >>
+     * Click in >
+     * Result << < [15] - 16 - 17 - 18 - 19 > >>
+     */
+
     if (($number_of_pages - $ini_page) > $block_limit) {
         $offset_next_page = (($end_page + 1) * $pagination);
 
@@ -2110,14 +2164,14 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_next_page'
-				href='javascript: $script_modified;'>".html_print_image('images/go_next_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_next_page."'
+				href='javascript: ".$script_modified.";'>".html_print_image('images/go_next_g.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_next_page' href='$url&amp;$offset_name=$offset_next_page'>".html_print_image('images/go_next_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_next_page."' href='".$url.'&amp;'.$offset_name.'='.$offset_next_page."'>".html_print_image('images/go_next_g.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
-    // Show GOTO LAST PAGE button
+    // Show GOTO LAST PAGE button.
     if ($number_of_pages > $block_limit) {
         $offset_lastpage = (($number_of_pages - 1) * $pagination);
 
@@ -2134,16 +2188,16 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_lastpage'
-				href='javascript: $script_modified;'>".html_print_image('images/go_last_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_lastpage."'
+				href='javascript: ".$script_modified.";'>".html_print_image('images/go_last_g.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination-arrows $other_class offset_$offset_lastpage' href='$url&amp;$offset_name=$offset_lastpage'>".html_print_image('images/go_last_g.png', true, ['class' => 'bot']).'</a>';
+            $output .= "<a class='pagination-arrows ".$other_class.' offset_'.$offset_lastpage."' href='".$url.'&amp;'.$offset_name.'='.$offset_lastpage."'>".html_print_image('images/go_last_g.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
     $output .= '</div>';
-    // total_number
     // End div and layout
+    // total_number.
     $output .= '</div>';
 
     if ($return === false) {
@@ -2157,9 +2211,8 @@ function ui_pagination(
 /**
  * Prints only a tip button which shows a text when the user puts the mouse over it.
  *
- * @param string Complete text to show in the tip
- * @param bool whether to return an output string or echo now
- * @param img displayed image
+ * @param string  $action Complete text to show in the tip.
+ * @param boolean $return Whether to return an output string or echo now.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -2210,15 +2263,19 @@ function ui_print_session_action_icon($action, $return=false)
 /**
  * Prints only a tip button which shows a text when the user puts the mouse over it.
  *
- * @param string Complete text to show in the tip
- * @param bool whether to return an output string or echo now
- * @param img displayed image
- * @param bool Print image in relative way
+ * @param string  $text        Complete text to show in the tip.
+ * @param boolean $return      Whether to return an output string or echo now.
+ * @param string  $img         Displayed image.
+ * @param boolean $is_relative Print image in relative way.
  *
  * @return string HTML code if return parameter is true.
  */
-function ui_print_help_tip($text, $return=false, $img='images/tip_help.png', $is_relative=false)
-{
+function ui_print_help_tip(
+    $text,
+    $return=false,
+    $img='images/tip_help.png',
+    $is_relative=false
+) {
     $output = '<a href="javascript:" class="tip" >'.html_print_image(
         $img,
         true,
@@ -2235,8 +2292,22 @@ function ui_print_help_tip($text, $return=false, $img='images/tip_help.png', $is
 }
 
 
-function ui_print_help_tip_border($text, $return=false, $img='images/tip_border.png', $is_relative=false)
-{
+/**
+ * Prints link to show something.
+ *
+ * @param string  $text        Complete text to show in the tip.
+ * @param boolean $return      Whether to return an output string or echo now.
+ * @param string  $img         Displayed image.
+ * @param boolean $is_relative Print image in relative way.
+ *
+ * @return string HTML.
+ */
+function ui_print_help_tip_border(
+    $text,
+    $return=false,
+    $img='images/tip_border.png',
+    $is_relative=false
+) {
     $output = '<a href="javascript:" class="tip" >'.html_print_image(
         $img,
         true,
@@ -2258,8 +2329,8 @@ function ui_print_help_tip_border($text, $return=false, $img='images/tip_border.
  *
  * This functions need to have active $config['debug'] variable to work.
  *
- * @param mixed Variable name to debug
- * @param bool Wheter to print the backtrace or not.
+ * @param mixed   $var       Variable name to debug.
+ * @param boolean $backtrace Wheter to print the backtrace or not.
  *
  * @return boolean Tru if the debug was actived. False if not.
  */
@@ -2281,14 +2352,16 @@ function ui_debug($var, $backtrace=true)
         echo '<div id="trace-'.$id.'" class="backtrace invisible">';
         echo '<ol>';
         $traces = debug_backtrace();
-        // Ignore debug function
+        // Ignore debug function.
         unset($traces[0]);
         foreach ($traces as $trace) {
             $trace_id++;
 
             /*
-                Many classes are used to allow better customization.
-            Please, do not remove them */
+             *   Many classes are used to allow better customization.
+             * Please, do not remove them
+             */
+
             echo '<li>';
             if (isset($trace['class'])) {
                 echo '<span class="class">'.$trace['class'].'</span>';
@@ -2327,7 +2400,7 @@ function ui_debug($var, $backtrace=true)
         echo '</div></div>';
     }
 
-    // Actually print the variable given
+    // Actually print the variable given.
     echo '<pre class="debug">';
     print_r($var);
     echo '</pre>';
@@ -2339,18 +2412,32 @@ function ui_debug($var, $backtrace=true)
 /**
  * Prints icon of a module type
  *
- * @param int Module Type ID
- * @param bool Whether to return or print
- * @param boolean                         $relative Whether to use relative path to image or not (i.e. $relative= true : /pandora/<img_src>).
- * @param boolean                         $options  Whether to use image options like style, border or title on the icon.
+ * @param integer $id_moduletype Module Type ID.
+ * @param boolean $return        Whether to return or print.
+ * @param boolean $relative      Whether to use relative path to image or not (i.e. $relative= true : /pandora/<img_src>).
+ * @param boolean $options       Whether to use image options like style, border or title on the icon.
+ * @param boolean $src           Src.
  *
  * @return string An HTML string with the icon. Printed if return is false
  */
-function ui_print_moduletype_icon($id_moduletype, $return=false, $relative=false, $options=true, $src=false)
-{
+function ui_print_moduletype_icon(
+    $id_moduletype,
+    $return=false,
+    $relative=false,
+    $options=true,
+    $src=false
+) {
     global $config;
 
-    $type = db_get_row('ttipo_modulo', 'id_tipo', (int) $id_moduletype, ['descripcion', 'icon']);
+    $type = db_get_row(
+        'ttipo_modulo',
+        'id_tipo',
+        (int) $id_moduletype,
+        [
+            'descripcion',
+            'icon',
+        ]
+    );
     if ($type === false) {
         $type = [];
         $type['descripcion'] = __('Unknown type');
@@ -2392,15 +2479,23 @@ function ui_print_moduletype_icon($id_moduletype, $return=false, $relative=false
 /**
  * Print module max/min values for warning/critical state
  *
- * @param float Max value for warning state
- * @param float Min value for warning state
- * @param float Max value for critical state
- * @param float Min value for critical state
+ * @param float  $max_warning  Max value for warning state.
+ * @param float  $min_warning  Min value for warning state.
+ * @param string $str_warning  String warning state.
+ * @param float  $max_critical Max value for critical state.
+ * @param float  $min_critical Min value for critical state.
+ * @param string $str_critical String for critical state.
  *
  * @return string HTML string
  */
-function ui_print_module_warn_value($max_warning, $min_warning, $str_warning, $max_critical, $min_critical, $str_critical)
-{
+function ui_print_module_warn_value(
+    $max_warning,
+    $min_warning,
+    $str_warning,
+    $max_critical,
+    $min_critical,
+    $str_critical
+) {
     $data = "<span title='".__('Warning').': '.__('Max').$max_warning.'/'.__('Min').$min_warning.' - '.__('Critical').': '.__('Max').$max_critical.'/'.__('Min').$min_critical."'>";
 
     if ($max_warning != $min_warning) {
@@ -2425,7 +2520,8 @@ function ui_print_module_warn_value($max_warning, $min_warning, $str_warning, $m
 /**
  * Format a file size from bytes to a human readable meassure.
  *
- * @param  int File size in bytes
+ * @param integer $bytes File size in bytes.
+ *
  * @return string Bytes converted to a human readable meassure.
  */
 function ui_format_filesize($bytes)
@@ -2486,17 +2582,24 @@ function ui_get_status_images_path()
 /**
  * Prints an image representing a status.
  *
- * @param string
- * @param string
- * @param bool Whether to return an output string or echo now (optional, echo by default).
- * @param array options to set image attributes: I.E.: style
- * @param Path of the image, if not provided use the status path
+ * @param string  $type          Type.
+ * @param string  $title         Title.
+ * @param boolean $return        Whether to return an output string or echo now (optional, echo by default).
+ * @param array   $options       Options to set image attributes: I.E.: style.
+ * @param string  $path          Path of the image, if not provided use the status path.
+ * @param boolean $rounded_image Round.
  *
  * @return string HTML code if return parameter is true.
  */
-function ui_print_status_image($type, $title='', $return=false, $options=false, $path=false, $rounded_image=false)
-{
-    // This is for the List of Modules in Agent View
+function ui_print_status_image(
+    $type,
+    $title='',
+    $return=false,
+    $options=false,
+    $path=false,
+    $rounded_image=false
+) {
+    // This is for the List of Modules in Agent View.
     if ($rounded_image === true) {
         switch ($type) {
             case 'module_ok.png':
@@ -2590,24 +2693,31 @@ function ui_progress(
 
 
 /**
- * Print a code into a DIV and enable a toggle to show and hide it
+ * Print a code into a DIV and enable a toggle to show and hide it.
  *
- * @param string html code
- * @param string name of the link
- * @param string title of the link
- * @param bool if the div will be hidden by default (default: true)
- * @param bool Whether to return an output string or echo now (default: true)
+ * @param string  $code           Html code.
+ * @param string  $name           Name of the link.
+ * @param string  $title          Title of the link.
+ * @param boolean $hidden_default If the div will be hidden by default (default: true).
+ * @param boolean $return         Whether to return an output string or echo now (default: true).
+ * @param string  $toggle_class   Toggle class.
+ *
+ * @return string HTML.
  */
-
-
-function ui_toggle($code, $name, $title='', $hidden_default=true, $return=false, $toggle_class='')
-{
-    // Generate unique Id
+function ui_toggle(
+    $code,
+    $name,
+    $title='',
+    $hidden_default=true,
+    $return=false,
+    $toggle_class=''
+) {
+    // Generate unique Id.
     $uniqid = uniqid('');
 
     $image_a = html_print_image('images/arrow_down_green.png', true, false, true);
     $image_b = html_print_image('images/arrow_right_green.png', true, false, true);
-    // Options
+    // Options.
     if ($hidden_default) {
         $style = 'display:none';
         $original = 'images/arrow_right_green.png';
@@ -2616,7 +2726,7 @@ function ui_toggle($code, $name, $title='', $hidden_default=true, $return=false,
         $original = 'images/arrow_down_green.png';
     }
 
-    // Link to toggle
+    // Link to toggle.
     $output = '';
     $output .= '<a href="javascript:" id="tgl_ctrl_'.$uniqid.'">'.html_print_image($original, true, ['title' => $title, 'id' => 'image_'.$uniqid]).'&nbsp;&nbsp;<b>'.$name.'</b></a>';
     // $output .= '<br />';
@@ -2627,7 +2737,7 @@ function ui_toggle($code, $name, $title='', $hidden_default=true, $return=false,
     $output .= $code;
     $output .= '</div>';
 
-    // JQuery Toggle
+    // JQuery Toggle.
     $output .= '<script type="text/javascript">'."\n";
     $output .= '	var hide_tgl_ctrl_'.$uniqid.' = '.(int) $hidden_default.";\n";
     $output .= '	/* <![CDATA[ */'."\n";
@@ -2659,26 +2769,28 @@ function ui_toggle($code, $name, $title='', $hidden_default=true, $return=false,
 /**
  * Construct and return the URL to be used in order to refresh the current page correctly.
  *
- * @param array Extra parameters to be added to the URL. It has prevalence over
- * GET and POST. False values will be ignored.
- * @param bool Whether to return the relative URL or the absolute URL. Returns
- * relative by default
- * @param bool Whether to add POST values to the URL.
+ * @param array   $params   Extra parameters to be added to the URL. It has prevalence over
+ *     GET and POST. False values will be ignored.
+ * @param boolean $relative Whether to return the relative URL or the absolute URL. Returns
+ *    relative by default.
+ * @param boolean $add_post Whether to add POST values to the URL.
+ *
+ * @return string Url.
  */
 function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
 {
-    // Agent selection filters and refresh
+    // Agent selection filters and refresh.
     global $config;
 
-    // slerena, 8/Ene/2015 - Need to put index.php on URL which have it.
+    // Slerena, 8/Ene/2015 - Need to put index.php on URL which have it.
     if (strpos($_SERVER['REQUEST_URI'], 'index.php') === false) {
         $url = '';
     } else {
         $url = 'index.php';
     }
 
-    if (sizeof($_REQUEST)) {
-        // Some (old) browsers don't like the ?&key=var
+    if (count($_REQUEST)) {
+        // Some (old) browsers don't like the ?&key=var.
         $url .= '?';
     }
 
@@ -2686,12 +2798,12 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
         $params = [];
     }
 
-    // Avoid showing login info
+    // Avoid showing login info.
     $params['pass'] = false;
     $params['nick'] = false;
     $params['unnamed'] = false;
 
-    // We don't clean these variables up as they're only being passed along
+    // We don't clean these variables up as they're only being passed along.
     foreach ($_GET as $key => $value) {
         if (isset($params[$key])) {
             continue;
@@ -2768,7 +2880,7 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
         }
     }
 
-    // Removes final &
+    // Removes final &.
     $pos = strrpos($url, '&', 0);
     if ($pos) {
         $url = substr_replace($url, '', $pos, 5);
@@ -2789,9 +2901,10 @@ function ui_get_url_refresh($params=false, $relative=true, $add_post=true)
  *
  * An example of full URL is http:/localhost/pandora_console/index.php?sec=gsetup&sec2=godmode/setup/setup
  *
- * @param mixed   $url              If provided, it will be added after the index.php, but it is false boolean value, put the homeurl in the url.
- * @param boolean $no_proxy         To avoid the proxy checks, by default it is false.
- * @param boolean $metaconsole_root Set the root to the metaconsole dir if the metaconsole is enabled, true by default.
+ * @param mixed   $url               If provided, it will be added after the index.php, but it is false boolean value, put the homeurl in the url.
+ * @param boolean $no_proxy          To avoid the proxy checks, by default it is false.
+ * @param boolean $add_name_php_file Something.
+ * @param boolean $metaconsole_root  Set the root to the metaconsole dir if the metaconsole is enabled, true by default.
  *
  * @return string A full URL in Pandora.
  */
@@ -2800,7 +2913,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
     global $config;
 
     $port = null;
-    // null means 'use the starndard port'
+    // Null means 'use the starndard port'.
     $proxy = false;
     // By default Pandora FMS doesn't run across proxy.
     if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
@@ -2818,7 +2931,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
             $port = $_SERVER['SERVER_PORT'];
         }
     } else if ($config['https']) {
-        // When $config["https"] is set, enforce https
+        // When $config["https"] is set, enforce https.
         $protocol = 'https';
     } else {
         $protocol = 'http';
@@ -2831,7 +2944,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
     if (!$no_proxy) {
         // Check if the PandoraFMS runs across the proxy like as
         // mod_proxy of Apache
-        // and check if public_url is setted
+        // and check if public_url is set.
         if (!empty($config['public_url'])
             && (!empty($_SERVER['HTTP_X_FORWARDED_HOST']))
         ) {
@@ -2844,9 +2957,9 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
         $fullurl = $protocol.'://'.$_SERVER['SERVER_NAME'];
     }
 
-    // using a different port than the standard
+    // Using a different port than the standard.
     if (!$proxy) {
-        // using a different port than the standard
+        // Using a different port than the standard.
         if ($port != null) {
             $fullurl .= ':'.$port;
         }
@@ -2862,7 +2975,7 @@ function ui_get_full_url($url='', $no_proxy=false, $add_name_php_file=false, $me
         if ($proxy) {
             $url = '';
         } else {
-            // Only add the home url
+            // Only add the home url.
             $url = $config['homeurl_static'].'/';
         }
 
@@ -3021,13 +3134,13 @@ function ui_print_page_header(
                         }
                     }
 
-                    // Tabs forced to other styles
+                    // Tabs forced to other styles.
                     if (isset($option['godmode']) && $option['godmode']) {
                         $class .= ' tab_godmode';
                     } else if (isset($option['operation']) && ($option['operation'])) {
                         $class .= ' tab_operation';
                     } else {
-                        $class .= $godmode ? ' tab_godmode' : ' tab_operation';
+                        $class .= ($godmode) ? ' tab_godmode' : ' tab_operation';
                     }
 
                     $buffer .= '<li class="'.$class.'">';
@@ -3071,212 +3184,212 @@ function ui_print_page_header(
  *
  * This generate a lot of lines of html and javascript code.
  *
- * @parameters array Array with several properties:
- *  - $parameters['return'] boolean, by default is false
- *    true  - return as html string the code (html and js)
- *    false - print the code.
+ * @param array $parameters Array with several properties:
+ * - $parameters['return'] boolean, by default is false
+ *   true  - return as html string the code (html and js)
+ *   false - print the code.
  *
- *  - $parameters['input_name'] the input name (needs to get the value)
- *    string  - The name.
- *    default - "agent_autocomplete_<aleatory_uniq_raw_letters/numbers>"
+ * - $parameters['input_name'] the input name (needs to get the value)
+ *   string  - The name.
+ *   default - "agent_autocomplete_<aleatory_uniq_raw_letters/numbers>"
  *
- *  - $parameters['input_id'] the input id (needs to get the value)
- *    string  - The ID.
- *    default - "text-<input_name>"
+ * - $parameters['input_id'] the input id (needs to get the value)
+ *   string  - The ID.
+ *   default - "text-<input_name>"
  *
- *  - $parameters['selectbox_group'] the id of selectbox with the group
- *    string  - The ID of selectbox.
- *    default - "" empty string
+ * - $parameters['selectbox_group'] the id of selectbox with the group
+ *   string  - The ID of selectbox.
+ *   default - "" empty string
  *
- *  - $parameters['icon_image'] the small icon to show into the input in
- *    the right side.
- *    string  - The url for the image.
- *    default - "images/lightning.png"
+ * - $parameters['icon_image'] the small icon to show into the input in
+ *   the right side.
+ *   string  - The url for the image.
+ *   default - "images/lightning.png"
  *
- *  - $parameters['value'] The initial value to set the input.
- *    string  - The value.
- *    default - "" emtpy string
+ * - $parameters['value'] The initial value to set the input.
+ *   string  - The value.
+ *   default - "" emtpy string
  *
- *  - $parameters['show_helptip'] boolean, by  default is false
- *    true  - print the icon out the field in side right the tiny star
- *            for tip.
- *    false - does not print
+ * - $parameters['show_helptip'] boolean, by  default is false
+ *   true  - print the icon out the field in side right the tiny star
+ *           for tip.
+ *   false - does not print
  *
- *  - $parameters['helptip_text'] The text to show in the tooltip.
- *    string  - The text to show into the tooltip.
- *    default - "Type at least two characters to search." (translate)
+ * - $parameters['helptip_text'] The text to show in the tooltip.
+ *   string  - The text to show into the tooltip.
+ *   default - "Type at least two characters to search." (translate)
  *
- *  - $parameters['use_hidden_input_idagent'] boolean, Use a field for
- *    store the id of agent from the ajax query. By default is false.
- *    true  - Use the field for id agent and the sourcecode work with
- *            this.
- *    false - Doesn't use the field (maybe this doesn't exist outer)
+ * - $parameters['use_hidden_input_idagent'] boolean, Use a field for
+ *   store the id of agent from the ajax query. By default is false.
+ *   true  - Use the field for id agent and the sourcecode work with
+ *           this.
+ *   false - Doesn't use the field (maybe this doesn't exist outer)
  *
- *  - $parameters['print_hidden_input_idagent'] boolean, Print a field
- *    for store the id of agent from the ajax query. By default is
- *    false.
- *    true  - Print the field for id agent and the sourcecode work with
- *            this.
- *    false - Doesn't print the field (maybe this doesn't exist outer)
+ * - $parameters['print_hidden_input_idagent'] boolean, Print a field
+ *   for store the id of agent from the ajax query. By default is
+ *   false.
+ *   true  - Print the field for id agent and the sourcecode work with
+ *           this.
+ *   false - Doesn't print the field (maybe this doesn't exist outer)
  *
- *  - $parameters['hidden_input_idagent_name'] The name of hidden input
- *    for to store the id agent.
- *    string  - The name of hidden input.
- *    default - "agent_autocomplete_idagent_<aleatory_uniq_raw_letters/numbers>"
+ * - $parameters['hidden_input_idagent_name'] The name of hidden input
+ *   for to store the id agent.
+ *   string  - The name of hidden input.
+ *   default - "agent_autocomplete_idagent_<aleatory_uniq_raw_letters/numbers>"
  *
- *  - $parameters['hidden_input_idagent_id'] The id of hidden input
- *    for to store the id agent.
- *    string  - The id of hidden input.
- *    default - "hidden-<hidden_input_idagent_name>"
+ * - $parameters['hidden_input_idagent_id'] The id of hidden input
+ *   for to store the id agent.
+ *   string  - The id of hidden input.
+ *   default - "hidden-<hidden_input_idagent_name>"
  *
- *  - $parameters['hidden_input_idagent_value'] The initial value to set
- *    the input id agent for store the id agent.
- *    string  - The value.
- *    default - 0
+ * - $parameters['hidden_input_idagent_value'] The initial value to set
+ *   the input id agent for store the id agent.
+ *   string  - The value.
+ *   default - 0
  *
- *  - $parameters['size'] The size in characters for the input of agent.
- *    string  - A number of characters.
- *    default - 30
+ * - $parameters['size'] The size in characters for the input of agent.
+ *   string  - A number of characters.
+ *   default - 30
  *
- *  - $parameters['maxlength'] The max characters that can store the
- *    input of agent.
- *    string  - A number of characters max to store
- *    default - 100
+ * - $parameters['maxlength'] The max characters that can store the
+ *   input of agent.
+ *   string  - A number of characters max to store
+ *   default - 100
  *
- *  - $parameters['disabled'] Set as disabled the input of agent. By
- *    default is false
- *    true  - Set disabled the input of agent.
- *    false - Set enabled the input of agent.
+ * - $parameters['disabled'] Set as disabled the input of agent. By
+ *   default is false
+ *   true  - Set disabled the input of agent.
+ *   false - Set enabled the input of agent.
  *
- *  - $parameters['selectbox_id'] The id of select box that stores the
- *    list of modules of agent select.
- *    string - The id of select box.
- *    default - "id_agent_module"
+ * - $parameters['selectbox_id'] The id of select box that stores the
+ *   list of modules of agent select.
+ *   string - The id of select box.
+ *   default - "id_agent_module"
  *
- *  - $parameters['add_none_module'] Boolean, add the list of modules
- *    the "none" entry, with value 0. By default is true
- *    true  - add the none entry.
- *    false - does not add the none entry.
+ * - $parameters['add_none_module'] Boolean, add the list of modules
+ *   the "none" entry, with value 0. By default is true
+ *   true  - add the none entry.
+ *   false - does not add the none entry.
  *
- *  - $parameters['none_module_text'] Boolean, add the list of modules
- *    the "none" entry, with value 0.
- *    string  - The text to put for none module for example "select a
- *              module"
- *    default - "none" (translate)
+ * - $parameters['none_module_text'] Boolean, add the list of modules
+ *   the "none" entry, with value 0.
+ *   string  - The text to put for none module for example "select a
+ *             module"
+ *   default - "none" (translate)
  *
- *  - $parameters['print_input_server'] Boolean, print the hidden field
- *    to store the server (metaconsole). By default false.
- *    true  - Print the hidden input for the server.
- *    false - Does not print.
+ * - $parameters['print_input_server'] Boolean, print the hidden field
+ *   to store the server (metaconsole). By default false.
+ *   true  - Print the hidden input for the server.
+ *   false - Does not print.
  *
- *  - $parameters['use_input_server'] Boolean, use the hidden field
- *    to store the server (metaconsole). By default false.
- *    true  - Use the hidden input for the server.
- *    false - Does not print.
+ * - $parameters['use_input_server'] Boolean, use the hidden field
+ *   to store the server (metaconsole). By default false.
+ *   true  - Use the hidden input for the server.
+ *   false - Does not print.
  *
- *  - $parameters['input_server_name'] The name for hidden field to
- *    store the server.
- *    string  - The name of field for server.
- *    default - "server_<aleatory_uniq_raw_letters/numbers>"
+ * - $parameters['input_server_name'] The name for hidden field to
+ *   store the server.
+ *   string  - The name of field for server.
+ *   default - "server_<aleatory_uniq_raw_letters/numbers>"
  *
- *  - $parameters['input_server_id'] The id for hidden field to store
- *    the server.
- *    string  - The id of field for server.
- *    default - "hidden-<input_server_name>"
+ * - $parameters['input_server_id'] The id for hidden field to store
+ *   the server.
+ *   string  - The id of field for server.
+ *   default - "hidden-<input_server_name>"
  *
- *  - $parameters['input_server_value'] The value to store into the
- *    field server.
- *    string  - The name of server.
- *    default - "" empty string
+ * - $parameters['input_server_value'] The value to store into the
+ *   field server.
+ *   string  - The name of server.
+ *   default - "" empty string
  *
- *  - $parameters['metaconsole_enabled'] Boolean, set the sourcecode for
- *    to make some others things that run of without metaconsole. By
- *    default false.
- *    true  - Set the gears for metaconsole.
- *    false - Run as without metaconsole.
+ * - $parameters['metaconsole_enabled'] Boolean, set the sourcecode for
+ *   to make some others things that run of without metaconsole. By
+ *   default false.
+ *   true  - Set the gears for metaconsole.
+ *   false - Run as without metaconsole.
  *
- *  - $parameters['javascript_ajax_page'] The page to send the ajax
- *    queries.
- *    string  - The url to ajax page, remember the url must be into your
- *              domain (ajax security).
- *    default - "ajax.php"
+ * - $parameters['javascript_ajax_page'] The page to send the ajax
+ *   queries.
+ *   string  - The url to ajax page, remember the url must be into your
+ *             domain (ajax security).
+ *   default - "ajax.php"
  *
- *  - $parameters['javascript_function_action_after_select'] The name of
- *    function to call after the user select a agent into the list in
- *    the autocomplete field.
- *    string  - The name of function.
- *    default - ""
+ * - $parameters['javascript_function_action_after_select'] The name of
+ *   function to call after the user select a agent into the list in
+ *   the autocomplete field.
+ *   string  - The name of function.
+ *   default - ""
  *
- *  - $parameters['javascript_function_action_after_select_js_call'] The
- *    call of this function to call after user select a agent into the
- *    list in the autocomplete field. Instead the
- *    $parameters['javascript_function_action_after_select'], this is
- *    overwrite the previous element. And this is necesary when you need
- *    to set some params in your custom function.
- *    string  - The call line as javascript code.
- *    default - ""
+ * - $parameters['javascript_function_action_after_select_js_call'] The
+ *   call of this function to call after user select a agent into the
+ *   list in the autocomplete field. Instead the
+ *   $parameters['javascript_function_action_after_select'], this is
+ *   overwrite the previous element. And this is necesary when you need
+ *   to set some params in your custom function.
+ *   string  - The call line as javascript code.
+ *   default - ""
  *
- *  - $parameters['javascript_function_action_into_source'] The source
- *    code as block string to call when the autocomplete starts to get
- *    the data from ajax.
- *    string  - A huge string with your function as javascript.
- *    default - ""
+ * - $parameters['javascript_function_action_into_source'] The source
+ *   code as block string to call when the autocomplete starts to get
+ *   the data from ajax.
+ *   string  - A huge string with your function as javascript.
+ *   default - ""
  *
- *  - $parameters['javascript'] Boolean, set the autocomplete agent to
- *    use javascript or enabled javascript. By default true.
- *    true  - Enabled the javascript.
- *    false - Disabled the javascript.
+ * - $parameters['javascript'] Boolean, set the autocomplete agent to
+ *   use javascript or enabled javascript. By default true.
+ *   true  - Enabled the javascript.
+ *   false - Disabled the javascript.
  *
- *  - $parameters['javascript_is_function_select'] Boolean, set to
- *    enable to call a function when user select a agent in the
- *    autocomplete list. By default false.
- *    true  - Enabled this feature.
- *    false - Disabled this feature.
+ * - $parameters['javascript_is_function_select'] Boolean, set to
+ *   enable to call a function when user select a agent in the
+ *   autocomplete list. By default false.
+ *   true  - Enabled this feature.
+ *   false - Disabled this feature.
  *
- *  - $parameters['javascript_code_function_select'] The name of
- *    function to call when user select a agent in the autocomplete
- *    list.
- *    string  - The name of function but remembers this function pass
- *              the parameter agent_name.
- *    default - "function_select_<input_name>"
+ * - $parameters['javascript_code_function_select'] The name of
+ *   function to call when user select a agent in the autocomplete
+ *   list.
+ *   string  - The name of function but remembers this function pass
+ *             the parameter agent_name.
+ *   default - "function_select_<input_name>"
  *
- *  - $parameters['javascript_name_function_select'] The source
- *    code as block string to call when user select a agent into the
- *    list in the autocomplete field. Althought use this element, you
- *    need use the previous parameter to set name of your custom
- *    function or call line.
- *    string  - A huge string with your function as javascript.
- *    default - A lot of lines of source code into a string, please this
- *              lines you can read in the source code of function.
+ * - $parameters['javascript_name_function_select'] The source
+ *   code as block string to call when user select a agent into the
+ *   list in the autocomplete field. Althought use this element, you
+ *   need use the previous parameter to set name of your custom
+ *   function or call line.
+ *   string  - A huge string with your function as javascript.
+ *   default - A lot of lines of source code into a string, please this
+ *             lines you can read in the source code of function.
  *
- *  - $parameters['javascript_change_ajax_params'] The params to pass in
- *    the ajax query for the list of agents.
- *    array   - The associative array with the key and value to pass in
- *              the ajax query.
- *    default - A lot of lines of source code into a string, please this
- *              lines you can read in the source code of function.
+ * - $parameters['javascript_change_ajax_params'] The params to pass in
+ *   the ajax query for the list of agents.
+ *   array   - The associative array with the key and value to pass in
+ *             the ajax query.
+ *   default - A lot of lines of source code into a string, please this
+ *             lines you can read in the source code of function.
  *
- *  - $parameters['javascript_function_change'] The source code as block
- *    string with all javascript code to run autocomplete field.
- *    string - The source code javascript into a string.
- *    default - A lot of lines of source code into a string, please this
- *              lines you can read in the source code of function.
+ * - $parameters['javascript_function_change'] The source code as block
+ *   string with all javascript code to run autocomplete field.
+ *   string - The source code javascript into a string.
+ *   default - A lot of lines of source code into a string, please this
+ *             lines you can read in the source code of function.
  *
- *  - $parameters['javascript_document_ready'] Boolean, set the
- *    javascript sourcecode to run with the document is ready. By
- *    default is true.
- *    true  - Set to run when document is ready.
- *    false - Not set to run.
+ * - $parameters['javascript_document_ready'] Boolean, set the
+ *   javascript sourcecode to run with the document is ready. By
+ *   default is true.
+ *   true  - Set to run when document is ready.
+ *   false - Not set to run.
  *
- *  - $parameters['javascript_tags'] Boolean, print the html tags for
- *    javascript. By default is true.
- *    true  - Print the javascript tags.
- *    false - Doesn't print the tags.
+ * - $parameters['javascript_tags'] Boolean, print the html tags for
+ *   javascript. By default is true.
+ *   true  - Print the javascript tags.
+ *   false - Doesn't print the tags.
  *
- *  - $parameters['javascript_tags'] Boolean, print the html tags for
- *    javascript. By default is true.
- *    true  - Print the javascript tags.
- *    false - Doesn't print the tags.
+ * - $parameters['javascript_tags'] Boolean, print the html tags for
+ *   javascript. By default is true.
+ *   true  - Print the javascript tags.
+ *   false - Doesn't print the tags.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -3285,205 +3398,205 @@ function ui_print_agent_autocomplete_input($parameters)
     global $config;
 
     // Normalize and extract the data from $parameters
-    // ------------------------------------------------------------------
+    // ------------------------------------------------------------------.
     $return = false;
-    // Default value
+    // Default value.
     if (isset($parameters['return'])) {
         $return = $parameters['return'];
     }
 
     $input_name = uniqid('agent_autocomplete_');
-    // Default value
+    // Default value.
     if (isset($parameters['input_name'])) {
         $input_name = $parameters['input_name'];
     }
 
     $input_id = 'text-'.$input_name;
-    // Default value
+    // Default value.
     if (isset($parameters['input_id'])) {
         $input_id = $parameters['input_id'];
     }
 
     $selectbox_group = '';
-    // Default value
+    // Default value.
     if (isset($parameters['selectbox_group'])) {
         $selectbox_group = $parameters['selectbox_group'];
     }
 
-    // Default value
+    // Default value.
     $icon_image = html_print_image('images/search_agent.png', true, false, true);
     if (isset($parameters['icon_image'])) {
         $icon_image = $parameters['icon_image'];
     }
 
     $value = '';
-    // Default value
+    // Default value.
     if (isset($parameters['value'])) {
         $value = $parameters['value'];
     }
 
     $show_helptip = true;
-    // Default value
+    // Default value.
     if (isset($parameters['show_helptip'])) {
         $show_helptip = $parameters['show_helptip'];
     }
 
     $helptip_text = __('Type at least two characters to search.');
-    // Default value
+    // Default value.
     if (isset($parameters['helptip_text'])) {
         $helptip_text = $parameters['helptip_text'];
     }
 
     $use_hidden_input_idagent = false;
-    // Default value
+    // Default value.
     if (isset($parameters['use_hidden_input_idagent'])) {
         $use_hidden_input_idagent = $parameters['use_hidden_input_idagent'];
     }
 
     $print_hidden_input_idagent = false;
-    // Default value
+    // Default value.
     if (isset($parameters['print_hidden_input_idagent'])) {
         $print_hidden_input_idagent = $parameters['print_hidden_input_idagent'];
     }
 
     $hidden_input_idagent_name = uniqid('agent_autocomplete_idagent_');
-    // Default value
+    // Default value.
     if (isset($parameters['hidden_input_idagent_name'])) {
         $hidden_input_idagent_name = $parameters['hidden_input_idagent_name'];
     }
 
     $hidden_input_idagent_id = 'hidden-'.$input_name;
-    // Default value
+    // Default value.
     if (isset($parameters['hidden_input_idagent_id'])) {
         $hidden_input_idagent_id = $parameters['hidden_input_idagent_id'];
     }
 
     $hidden_input_idagent_value = (int) get_parameter($hidden_input_idagent_name, 0);
-    // Default value
+    // Default value.
     if (isset($parameters['hidden_input_idagent_value'])) {
         $hidden_input_idagent_value = $parameters['hidden_input_idagent_value'];
     }
 
     $size = 30;
-    // Default value
+    // Default value.
     if (isset($parameters['size'])) {
         $size = $parameters['size'];
     }
 
     $maxlength = 100;
-    // Default value
+    // Default value.
     if (isset($parameters['maxlength'])) {
         $maxlength = $parameters['maxlength'];
     }
 
     $disabled = false;
-    // Default value
+    // Default value.
     if (isset($parameters['disabled'])) {
         $disabled = $parameters['disabled'];
     }
 
     $selectbox_id = 'id_agent_module';
-    // Default value
+    // Default value.
     if (isset($parameters['selectbox_id'])) {
         $selectbox_id = $parameters['selectbox_id'];
     }
 
     $add_none_module = true;
-    // Default value
+    // Default value.
     if (isset($parameters['add_none_module'])) {
         $add_none_module = $parameters['add_none_module'];
     }
 
     $none_module_text = '--';
-    // Default value
+    // Default value.
     if (isset($parameters['none_module_text'])) {
         $none_module_text = $parameters['none_module_text'];
     }
 
     $print_input_server = false;
-    // Default value
+    // Default value.
     if (isset($parameters['print_input_server'])) {
         $print_input_server = $parameters['print_input_server'];
     }
 
     $print_input_id_server = false;
-    // Default value
+    // Default value.
     if (isset($parameters['print_input_id_server'])) {
         $print_input_id_server = $parameters['print_input_id_server'];
     }
 
     $use_input_server = false;
-    // Default value
+    // Default value.
     if (isset($parameters['use_input_server'])) {
         $use_input_server = $parameters['use_input_server'];
     }
 
     $use_input_id_server = false;
-    // Default value
+    // Default value.
     if (isset($parameters['use_input_id_server'])) {
         $use_input_id_server = $parameters['use_input_id_server'];
     }
 
     $input_server_name = uniqid('server_');
-    // Default value
+    // Default value.
     if (isset($parameters['input_server_name'])) {
         $input_server_name = $parameters['input_server_name'];
     }
 
     $input_id_server_name = uniqid('server_');
-    // Default value
+    // Default value.
     if (isset($parameters['input_id_server_name'])) {
         $input_id_server_name = $parameters['input_id_server_name'];
     }
 
     $input_server_id = 'hidden-'.$input_server_name;
-    // Default value
+    // Default value.
     if (isset($parameters['input_server_id'])) {
         $input_server_id = $parameters['input_server_id'];
     }
 
     $input_id_server_id = 'hidden-'.$input_id_server_name;
-    // Default value
+    // Default value.
     if (isset($parameters['input_id_server_id'])) {
         $input_id_server_id = $parameters['input_id_server_id'];
     }
 
     $input_server_value = '';
-    // Default value
+    // Default value.
     if (isset($parameters['input_server_value'])) {
         $input_server_value = $parameters['input_server_value'];
     }
 
     $input_id_server_value = '';
-    // Default value
+    // Default value.
     if (isset($parameters['input_id_server_value'])) {
         $input_id_server_value = $parameters['input_id_server_value'];
     }
 
     $from_ux_transaction = '';
-    // Default value
+    // Default value.
     if (isset($parameters['from_ux'])) {
         $from_ux_transaction = $parameters['from_ux'];
     }
 
     $from_wux_transaction = '';
-    // Default value
+    // Default value.
     if (isset($parameters['from_wux'])) {
         $from_wux_transaction = $parameters['from_wux'];
     }
 
     $cascade_protection = false;
-    // Default value
+    // Default value.
     if (isset($parameters['cascade_protection'])) {
         $cascade_protection = $parameters['cascade_protection'];
     }
 
     $metaconsole_enabled = false;
-    // Default value
+    // Default value.
     if (isset($parameters['metaconsole_enabled'])) {
         $metaconsole_enabled = $parameters['metaconsole_enabled'];
     } else {
-        // If metaconsole_enabled param is not setted then pick source configuration
+        // If metaconsole_enabled param is not setted then pick source configuration.
         if (defined('METACONSOLE')) {
             $metaconsole_enabled = true;
         } else {
@@ -3502,17 +3615,17 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     // Javascript configurations
-    // ------------------------------------------------------------------
+    // ------------------------------------------------------------------.
     $javascript_ajax_page = ui_get_full_url('ajax.php', false, false, false, false);
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_ajax_page'])) {
         $javascript_ajax_page = $parameters['javascript_ajax_page'];
     }
 
     $javascript_function_action_after_select = '';
-    // Default value
+    // Default value.
     $javascript_function_action_after_select_js_call = '';
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_function_action_after_select'])) {
         $javascript_function_action_after_select = $parameters['javascript_function_action_after_select'];
         $javascript_function_action_after_select_js_call = $javascript_function_action_after_select.'();';
@@ -3526,9 +3639,9 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     $javascript_function_action_into_source = '';
-    // Default value
+    // Default value.
     $javascript_function_action_into_source_js_call = '';
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_function_action_into_source'])) {
         $javascript_function_action_into_source = $parameters['javascript_function_action_into_source'];
         $javascript_function_action_into_source_js_call = $javascript_function_action_into_source.'();';
@@ -3542,7 +3655,7 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     $javascript = true;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript'])) {
         $javascript = $parameters['javascript'];
     }
@@ -3553,13 +3666,13 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     $javascript_is_function_select = false;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_is_function_select'])) {
         $javascript_is_function_select = $parameters['javascript_is_function_select'];
     }
 
     $javascript_name_function_select = 'function_select_'.$input_name;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_name_function_select'])) {
         $javascript_name_function_select = $parameters['javascript_name_function_select'];
     }
@@ -3698,7 +3811,7 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     // ============ INIT javascript_change_ajax_params ==================
-    // Default value
+    // Default value.
     $javascript_page = 'include/ajax/agent';
     if (isset($parameters['javascript_page'])) {
         $javascript_page = $parameters['javascript_page'];
@@ -3762,7 +3875,7 @@ function ui_print_agent_autocomplete_input($parameters)
     $javascript_change_ajax_params_text .= '};';
     // ============ END javascript_change_ajax_params ===================
     $javascript_function_change = '';
-    // Default value
+    // Default value.
     $javascript_function_change .= '
 		function set_functions_change_autocomplete_'.$input_name.'() {
 			var cache_'.$input_name.' = {};
@@ -3802,7 +3915,7 @@ function ui_print_agent_autocomplete_input($parameters)
 					else {
 						//Check if other terms cached start with same
 						//letters.
-						//TODO: At the moment DISABLED CODE
+						//TODO: At the moment DISABLED CODE.
 						/*
 						for (i = 1; i < term.length; i++) {
 							var term_match = term.substr(0, term.length - i);
@@ -3978,36 +4091,36 @@ function ui_print_agent_autocomplete_input($parameters)
     }
 
     $javascript_document_ready = true;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_document_ready'])) {
         $javascript_document_ready = $parameters['javascript_document_ready'];
     }
 
     $javascript_tags = true;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_tags'])) {
         $javascript_tags = $parameters['javascript_tags'];
     }
 
     $disabled_javascript_on_blur_function = false;
-    // Default value
+    // Default value.
     if (isset($parameters['disabled_javascript_on_blur_function'])) {
         $disabled_javascript_on_blur_function = $parameters['disabled_javascript_on_blur_function'];
     }
 
     $javascript_on_blur_function_name = 'function_on_blur_'.$input_name;
-    // Default value
+    // Default value.
     if (isset($parameters['javascript_on_blur_function_name'])) {
         $javascript_on_blur_function_name = $parameters['javascript_on_blur_function_name'];
     }
 
     $check_only_empty_javascript_on_blur_function = false;
-    // Default value
+    // Default value.
     if (isset($parameters['check_only_empty_javascript_on_blur_function'])) {
         $check_only_empty_javascript_on_blur_function = $parameters['check_only_empty_javascript_on_blur_function'];
     }
 
-    // Default value
+    // Default value.
     $javascript_on_blur = '
 		/*
 		This function is a callback when the autocomplete agent
@@ -4134,7 +4247,7 @@ function ui_print_agent_autocomplete_input($parameters)
         $javascript_on_blur = $parameters['javascript_on_blur'];
     }
 
-    // ------------------------------------------------------------------
+    // ------------------------------------------------------------------.
     $html = '';
 
     $attrs = [];
@@ -4187,7 +4300,7 @@ function ui_print_agent_autocomplete_input($parameters)
         );
     }
 
-    // Write the javascript
+    // Write the javascript.
     if ($javascript) {
         if ($javascript_tags) {
             $html .= '<script type="text/javascript">
@@ -4226,11 +4339,13 @@ function ui_print_agent_autocomplete_input($parameters)
 /**
  * Return error strings (title and message) for each error code
  *
- * @param string error code
+ * @param string $error_code Error code.
+ *
+ * @return array.
  */
 function ui_get_error($error_code='')
 {
-    // FIXME: Deprecated. Pandora shouldn't go inside this
+    // XXX: Deprecated. Pandora shouldn't go inside this.
     return [
         'title'   => __('Unhandled error'),
         'message' => __('An unhandled error occurs'),
@@ -4238,6 +4353,13 @@ function ui_get_error($error_code='')
 }
 
 
+/**
+ * Include time picker.
+ *
+ * @param boolean $echo_tags Tags.
+ *
+ * @return void
+ */
 function ui_include_time_picker($echo_tags=false)
 {
     if (is_ajax() || $echo_tags) {
@@ -4252,6 +4374,16 @@ function ui_include_time_picker($echo_tags=false)
 }
 
 
+/**
+ * Print string value.
+ *
+ * @param string  $value            Value.
+ * @param integer $id_agente_module Id_agente_module.
+ * @param integer $current_interval Current_interval.
+ * @param string  $module_name      Module_name.
+ *
+ * @return string HTML.
+ */
 function ui_print_module_string_value(
     $value,
     $id_agente_module,
@@ -4260,7 +4392,7 @@ function ui_print_module_string_value(
 ) {
     global $config;
 
-    if (is_null($module_name)) {
+    if ($module_name == null) {
         $module_name = modules_get_agentmodule_name($id_agente_module);
     }
 
@@ -4281,7 +4413,7 @@ function ui_print_module_string_value(
     );
 
     // Fixed the goliat sends the strings from web
-    // without HTML entities
+    // without HTML entities.
     if ($is_web_content_string) {
         $value = io_safe_input($value);
     }
@@ -4314,11 +4446,11 @@ function ui_print_module_string_value(
             }
         } else {
             // Fixed the goliat sends the strings from web
-            // without HTML entities
+            // without HTML entities.
             if ($is_web_content_string) {
                 $sub_string = substr($value, 0, 12);
             } else {
-                // Fixed the data from Selenium Plugin
+                // Fixed the data from Selenium Plugin.
                 if ($value != strip_tags($value)) {
                     $value = io_safe_input($value);
                     $sub_string = substr($value, 0, 12);
@@ -4348,7 +4480,12 @@ function ui_print_module_string_value(
 
 
 /**
- * Displays a tag list
+ * Displays a tag list.
+ *
+ * @param string $title Title.
+ * @param array  $tags  Tags.
+ *
+ * @return void
  */
 function ui_print_tags_view($title='', $tags=[])
 {
@@ -4377,33 +4514,35 @@ function ui_print_tags_view($title='', $tags=[])
 
 
 /**
- * @brief Get the link to open a snapshot into a new page
+ * Gets the link to open a snapshot into a new page.
  *
- * @param Array Params to build the link (see  $default_params)
- * @param bool Flag to choose de return value:
- *         true: Get the four params required in the function of pandora.js winopen_var (js use)
- *         false: Get an inline winopen_var function call (php user)
+ * @param array   $params      Params to build the link (see  $default_params).
+ * @param boolean $only_params Flag to choose de return value:
+ *            true: Get the four params required in the function of pandora.js winopen_var (js use)
+ *            false: Get an inline winopen_var function call (php user).
+ *
+ * @return string Link.
  */
 function ui_get_snapshot_link($params, $only_params=false)
 {
     global $config;
 
     $default_params = [
+        // Id_agente_modulo.
         'id_module'   => 0,
-    // id_agente_modulo
         'module_name' => '',
         'interval'    => 300,
         'timestamp'   => 0,
         'id_node'     => 0,
     ];
 
-    // Merge default params with passed params
+    // Merge default params with passed params.
     $params = array_merge($default_params, $params);
 
-    // First parameter of js winopeng_var
+    // First parameter of js winopeng_var.
     $page = $config['homeurl_static'].'/operation/agentes/snapshot_view.php';
 
-    $url = "$page?".'id='.$params['id_module'].'&label='.rawurlencode(urlencode(io_safe_output($params['module_name']))).'&id_node='.$params['id_node'];
+    $url = $page.'?id='.$params['id_module'].'&label='.rawurlencode(urlencode(io_safe_output($params['module_name']))).'&id_node='.$params['id_node'];
 
     if ($params['timestamp'] != 0) {
         $url .= '&timestamp='.$params['timestamp'];
@@ -4413,7 +4552,7 @@ function ui_get_snapshot_link($params, $only_params=false)
         $url .= '&refr='.$params['interval'];
     }
 
-    // Second parameter of js winopeng_var
+    // Second parameter of js winopeng_var.
     $win_handle = dechex(crc32('snapshot_'.$params['id_module']));
 
     $link_parts = [
@@ -4423,30 +4562,30 @@ function ui_get_snapshot_link($params, $only_params=false)
         480,
     ];
 
-    // Return only the params to js execution
+    // Return only the params to js execution.
     if ($only_params) {
         return $link_parts;
     }
 
-    // Return the function call to inline js execution
+    // Return the function call to inline js execution.
     return "winopeng_var('".implode("', '", $link_parts)."')";
 }
 
 
 /**
- * @brief Get the snapshot image with the link to open a snapshot into a new page
+ * Get the snapshot image with the link to open a snapshot into a new page
  *
- * @param string Built link
- * @param bool Picture image or list image
+ * @param string  $link     Built link.
+ * @param boolean $is_image Picture image or list image.
  *
- * @return string HTML anchor link with image
+ * @return string HTML anchor link with image.
  */
 function ui_get_snapshot_image($link, $is_image)
 {
-    $image_name = $is_image ? 'photo.png' : 'default_list.png';
+    $image_name = ($is_image) ? 'photo.png' : 'default_list.png';
 
     $link = '<a href="javascript:'.$link.'">'.html_print_image(
-        "images/$image_name",
+        'images/'.$image_name,
         true,
         [
             'border' => '0',
@@ -4459,6 +4598,14 @@ function ui_get_snapshot_image($link, $is_image)
 }
 
 
+/**
+ * Show warning timezone missmatch.
+ *
+ * @param string  $tag    Tag.
+ * @param boolean $return Return.
+ *
+ * @return string HTML.
+ */
 function ui_get_using_system_timezone_warning($tag='h3', $return=true)
 {
     global $config;
@@ -4470,7 +4617,7 @@ function ui_get_using_system_timezone_warning($tag='h3', $return=true)
             __('These controls are using the timezone of the system (%s) instead of yours (%s). The difference with your time zone in hours is %s.'),
             $config['timezone'],
             date_default_timezone_get(),
-            $user_offset > 0 ? '+'.$user_offset : $user_offset
+            ($user_offset > 0) ? '+'.$user_offset : $user_offset
         );
         return ui_print_info_message($message, '', $return, $tag);
     } else {
@@ -4483,13 +4630,13 @@ function ui_get_using_system_timezone_warning($tag='h3', $return=true)
 /**
  * Get the custom docs logo
  *
- * @return string with the path to logo. False if it should not be displayed
+ * @return string with the path to logo. False if it should not be displayed.
  */
 function ui_get_docs_logo()
 {
     global $config;
 
-    // Default logo to open version (enterprise_installed function only works in login status)
+    // Default logo to open version (enterprise_installed function only works in login status).
     if (!file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
         return 'images/icono_docs.png';
     }
@@ -4505,13 +4652,13 @@ function ui_get_docs_logo()
 /**
  * Get the custom support logo
  *
- * @return string with the path to logo. False if it should not be displayed
+ * @return string with the path to logo. False if it should not be displayed.
  */
 function ui_get_support_logo()
 {
     global $config;
 
-    // Default logo to open version (enterprise_installed function only works in login status)
+    // Default logo to open version (enterprise_installed function only works in login status).
     if (!file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
         return 'images/icono_support.png';
     }
@@ -4527,7 +4674,9 @@ function ui_get_support_logo()
 /**
  * Get the custom header logo
  *
- * @return string with the path to logo. If it is not set, return the default value
+ * @param boolean $white_bg Using white bg or not.
+ *
+ * @return string with the path to logo. If it is not set, return the default value.
  */
 function ui_get_custom_header_logo($white_bg=false)
 {
@@ -4537,7 +4686,7 @@ function ui_get_custom_header_logo($white_bg=false)
         return 'images/pandora_tinylogo_open.png';
     }
 
-    $stored_logo = is_metaconsole() ? ($white_bg ? $config['meta_custom_logo_white_bg'] : $config['meta_custom_logo']) : ($white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo']);
+    $stored_logo = (is_metaconsole()) ? (($white_bg) ? $config['meta_custom_logo_white_bg'] : $config['meta_custom_logo']) : (($white_bg) ? $config['custom_logo_white_bg'] : $config['custom_logo']);
     if (empty($stored_logo)) {
         return 'images/pandora_tinylogo.png';
     }
@@ -4590,7 +4739,7 @@ function ui_get_favicon()
     global $config;
 
     if (empty($config['custom_favicon'])) {
-        return !is_metaconsole() ? 'images/pandora.ico' : 'enterprise/meta/images/favicon_meta.ico';
+        return (!is_metaconsole()) ? 'images/pandora.ico' : 'enterprise/meta/images/favicon_meta.ico';
     }
 
     return 'images/custom_favicon/'.$config['custom_favicon'];
@@ -4600,6 +4749,11 @@ function ui_get_favicon()
 /**
  * Show sorting arrows for tables
  *
+ * @param string $url_up     Url_up.
+ * @param string $url_down   Url_down.
+ * @param string $selectUp   SelectUp.
+ * @param string $selectDown SelectDown.
+ *
  * @return string  HTML anchor link with the arrow icon.
  */
 function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
@@ -4631,6 +4785,8 @@ function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
 /**
  * Show breadcrums in the page titles
  *
+ * @param string $tab_name Tab name.
+ *
  * @return string  HTML anchor with the name of the section.
  */
 function ui_print_breadcrums($tab_name)
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c3758e49ac..1d713574a8 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -278,13 +278,11 @@ select:-webkit-autofill:focus {
 }
 
 /* All select type multiple */
-select[multiple] option:checked,
 select[multiple] option:checked {
   background: #82b92e linear-gradient(0deg, #82b92e 0%, #82b92e 100%);
   color: #fff !important;
 }
 
-select option:checked,
 select option:checked {
   background-color: #82b92e;
   color: #fff !important;
@@ -305,7 +303,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerif-Bold {
-  font-family: DejaVuSerif-BoldFont;
+  font-family: DejaVuSerif-BoldFont, sans-serif;
 }
 
 @font-face {
@@ -314,7 +312,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerif-BoldItalic {
-  font-family: DejaVuSerif-BoldItalicFont;
+  font-family: DejaVuSerif-BoldItalicFont, sans-serif;
 }
 
 @font-face {
@@ -323,7 +321,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerif-Italic {
-  font-family: DejaVuSerif-ItalicFont;
+  font-family: DejaVuSerif-ItalicFont, sans-serif;
 }
 
 @font-face {
@@ -332,7 +330,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerif {
-  font-family: DejaVuSerifFont;
+  font-family: DejaVuSerifFont, sans-serif;
 }
 
 @font-face {
@@ -341,7 +339,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerifCondensed-Bold {
-  font-family: DejaVuSerifCondensed-BoldFont;
+  font-family: DejaVuSerifCondensed-BoldFont, sans-serif;
 }
 
 @font-face {
@@ -350,7 +348,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerifCondensed-BoldItalic {
-  font-family: DejaVuSerifCondensed-BoldItalicFont;
+  font-family: DejaVuSerifCondensed-BoldItalicFont, sans-serif;
 }
 
 @font-face {
@@ -359,7 +357,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerifCondensed-Italic {
-  font-family: DejaVuSerifCondensed-ItalicFont;
+  font-family: DejaVuSerifCondensed-ItalicFont, sans-serif;
 }
 
 @font-face {
@@ -368,7 +366,7 @@ select:-internal-list-box {
 }
 
 .DejaVuSerifCondensed {
-  font-family: DejaVuSerifCondensedFont;
+  font-family: DejaVuSerifCondensedFont, sans-serif;
 }
 
 @font-face {
@@ -377,7 +375,7 @@ select:-internal-list-box {
 }
 
 .FreeSans {
-  font-family: FreeSansFont;
+  font-family: FreeSansFont, sans-serif;
 }
 
 @font-face {
@@ -386,7 +384,7 @@ select:-internal-list-box {
 }
 
 .FreeSansBold {
-  font-family: FreeSansBoldFont;
+  font-family: FreeSansBoldFont, sans-serif;
 }
 
 @font-face {
@@ -395,7 +393,7 @@ select:-internal-list-box {
 }
 
 .smallfont {
-  font-family: smallfontFont;
+  font-family: smallfontFont, sans-serif;
 }
 
 @font-face {
@@ -423,7 +421,7 @@ select:-internal-list-box {
   src: url("../../fonts/leaguegothic.woff") format("woff");
 }
 .unicode {
-  font-family: unicodeFont;
+  font-family: unicodeFont, sans-serif;
 }
 
 /*
@@ -1396,13 +1394,6 @@ div.title_line {
   color: #fff;
 }
 
-#menu_tab li.nomn,
-#menu_tab li.nomn_high {
-  min-width: 30px;
-  height: 29px;
-  margin-top: 0;
-}
-
 /* --- Tabs Submenu --- */
 ul.subsubmenu {
   border-bottom-right-radius: 5px;
@@ -5566,9 +5557,6 @@ table.info_table.policy_sub_table {
   color: #fff;
 }
 
-.pagination .total_pages {
-}
-
 .pagination .total_number {
   display: flex;
   justify-content: flex-end;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 325f0c654e..35b1d36f83 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -784,10 +784,7 @@ if (!empty($network_interfaces)) {
         });
     </script>
 <?php
-/*
- * EVENTS.
- */
-
+// EVENTS.
 $table_events = '<div class="white_table_graph" id="table_events">
             <div class="white_table_graph_header">'.html_print_image(
     'images/arrow_down_green.png',
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 80e3b33da6..a7c2cb6578 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Monitors status - general overview.
+ *
+ * @category   Agent view monitor statuses.
+ * @package    Pandora FMS
+ * @subpackage Classic agent management view.
+ * @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) 2005-2010 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.
-// Load globar vars
+// Begin.
 global $config;
 
 // Ajax tooltip to deploy modules's tag info.
@@ -102,7 +117,7 @@ if (is_ajax()) {
             $data[1] = ui_print_agent_name($id_agent, true);
             $data[2] = __('Module');
             $data[3] = "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente
-				&id_agente=$id_agent&tab=module&edit_module=1&id_agent_module=$id_module'>".ui_print_truncate_text(modules_get_agentmodule_name($id_module), 'module_medium', true, true, true, '[&hellip;]').'</a>';
+				&id_agente=".$id_agent.'&tab=module&edit_module=1&id_agent_module='.$id_module."'>".ui_print_truncate_text(modules_get_agentmodule_name($id_module), 'module_medium', true, true, true, '[&hellip;]').'</a>';
             $table_relations->data[] = $data;
         }
 
@@ -458,6 +473,17 @@ ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript
 /* ]]> */
 </script>
 <?php
+/**
+ * Print form filter monitors.
+ *
+ * @param integer $id_agent              Id_agent.
+ * @param integer $status_filter_monitor Status_filter_monitor.
+ * @param string  $status_text_monitor   Status_text_monitor.
+ * @param integer $status_module_group   Status_module_group.
+ * @param integer $status_hierachy_mode  Status_hierachy_mode.
+ *
+ * @return void
+ */
 function print_form_filter_monitors(
     $id_agent,
     $status_filter_monitor=-1,

From 92ca21780042b9cfa9d3190bbe66746e77a8a503 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 10:57:36 +0200
Subject: [PATCH 22/61] minor fixes in style view tasklist

---
 .../wizards/DiscoveryTaskList.class.php       | 77 ++++++++++---------
 pandora_console/include/functions_ui.php      |  4 +-
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index da163406ee..a986d948bb 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -361,50 +361,59 @@ class DiscoveryTaskList extends Wizard
                 $recon_tasks = [];
             }
 
-                $url_ajax = $config['homeurl'].'ajax.php';
+            $url_ajax = $config['homeurl'].'ajax.php';
 
-                $table = new StdClass();
-                $table->cellpadding = 0;
-                $table->cellspacing = 0;
-                $table->width = '100%';
-                $table->class = 'info_table';
-                $table->head = [];
-                $table->data = [];
-                $table->align = [];
-                $table->headstyle = [];
+            $table = new StdClass();
+            $table->cellpadding = 0;
+            $table->cellspacing = 0;
+            $table->width = '100%';
+            $table->class = 'info_table';
+            $table->head = [];
+            $table->data = [];
+            $table->align = [];
+            $table->headstyle = [];
             for ($i = 0; $i < 9; $i++) {
                 $table->headstyle[$i] = 'text-align: left;';
             }
 
-                $table->head[0] = __('Force');
-                $table->align[0] = 'left';
+            // Status.
+            $table->headstyle[5] .= 'width: 100px';
+            // Progress.
+            $table->headstyle[7] .= 'width: 150px';
+            // Updated at.
+            $table->headstyle[8] .= 'width: 150px';
+            // Operations.
+            $table->headstyle[9] .= 'width: 150px';
 
-                $table->head[1] = __('Task name');
-                $table->align[1] = 'left';
+            $table->head[0] = __('Force');
+            $table->align[0] = 'left';
 
-                $table->head[2] = __('Server name');
-                $table->align[2] = 'left';
+            $table->head[1] = __('Task name');
+            $table->align[1] = 'left';
 
-                $table->head[3] = __('Interval');
-                $table->align[3] = 'left';
+            $table->head[2] = __('Server name');
+            $table->align[2] = 'left';
 
-                $table->head[4] = __('Network');
-                $table->align[4] = 'left';
+            $table->head[3] = __('Interval');
+            $table->align[3] = 'left';
 
-                $table->head[5] = __('Status');
-                $table->align[5] = 'left';
+            $table->head[4] = __('Network');
+            $table->align[4] = 'left';
 
-                $table->head[6] = __('Task type');
-                $table->align[6] = 'left';
+            $table->head[5] = __('Status');
+            $table->align[5] = 'left';
 
-                $table->head[7] = __('Progress');
-                $table->align[7] = 'left';
+            $table->head[6] = __('Task type');
+            $table->align[6] = 'left';
 
-                $table->head[8] = __('Updated at');
-                $table->align[8] = 'left';
+            $table->head[7] = __('Progress');
+            $table->align[7] = 'left';
 
-                $table->head[9] = __('Operations');
-                $table->align[9] = 'left';
+            $table->head[8] = __('Updated at');
+            $table->align[8] = 'left';
+
+            $table->head[9] = __('Operations');
+            $table->align[9] = 'left';
 
             foreach ($recon_tasks as $task) {
                 $data = [];
@@ -553,13 +562,7 @@ class DiscoveryTaskList extends Wizard
                 if ($task['status'] <= 0 || $task['status'] > 100) {
                     $data[7] = '-';
                 } else {
-                    $data[7] = progress_bar(
-                        $task['status'],
-                        100,
-                        20,
-                        __('Progress').':'.$task['status'].'%',
-                        1
-                    );
+                    $data[7] = ui_progress($task['status'], '100%', 1.5, '#333');
                 }
 
                 if ($task['utimestamp'] > 0) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2dc602b603..c01e8ee23b 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2679,9 +2679,9 @@ function ui_progress(
     }
 
     ui_require_css_file('progress');
-    $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.'em;">';
+    $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.'em; border: 1px solid '.$color.'">';
     $output .= '<span class="progress_text" style="font-size:'.($height - 0.5).'em;">'.$progress.'%</span>';
-    $output .= '<div class="progress" style="width: '.$progress.'%;"></div>';
+    $output .= '<div class="progress" style="width: '.$progress.'%; background: '.$color.'"></div>';
     $output .= '</div>';
 
     if (!$return) {

From 9a12b34847c1f5bf44bd5c3970e0a7a5fb18bae8 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 12:13:29 +0200
Subject: [PATCH 23/61] Updates styling

---
 .../godmode/agentes/agent_manager.php         |   4 +-
 .../godmode/agentes/configurar_agente.php     |  89 ++++---
 .../wizards/DiscoveryTaskList.class.php       |   2 +-
 pandora_console/include/ajax/module.php       | 246 +++++++++---------
 .../include/class/NetworkMap.class.php        |  39 +--
 pandora_console/include/functions_modules.php |  48 ++++
 .../include/functions_reporting.php           |  26 +-
 pandora_console/include/functions_ui.php      |  56 ++++
 .../include/graphs/functions_d3.php           |  31 ++-
 9 files changed, 317 insertions(+), 224 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index d78b6c2a36..18a0ba08b7 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -888,10 +888,10 @@ foreach ($fields as $field) {
         );
     };
 
-    $table->rowid[] = 'name_field-'.$i;
+    $table->rowid[] = 'name_field-'.$id_custom_field;
     $table->data[] = $data;
 
-    $table->rowid[] = 'field-'.($i + 1);
+    $table->rowid[] = 'field-'.$id_custom_field;
     $table->data[] = $data_field;
     $i += 2;
 }
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 5d89bec92c..44acf87845 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -1,17 +1,32 @@
 <?php
+/**
+ * Configure agents.
+ *
+ * @category   Agents view - management.
+ * @package    Pandora FMS
+ * @subpackage User interface.
+ * @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) 2005-2010 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.
-// Load global vars.
+// Begin.
 global $config;
 
 enterprise_include('godmode/agentes/configurar_agente.php');
@@ -325,7 +340,7 @@ if ($create_agent) {
             $unsafe_alias = io_safe_output($alias);
             db_pandora_audit(
                 'Agent management',
-                "Created agent $unsafe_alias",
+                'Created agent '.$unsafe_alias,
                 false,
                 true,
                 $info
@@ -489,7 +504,7 @@ if ($id_agente) {
             $agent_name = io_safe_output($agent_name);
             $agent_md5 = md5($agent_name, false);
 
-            $remote_configuration_tab['text'] = '<a href="index.php?'.'sec=gagente&amp;'.'sec2=godmode/agentes/configurar_agente&amp;'.'tab=remote_configuration&amp;'.'id_agente='.$id_agente.'&amp;'.'disk_conf='.$agent_md5.'">'.html_print_image(
+            $remote_configuration_tab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=remote_configuration&amp;id_agente='.$id_agente.'&amp;disk_conf='.$agent_md5.'">'.html_print_image(
                 'images/remote_configuration.png',
                 true,
                 ['title' => __('Remote configuration')]
@@ -996,7 +1011,7 @@ if ($update_agent) {
                     [
                         $id_agente,
                         'standby',
-                        $disabled ? '1' : '0',
+                        ($disabled) ? '1' : '0',
                     ]
                 );
                 // Validate alerts for disabled agents.
@@ -1082,7 +1097,7 @@ if ($update_agent) {
             ui_print_success_message(__('Successfully updated'));
             db_pandora_audit(
                 'Agent management',
-                "Updated agent $alias",
+                'Updated agent '.$alias,
                 false,
                 false,
                 $info
@@ -1224,7 +1239,7 @@ if ($update_module || $create_module) {
     }
 
     if ($id_module_type == 25) {
-        // web analysis, from MODULE_WUX.
+        // Web analysis, from MODULE_WUX.
         $custom_string_1 = base64_encode((string) get_parameter('custom_string_1', $custom_string_1_default));
         $custom_integer_1 = (int) get_parameter('custom_integer_1', $custom_integer_1_default);
     } else {
@@ -1261,12 +1276,11 @@ if ($update_module || $create_module) {
 
         foreach ($conf_array as $line) {
             if (preg_match('/^module_name\s*(.*)/', $line, $match)) {
-                $new_configuration_data .= 'module_name '.io_safe_output($name)."\n";
-            }
-
-            // We delete from conf all the module macros starting with _field.
-            else if (!preg_match('/^module_macro_field.*/', $line, $match)) {
-                $new_configuration_data .= "$line\n";
+                $new_configuration_data .= 'module_name ';
+                $new_configuration_data .= io_safe_output($name)."\n";
+            } else if (!preg_match('/^module_macro_field.*/', $line, $match)) {
+                // We delete from conf all the module macros starting with _field.
+                $new_configuration_data .= $line."\n";
             }
         }
 
@@ -1428,9 +1442,13 @@ if ($update_module || $create_module) {
     }
 
     $active_snmp_v3 = get_parameter('active_snmp_v3');
-    if ($active_snmp_v3) {
-        // LOST CODE?
-    }
+
+    /*
+     * if ($active_snmp_v3) {
+     *     // LOST CODE?.
+     *
+     * }
+     */
 
     $throw_unknown_events = (bool) get_parameter('throw_unknown_events', false);
     // Set the event type that can show.
@@ -1614,7 +1632,7 @@ if ($update_module) {
 
         db_pandora_audit(
             'Agent management',
-            "Fail to try update module '$name' for agent ".$agent['alias']
+            "Fail to try update module '".$name."' for agent ".$agent['alias']
         );
     } else {
         if ($prediction_module == 3) {
@@ -1638,7 +1656,7 @@ if ($update_module) {
 
         db_pandora_audit(
             'Agent management',
-            "Updated module '$name' for agent ".$agent['alias'],
+            "Updated module '".$name."' for agent ".$agent['alias'],
             false,
             false,
             io_json_mb_encode($values)
@@ -1657,12 +1675,13 @@ if ($create_module) {
     }
 
     $id_module = (int) get_parameter('id_module');
-    // Commented because can't create prediction modules
+
     /*
-        if ($id_module == 5) {
-        $prediction_module = 1;
-        }
-    */
+     * Commented because can't create prediction modules
+     *   if ($id_module == 5) {
+     *   $prediction_module = 1;
+     *   }
+     */
 
     switch ($config['dbtype']) {
         case 'oracle':
@@ -1792,7 +1811,7 @@ if ($create_module) {
         $moduletype = $id_module;
         db_pandora_audit(
             'Agent management',
-            "Fail to try added module '$name' for agent ".$agent['alias']
+            "Fail to try added module '".$name."' for agent ".$agent['alias']
         );
     } else {
         if ($prediction_module == 3) {
@@ -1811,7 +1830,7 @@ if ($create_module) {
         $agent = db_get_row('tagente', 'id_agente', $id_agente);
         db_pandora_audit(
             'Agent management',
-            "Added module '$name' for agent ".$agent['alias'],
+            "Added module '".$name."' for agent ".$agent['alias'],
             false,
             true,
             io_json_mb_encode($values)
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index a986d948bb..4aa172bb35 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -562,7 +562,7 @@ class DiscoveryTaskList extends Wizard
                 if ($task['status'] <= 0 || $task['status'] > 100) {
                     $data[7] = '-';
                 } else {
-                    $data[7] = ui_progress($task['status'], '100%', 1.5, '#333');
+                    $data[7] = ui_progress($task['status'], '100%', 1.5);
                 }
 
                 if ($task['utimestamp'] > 0) {
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 0b208e079b..c6c31191a6 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -1,17 +1,33 @@
 <?php
+/**
+ * Module management.
+ *
+ * @category   Ajax library.
+ * @package    Pandora FMS
+ * @subpackage Modules.
+ * @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.
+ * ============================================================================
+ */
 
+// Begin.
 if (check_login()) {
-    // Pandora FMS- http://pandorafms.com
-    // ==================================================
-    // Copyright (c) 2005-2010 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.
     global $config;
 
     include_once $config['homedir'].'/include/functions_agents.php';
@@ -76,7 +92,7 @@ if (check_login()) {
         $id_agents = json_decode(io_safe_output(get_parameter('id_agents')));
         $filter = '%'.get_parameter('q', '').'%';
         $other_filter = json_decode(io_safe_output(get_parameter('other_filter')), true);
-        // TODO TAGS agents_get_modules
+        // TODO TAGS agents_get_modules.
         $modules = agents_get_modules(
             $id_agents,
             false,
@@ -96,7 +112,7 @@ if (check_login()) {
     }
 
     if ($get_module_detail) {
-        // This script is included manually to be included after jquery and avoid error
+        // This script is included manually to be included after jquery and avoid error.
         ui_include_time_picker();
         ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
 
@@ -307,7 +323,7 @@ if (check_login()) {
         if (empty($module_data)) {
             $result = [];
         } else {
-            // Paginate the result
+            // Paginate the result.
             $result = array_slice($module_data, $offset, $block_size);
         }
 
@@ -366,10 +382,10 @@ if (check_login()) {
                     $data[] = html_print_result_div($row[$attr[0]]);
                 } else if ($is_web_content_string) {
                     // Fixed the goliat sends the strings from web
-                    // without HTML entities
+                    // without HTML entities.
                     $data[] = io_safe_input($row[$attr[0]]);
                 } else {
-                    // Fixed the data from Selenium Plugin
+                    // Fixed the data from Selenium Plugin.
                     if ($row[$attr[0]] != strip_tags($row[$attr[0]])) {
                         $data[] = html_print_result_div($row[$attr[0]]);
                     } else if (is_numeric($row[$attr[0]]) && !modules_is_string_type($row['module_type'])) {
@@ -523,7 +539,8 @@ if (check_login()) {
         $agent_w = check_acl($config['id_user'], 0, 'AW');
         $access = ($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR');
 
-        $id_agente = $id_agent = (int) get_parameter('id_agente', 0);
+        $id_agent = (int) get_parameter('id_agente', 0);
+        $id_agente = $id_agent;
         $show_notinit = (int) get_parameter('show_notinit', 0);
         $cluster_list = (int) get_parameter('cluster_list', 0);
         $url = 'index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agent;
@@ -549,6 +566,7 @@ if (check_login()) {
             case 'type':
                 switch ($sort) {
                     case 'up':
+                    default:
                         $selectTypeUp = $selected;
                         $order[] = [
                             'field' => 'tagente_modulo.id_modulo',
@@ -583,6 +601,10 @@ if (check_login()) {
                             'order' => 'DESC',
                         ];
                     break;
+
+                    default:
+                        // Ignore.
+                    break;
                 }
             break;
 
@@ -603,6 +625,10 @@ if (check_login()) {
                             'order' => '',
                         ];
                     break;
+
+                    default:
+                        // Ignore.
+                    break;
                 }
             break;
 
@@ -623,6 +649,10 @@ if (check_login()) {
                             'order' => 'DESC',
                         ];
                     break;
+
+                    default:
+                        // Ignore.
+                    break;
                 }
             break;
 
@@ -645,7 +675,8 @@ if (check_login()) {
             break;
         }
 
-        // Fix: for tag functionality groups have to be all user_groups (propagate ACL funct!)
+        // Fix: for tag functionality groups have to be all user_groups
+        // (propagate ACL funct!).
         $groups = users_get_groups($config['id_user'], $access);
 
         $tags_join = '';
@@ -669,7 +700,7 @@ if (check_login()) {
 
         $status_filter_sql = '1 = 1';
         if ($status_filter_monitor == AGENT_MODULE_STATUS_NOT_NORMAL) {
-            // Not normal
+            // Not normal.
             $status_filter_sql = ' tagente_estado.estado <> 0';
         } else if ($status_filter_monitor != -1) {
             $status_filter_sql = 'tagente_estado.estado = '.$status_filter_monitor;
@@ -693,7 +724,7 @@ if (check_login()) {
         }
 
         // Count monitors/modules
-        // Build the order sql
+        // Build the order sql.
         $first = true;
         foreach ($order as $ord) {
             if ($first) {
@@ -936,12 +967,12 @@ if (check_login()) {
                 }
             }
 
-            // Adds tag context information
+            // Adds tag context information.
             if (tags_get_modules_tag_count($module['id_agente_modulo']) > 0) {
                 $data[3] .= ' <a class="tag_details" href="ajax.php?page=operation/agentes/estado_monitores&get_tag_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/tag_red.png', true, ['id' => 'tag-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).'</a> ';
             }
 
-            // Adds relations context information
+            // Adds relations context information.
             if (modules_relation_exists($module['id_agente_modulo'])) {
                 $data[3] .= ' <a class="relations_details" href="ajax.php?page=operation/agentes/estado_monitores&get_relations_tooltip=1&id_agente_modulo='.$module['id_agente_modulo'].'">'.html_print_image('images/link2.png', true, ['id' => 'relations-details-'.$module['id_agente_modulo'], 'class' => 'img_help']).'</a> ';
             }
@@ -964,7 +995,7 @@ if (check_login()) {
                 $title
             );
 
-            $data[5] = ui_print_status_image($status, $title, true, false, false, true);
+            $data[5] = ui_print_module_status($module['estado'], $title, true, false, true);
             if (!$show_context_help_first_time) {
                 $show_context_help_first_time = true;
 
@@ -973,122 +1004,85 @@ if (check_login()) {
                 }
             }
 
-            if ($module['id_tipo_modulo'] == 24) {
-                // log4x
-                switch ($module['datos']) {
-                    case 10:
-                        $salida = 'TRACE';
-                        $style = 'font-weight:bold; color:darkgreen;';
-                    break;
+            if (is_numeric($module['datos']) && !modules_is_string_type($module['id_tipo_modulo'])) {
+                if ($config['render_proc']) {
+                    switch ($module['id_tipo_modulo']) {
+                        case 2:
+                        case 6:
+                        case 9:
+                        case 18:
+                        case 21:
+                        case 31:
+                            if ($module['datos'] >= 1) {
+                                $salida = $config['render_proc_ok'];
+                            } else {
+                                $salida = $config['render_proc_fail'];
+                            }
+                        break;
 
-                    case 20:
-                        $salida = 'DEBUG';
-                        $style = 'font-weight:bold; color:darkgreen;';
-                    break;
-
-                    case 30:
-                        $salida = 'INFO';
-                        $style = 'font-weight:bold; color:darkgreen;';
-                    break;
-
-                    case 40:
-                        $salida = 'WARN';
-                        $style = 'font-weight:bold; color:darkorange;';
-                    break;
-
-                    case 50:
-                        $salida = 'ERROR';
-                        $style = 'font-weight:bold; color:red;';
-                    break;
-
-                    case 60:
-                        $salida = 'FATAL';
-                        $style = 'font-weight:bold; color:red;';
-                    break;
-                }
-
-                $salida = "<span style='$style'>$salida</span>";
-            } else {
-                if (is_numeric($module['datos']) && !modules_is_string_type($module['id_tipo_modulo'])) {
-                    if ($config['render_proc']) {
-                        switch ($module['id_tipo_modulo']) {
-                            case 2:
-                            case 6:
-                            case 9:
-                            case 18:
-                            case 21:
-                            case 31:
-                                if ($module['datos'] >= 1) {
-                                    $salida = $config['render_proc_ok'];
-                                } else {
-                                    $salida = $config['render_proc_fail'];
-                                }
-                            break;
-
-                            default:
-                                switch ($module['id_tipo_modulo']) {
-                                    case 15:
-                                        $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
-                                        if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
-                                            if ($module['post_process'] > 0) {
-                                                $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
-                                            } else {
-                                                $salida = human_milliseconds_to_string($module['datos']);
-                                            }
+                        default:
+                            switch ($module['id_tipo_modulo']) {
+                                case 15:
+                                    $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
+                                    if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+                                        if ($module['post_process'] > 0) {
+                                            $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
                                         } else {
-                                            $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
+                                            $salida = human_milliseconds_to_string($module['datos']);
                                         }
-                                    break;
-
-                                    default:
-                                        $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
-                                    break;
-                                }
-                            break;
-                        }
-                    } else {
-                        switch ($module['id_tipo_modulo']) {
-                            case 15:
-                                $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
-                                if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
-                                    if ($module['post_process'] > 0) {
-                                        $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
                                     } else {
-                                        $salida = human_milliseconds_to_string($module['datos']);
+                                        $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
                                     }
-                                } else {
+                                break;
+
+                                default:
                                     $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
-                                }
-                            break;
-
-                            default:
-                                $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
-                            break;
-                        }
-                    }
-
-                    // Show units ONLY in numeric data types
-                    if (isset($module['unit'])) {
-                        $data_macro = modules_get_unit_macro($module['datos'], $module['unit']);
-                        if ($data_macro) {
-                            $salida = $data_macro;
-                        } else {
-                            $salida .= '&nbsp;'.'<i>'.io_safe_output($module['unit']).'</i>';
-                        }
+                                break;
+                            }
+                        break;
                     }
                 } else {
+                    switch ($module['id_tipo_modulo']) {
+                        case 15:
+                            $value = db_get_value('snmp_oid', 'tagente_modulo', 'id_agente_modulo', $module['id_agente_modulo']);
+                            if ($value == '.1.3.6.1.2.1.1.3.0' || $value == '.1.3.6.1.2.1.25.1.1.0') {
+                                if ($module['post_process'] > 0) {
+                                    $salida = human_milliseconds_to_string(($module['datos'] / $module['post_process']));
+                                } else {
+                                    $salida = human_milliseconds_to_string($module['datos']);
+                                }
+                            } else {
+                                $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
+                            }
+                        break;
+
+                        default:
+                            $salida = remove_right_zeros(number_format($module['datos'], $config['graph_precision']));
+                        break;
+                    }
+                }
+
+                // Show units ONLY in numeric data types
+                if (isset($module['unit'])) {
                     $data_macro = modules_get_unit_macro($module['datos'], $module['unit']);
                     if ($data_macro) {
                         $salida = $data_macro;
                     } else {
-                        $salida = ui_print_module_string_value(
-                            $module['datos'],
-                            $module['id_agente_modulo'],
-                            $module['current_interval'],
-                            $module['module_name']
-                        );
+                        $salida .= '&nbsp;'.'<i>'.io_safe_output($module['unit']).'</i>';
                     }
                 }
+            } else {
+                $data_macro = modules_get_unit_macro($module['datos'], $module['unit']);
+                if ($data_macro) {
+                    $salida = $data_macro;
+                } else {
+                    $salida = ui_print_module_string_value(
+                        $module['datos'],
+                        $module['id_agente_modulo'],
+                        $module['current_interval'],
+                        $module['module_name']
+                    );
+                }
             }
 
             if ($module['id_tipo_modulo'] != 25) {
@@ -1230,5 +1224,3 @@ if (check_login()) {
         return;
     }
 }
-
-
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 90e2f2a0d4..7bf232e068 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -1519,43 +1519,8 @@ class NetworkMap
      */
     public static function getColorByStatus($status)
     {
-        if (isset($status) === false) {
-            return COL_UNKNOWN;
-        }
-
-        switch ($status) {
-            case AGENT_MODULE_STATUS_NORMAL:
-            case AGENT_STATUS_NORMAL:
-            return COL_NORMAL;
-
-            case AGENT_MODULE_STATUS_NOT_INIT:
-            case AGENT_STATUS_NOT_INIT:
-            return COL_NOTINIT;
-
-            case AGENT_MODULE_STATUS_CRITICAL_BAD:
-            case AGENT_STATUS_CRITICAL:
-            return COL_CRITICAL;
-
-            case AGENT_MODULE_STATUS_WARNING:
-            case AGENT_STATUS_WARNING:
-            return COL_WARNING;
-
-            case AGENT_MODULE_STATUS_CRITICAL_ALERT:
-            case AGENT_MODULE_STATUS_WARNING_ALERT:
-            case AGENT_STATUS_ALERT_FIRED:
-            return COL_ALERTFIRED;
-
-            case AGENT_MODULE_STATUS_UNKNOWN:
-            case AGENT_STATUS_UNKNOWN:
-            return COL_UNKNOWN;
-
-            default:
-                // Ignored.
-            break;
-        }
-
-        return COL_IGNORED;
-
+        include_once __DIR__.'/../functions_modules.php';
+        return modules_get_color_status($status);
     }
 
 
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 9204253220..b9ed8e41d5 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2294,6 +2294,54 @@ function modules_get_modulegroup_name($modulegroup_id)
 }
 
 
+/**
+ * Returns target color to be used based on the status received.
+ *
+ * @param integer $status Source information.
+ *
+ * @return string HTML tag for color.
+ */
+function modules_get_color_status($status)
+{
+    if (isset($status) === false) {
+        return COL_UNKNOWN;
+    }
+
+    switch ($status) {
+        case AGENT_MODULE_STATUS_NORMAL:
+        case AGENT_STATUS_NORMAL:
+        return COL_NORMAL;
+
+        case AGENT_MODULE_STATUS_NOT_INIT:
+        case AGENT_STATUS_NOT_INIT:
+        return COL_NOTINIT;
+
+        case AGENT_MODULE_STATUS_CRITICAL_BAD:
+        case AGENT_STATUS_CRITICAL:
+        return COL_CRITICAL;
+
+        case AGENT_MODULE_STATUS_WARNING:
+        case AGENT_STATUS_WARNING:
+        return COL_WARNING;
+
+        case AGENT_MODULE_STATUS_CRITICAL_ALERT:
+        case AGENT_MODULE_STATUS_WARNING_ALERT:
+        case AGENT_STATUS_ALERT_FIRED:
+        return COL_ALERTFIRED;
+
+        case AGENT_MODULE_STATUS_UNKNOWN:
+        case AGENT_STATUS_UNKNOWN:
+        return COL_UNKNOWN;
+
+        default:
+            // Ignored.
+        break;
+    }
+
+    return COL_IGNORED;
+}
+
+
 /**
  * Gets a module status an modify the status and title reference variables
  *
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 5c3a13ec6f..2a0274f052 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -9642,39 +9642,39 @@ function reporting_tiny_stats(
         $out .= '<div id="bullets_modules">';
         // $out .='<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 13pt">'.$total_count.$separator.'</span>';
         if (isset($fired_count) && $fired_count > 0) {
-            $out .= '<div><div class="bullet_modules orange_background"></div>';
-            $out .= '<span class="forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 12pt">'.$fired_count.'</span></div>';
+            $out .= '<div><div id="fired_count_'.$uniq_id.'" class="forced_title bullet_modules orange_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$fired_count.'</span></div>';
         }
 
         if (isset($critical_count) && $critical_count > 0) {
-            $out .= '<div><div class="bullet_modules red_background"></div>';
-            $out .= '<span class="forced_title" id="critical_count_'.$uniq_id.'" style="font-size: 12pt">'.$critical_count.'</span></div>';
+            $out .= '<div><div id="critical_count_'.$uniq_id.'" class="forced_title bullet_modules red_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$critical_count.'</span></div>';
         }
 
         if (isset($warning_count) && $warning_count > 0) {
-            $out .= '<div><div class="bullet_modules yellow_background"></div>';
-            $out .= '<span class="forced_title" id="warning_count_'.$uniq_id.'" style="font-size: 12pt">'.$warning_count.'</span></div>';
+            $out .= '<div><div id="warning_count_'.$uniq_id.'" class="forced_title bullet_modules yellow_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$warning_count.'</span></div>';
         }
 
         if (isset($unknown_count) && $unknown_count > 0) {
-            $out .= '<div><div class="bullet_modules grey_background"></div>';
-            $out .= '<span class="forced_title" id="unknown_count_'.$uniq_id.'" style="font-size: 12pt">'.$unknown_count.'</span></div>';
+            $out .= '<div><div id="unknown_count_'.$uniq_id.'" class="forced_title bullet_modules grey_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$unknown_count.'</span></div>';
         }
 
         if (isset($not_init_count) && $not_init_count > 0) {
-            $out .= '<div><div class="bullet_modules blue_background"></div>';
-            $out .= '<span class="forced_title" id="not_init_count_'.$uniq_id.'" style="font-size: 12pt">'.$not_init_count.'</span></div>';
+            $out .= '<div><div id="not_init_count_'.$uniq_id.'" class="forced_title bullet_modules blue_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$not_init_count.'</span></div>';
         }
 
         if (isset($normal_count) && $normal_count > 0) {
-            $out .= '<div><div class="bullet_modules green_background"></div>';
-            $out .= '<span class="forced_title" id="normal_count_'.$uniq_id.'" style="font-size: 12pt">'.$normal_count.'</span></div>';
+            $out .= '<div><div id="normal_count_'.$uniq_id.'" class="forced_title bullet_modules green_background"></div>';
+            $out .= '<span style="font-size: 12pt">'.$normal_count.'</span></div>';
         }
 
         $out .= '</div>';
     } else {
         // Classic ones.
-        $out .= '<b>'.'<span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 7pt">'.$total_count.'</span>';
+        $out .= '<b><span id="total_count_'.$uniq_id.'" class="forced_title" style="font-size: 7pt">'.$total_count.'</span>';
         if (isset($fired_count) && $fired_count > 0) {
             $out .= ' '.$separator.' <span class="orange forced_title" id="fired_count_'.$uniq_id.'" style="font-size: 7pt">'.$fired_count.'</span>';
         }
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index c01e8ee23b..555144ace0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2647,6 +2647,62 @@ function ui_print_status_image(
 }
 
 
+/**
+ * Prints an image representing a status.
+ *
+ * @param string  $status        Module status.
+ * @param string  $title         Title.
+ * @param boolean $return        Whether to return an output string or echo now (optional, echo by default).
+ * @param array   $options       Options to set image attributes: I.E.: style.
+ * @param boolean $rounded_image Round.
+ *
+ * @return string HTML.
+ */
+function ui_print_module_status(
+    $status,
+    $title='',
+    $return=false,
+    $options=false,
+    $rounded_image=false
+) {
+    global $config;
+
+    if ($options === false) {
+        $options = [];
+    }
+
+    $options['style'] .= 'width: 50px;';
+    $options['style'] .= 'height: 2em;';
+
+    include_once __DIR__.'/functions_modules.php';
+    $options['style'] .= 'background: '.modules_get_color_status($status).';';
+
+    if ($rounded_image === true) {
+        $options['style'] .= 'border-radius: 5px;';
+    }
+
+    $options['title'] = $title;
+    $options['data-title'] = $title;
+    $options['data-use_title_for_force_title'] = 1;
+    $options['class'] = 'forced_title';
+
+    $output = '<div ';
+    foreach ($options as $k => $v) {
+        $output .= $k.'="'.$v.'"';
+    }
+
+    $output .= '>';
+    $output .= '</div>';
+
+    if ($return === false) {
+        echo $output;
+    }
+
+    return $output;
+
+}
+
+
 /**
  * Generates a progress bar CSS based.
  * Requires css progress.css
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index a3d0d9fc59..129baaa54e 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -722,23 +722,36 @@ function print_clock_digital_1($time_format, $timezone, $clock_animation, $width
 }
 
 
-function print_donut_narrow_graph($colors, $width, $height, $data, $data_total)
-{
+/**
+ * Print dougnhnut.
+ *
+ * @param array   $colors     Colors.
+ * @param integer $width      Width.
+ * @param integer $height     Height.
+ * @param array   $data       Data.
+ * @param mixed   $data_total Data_total.
+ *
+ * @return string HTML.
+ */
+function print_donut_narrow_graph(
+    array $colors,
+    $width,
+    $height,
+    array $data,
+    $data_total
+) {
     if (empty($data)) {
         return graph_nodata_image($width, $height, 'pie');
     }
 
-    $data = json_encode($data);
-    $data = json_decode(json_encode($data));
-
-    $colors = json_encode($colors);
-    $colors = json_decode(json_encode($colors));
-
     $series = count($data);
     if (($series != count($colors)) || ($series == 0)) {
-        return;
+        return '';
     }
 
+    $data = json_encode($data);
+    $colors = json_encode($colors);
+
     $graph_id = uniqid('graph_');
 
     $out = "<div id='$graph_id'></div>";

From 348f0c2a6584e101eca1a28271c83e541bd8d639 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 13:27:17 +0200
Subject: [PATCH 24/61] agent view styling

---
 .../godmode/agentes/agent_manager.php         | 16 ++--
 pandora_console/include/functions_ui.php      |  9 ++-
 pandora_console/include/styles/pandora.css    | 32 ++++----
 .../agentes/estado_generalagente.php          | 75 ++++++++++---------
 4 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 18a0ba08b7..93bf1931b5 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -793,7 +793,13 @@ $table = new stdClass();
 $table->width = '100%';
 $table->class = 'custom_fields_table';
 
-$table->head = [];
+$table->head = [
+    0 => __('Click to display').ui_print_help_tip(
+        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
+        true
+    ),
+];
+$table->class = 'info_table';
 $table->style = [];
 $table->style[0] = 'font-weight: bold;';
 $table->data = [];
@@ -811,10 +817,6 @@ foreach ($fields as $field) {
 
     $data[0] = '<div class="field_title" onclick="show_custom_field_row('.$id_custom_field.')">';
     $data[0] .= '<b>'.$field['name'].'</b>';
-    $data[0] .= ui_print_help_tip(
-        __('This field allows url insertion using the BBCode\'s url tag').'.<br />'.__('The format is: [url=\'url to navigate\']\'text to show\'[/url]').'.<br /><br />'.__('e.g.: [url=google.com]Google web search[/url]'),
-        true
-    );
     $data[0] .= '</div>';
     $combo = [];
     $combo = $field['combo_values'];
@@ -837,8 +839,11 @@ foreach ($fields as $field) {
         $custom_value = '';
     }
 
+    $table->rowstyle[$i] = 'cursor: pointer;';
     if (!empty($custom_value)) {
         $table->rowstyle[($i + 1)] = 'display: table-row;';
+    } else {
+        $table->rowstyle[($i + 1)] = 'display: none;';
     }
 
     if ($field['is_password_type']) {
@@ -911,7 +916,6 @@ if (!empty($fields)) {
 
 echo '<div class="action-buttons" style="display: flex; justify-content: flex-end; align-items: center; width: '.$table->width.'">';
 
-
 // The context help about the learning mode.
 if ($modo == 0) {
     echo "<span id='modules_not_learning_mode_context_help' style='padding-right:8px;'>";
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 555144ace0..b6faa9c8cf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2784,7 +2784,14 @@ function ui_toggle(
 
     // Link to toggle.
     $output = '';
-    $output .= '<a href="javascript:" id="tgl_ctrl_'.$uniqid.'">'.html_print_image($original, true, ['title' => $title, 'id' => 'image_'.$uniqid]).'&nbsp;&nbsp;<b>'.$name.'</b></a>';
+    $output .= '<a href="javascript:" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
+        $original,
+        true,
+        [
+            'title' => $title,
+            'id'    => 'image_'.$uniqid,
+        ]
+    ).'&nbsp;&nbsp;<b>'.$name.'</b></a>';
     // $output .= '<br />';
     // if (!defined("METACONSOLE"))
         // $output .= '<br />';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 1d713574a8..531eaf7b9f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5990,22 +5990,21 @@ div#bullets_modules div {
 }
 
 .agent_details_col_left {
-  width: 49.5%;
-  min-width: 455px;
+  width: 35%;
+  min-width: 390px;
 }
 .agent_details_col_right {
-  width: 49.5%;
+  width: 64%;
   min-width: 455px;
 }
-@media screen and (max-width: 1200px) {
+@media screen and (max-width: 1400px) {
   .agent_details_col {
     flex: 1 1 auto;
   }
 }
 
-.agent_details_content .agent_details_bullets {
-  position: relative;
-  left: -20%;
+.agent_details_bullets {
+  padding-bottom: 2em;
 }
 
 .buttons_agent_view {
@@ -6023,6 +6022,10 @@ div#bullets_modules div {
 }
 
 /* Agent details in agent view */
+div#status_pie path {
+  stroke-width: 15px !important;
+}
+
 .agent_details_header {
   display: flex;
   justify-content: flex-end;
@@ -6042,15 +6045,17 @@ div#bullets_modules div {
   align-items: center;
 }
 
+.agent_details_remote_cfg {
+  align-self: flex-start;
+}
+
 .agent_details_graph {
-  width: 205px;
   text-align: center;
   margin: 0 auto;
 }
 
 .agent_details_info {
-  display: flex;
-  justify-content: space-around;
+  max-width: 45%;
 }
 
 .agent_details_info p {
@@ -6066,8 +6071,7 @@ div#bullets_modules div {
 
 .agent_details_bullets #bullets_modules {
   display: flex;
-  flex-direction: column;
-  align-items: flex-start;
+  justify-content: flex-start;
 }
 
 .agent_details_bullets #bullets_modules > div {
@@ -6076,10 +6080,6 @@ div#bullets_modules div {
   padding-bottom: 20px;
 }
 
-.agent_details_bullets #bullets_modules > div:last-child {
-  padding-bottom: 0px;
-}
-
 #agent_contact_main tr td img {
   max-width: 100%;
 }
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 35b1d36f83..de213dc53f 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -222,13 +222,34 @@ $table_agent_count_modules = reporting_tiny_stats(
     true
 );
 
+$has_remote_conf = enterprise_hook(
+    'config_agents_has_remote_configuration',
+    [$agent['id_agente']]
+);
+
+if ($has_remote_conf) {
+    $remote_cfg = '<p>'.html_print_image('images/remote_configuration.png', true);
+    $remote_cfg .= __('Remote configuration enabled').'</p>';
+} else {
+    $remote_cfg = '';
+}
+
+
+
 // $table_agent_count_modules .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not  shown in real time.'), true);
-$table_agent = '<div class="agent_details_header">'.$table_agent_header.'</div>
-                <div class="agent_details_content">
-                    <div class="agent_details_graph">'.$table_agent_graph.'</div>
-                    <div class="agent_details_bullets">'.$table_agent_count_modules.'</div>
-                </div>
-                <div class="agent_details_info">'.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.'</div>';
+$table_agent = '
+    <div class="agent_details_header">'.$table_agent_header.'</div>
+        <div class="agent_details_content">
+            <div class="agent_details_graph">
+                '.$table_agent_graph.'
+            </div>
+            <div class="agent_details_info">
+                '.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
+            </div>
+        </div>
+    <div class="agent_details_bullets">
+        '.$table_agent_count_modules.'
+    </div>';
 
 /*
  * END: TABLE AGENT BUILD.
@@ -317,6 +338,18 @@ if (!$secondary_groups) {
 
 $table_contact->data[] = $data;
 
+if (enterprise_installed()) {
+    $data = [];
+    $data[0] = '<b>'.__('Parent').'</b>';
+    if ($agent['id_parent'] == 0) {
+        $data[1] = '<em>'.__('N/A').'</em>';
+    } else {
+        $data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_parent'].'">'.agents_get_alias($agent['id_parent']).'</a>';
+    }
+
+    $table_contact->data[] = $data;
+}
+
 /*
  * END: TABLE CONTACT BUILD
  */
@@ -341,32 +374,6 @@ $table_data->head[0] = html_print_image(
 $table_data->head[0] .= ' <span style="vertical-align: middle; font-weight:bold; padding-left:20px">'.__('Agent info').'</span>';
 $table_data->head_colspan[0] = 4;
 
-$has_remote_conf = enterprise_hook(
-    'config_agents_has_remote_configuration',
-    [$agent['id_agente']]
-);
-
-if (enterprise_installed()) {
-    $data = [];
-
-    $data[0] = '<b>'.__('Parent').'</b>';
-    if ($agent['id_parent'] == 0) {
-        $data[1] = '<em>'.__('N/A').'</em>';
-    } else {
-        $data[1] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent['id_parent'].'">'.agents_get_alias($agent['id_parent']).'</a>';
-    }
-
-
-    $data[2] = '<b>'.__('Remote configuration').'</b>';
-    if (!$has_remote_conf) {
-        $data[3] = __('Disabled');
-    } else {
-        $data[3] = __('Enabled');
-    }
-
-    $table_data->data[] = $data;
-}
-
 // Gis and url address.
 $data_opcional = [];
 // Position Information.
@@ -431,7 +438,6 @@ foreach ($data_opcional as $key => $value) {
     $table_data->data[] = $data_opcional[$key];
 }
 
-
 // Custom fields.
 $fields = db_get_all_rows_filter(
     'tagent_custom_fields',
@@ -466,8 +472,7 @@ foreach ($fields as $field) {
 }
 
 $custom_fields_count = count($custom_fields);
-
-for ($i = 0; $i <= $custom_fields_count; $i++) {
+for ($i = 0; $i < $custom_fields_count; $i++) {
     $first_column = $custom_fields[$i];
     $j = ($i + 1);
     $second_column = $custom_fields[$j];

From c57949079bad61484b6a041f45c65915de7ba6b5 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 13:32:17 +0200
Subject: [PATCH 25/61] RC1 agent view

---
 .../operation/agentes/estado_generalagente.php            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index de213dc53f..86d84ec9c7 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -242,14 +242,14 @@ $table_agent = '
         <div class="agent_details_content">
             <div class="agent_details_graph">
                 '.$table_agent_graph.'
+                <div class="agent_details_bullets">
+                    '.$table_agent_count_modules.'
+                </div>
             </div>
             <div class="agent_details_info">
                 '.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
             </div>
-        </div>
-    <div class="agent_details_bullets">
-        '.$table_agent_count_modules.'
-    </div>';
+        </div>';
 
 /*
  * END: TABLE AGENT BUILD.

From 445db7c43b900d1f1db663fc8a33814c8f07c01f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 16:20:24 +0200
Subject: [PATCH 26/61] module list agent view

---
 pandora_console/include/ajax/module.php       |  1 +
 pandora_console/include/functions_ui.php      |  7 +-
 pandora_console/include/styles/js/cluetip.css |  2 +-
 pandora_console/include/styles/pandora.css    | 89 ++++++++++---------
 .../agentes/estado_generalagente.php          |  6 --
 .../operation/agentes/estado_monitores.php    | 45 +++++-----
 6 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index c6c31191a6..42cd794ada 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -800,6 +800,7 @@ if (check_login()) {
 
         $table = new stdClass();
         $table->width = '100%';
+        $table->styleTable = 'border: 0;border-radius: 0;';
         $table->cellpadding = 0;
         $table->cellspacing = 0;
         $table->class = 'info_table';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b6faa9c8cf..84b3206bdf 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2783,15 +2783,15 @@ function ui_toggle(
     }
 
     // Link to toggle.
-    $output = '';
-    $output .= '<a href="javascript:" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
+    $output = '<div class="white_table_graph">';
+    $output .= '<div class="white_table_graph_header" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
         [
             'title' => $title,
             'id'    => 'image_'.$uniqid,
         ]
-    ).'&nbsp;&nbsp;<b>'.$name.'</b></a>';
+    ).'&nbsp;&nbsp;<b>'.$name.'</b></div>';
     // $output .= '<br />';
     // if (!defined("METACONSOLE"))
         // $output .= '<br />';
@@ -2820,6 +2820,7 @@ function ui_toggle(
     $output .= "	});\n";
     $output .= '/* ]]> */';
     $output .= '</script>';
+    $output .= '</div>';
 
     if (!$return) {
         echo $output;
diff --git a/pandora_console/include/styles/js/cluetip.css b/pandora_console/include/styles/js/cluetip.css
index dea766762b..233dbf3cbb 100644
--- a/pandora_console/include/styles/js/cluetip.css
+++ b/pandora_console/include/styles/js/cluetip.css
@@ -13,7 +13,7 @@
   width: 43px;
   height: 11px;
   position: absolute;
-  background-image: url(../../images/wait.gif);
+  background-image: url(../../../images/wait.gif);
 }
 .cluetip-arrows {
   display: none;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 531eaf7b9f..2276ee5c3d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5166,15 +5166,22 @@ table.info_table {
   background-color: #fff;
   margin-bottom: 10px;
   border-spacing: 0;
+  border-collapse: collapse;
+  overflow: hidden;
+  border-radius: 5px;
 }
 
+table.info_table tr,
+table.info_table th,
+table.info_table td {
+  border: 1px solid #e2e2e2;
+}
 table.info_table > tbody > tr:nth-child(even) {
   background-color: #f5f5f5;
 }
 
 table.info_table tr:first-child > th {
   background-color: #fff;
-  border-top: 1px solid #e2e2e2;
   color: #000;
   text-align: left;
   vertical-align: middle;
@@ -5187,25 +5194,25 @@ table.info_table th {
   background-color: #fff;
 }
 
-table.info_table > thead > tr > th:first-child {
-  border-left: 1px solid #e2e2e2;
-}
-
-table.info_table > thead > tr > th:last-child {
-  border-right: 1px solid #e2e2e2;
-}
-
 table.info_table tr th {
   border-bottom: 1px solid #e2e2e2;
 }
 
+/* Radius top */
+table.info_table > thead > tr:first-child > th:first-child {
+  border-top-left-radius: 4px;
+}
 table.info_table > thead > tr:first-child > th:last-child {
   border-top-right-radius: 4px;
 }
 
-table.info_table > thead > tr:first-child > th:first-child {
+/* Radius bottom */
+table.info_table > tbody > tr:last-child > td:first-child {
   border-top-left-radius: 4px;
 }
+table.info_table > tbody > tr:last-child > td:last-child {
+  border-top-right-radius: 4px;
+}
 
 table.info_table > thead > tr > th,
 table.info_table > tbody > tr > th,
@@ -5219,6 +5226,10 @@ table.info_table > thead > tr > th a {
   font-size: 8.6pt;
 }
 
+table.info_table > tbody > tr {
+  border-bottom: 1px solid #e2e2e2;
+}
+
 table.info_table > tbody > tr > td {
   -moz-border-radius: 0px;
   -webkit-border-radius: 0px;
@@ -5228,23 +5239,6 @@ table.info_table > tbody > tr > td {
   padding-right: 9px;
   padding-top: 7px;
   padding-bottom: 7px;
-  border-bottom: 1px solid #e2e2e2;
-}
-
-table.info_table > tbody > tr:last-child > td:first-child {
-  border-bottom-left-radius: 4px;
-}
-
-table.info_table > tbody > tr > td:first-child {
-  border-left: 1px solid #e2e2e2;
-}
-
-table.info_table > tbody > tr:last-child > td:last-child {
-  border-bottom-right-radius: 4px;
-}
-
-table.info_table > tbody > tr > td:last-child {
-  border-right: 1px solid #e2e2e2;
 }
 
 table.info_table > tbody > tr > td > img,
@@ -5942,13 +5936,14 @@ a#qr_code_agent_view {
 }
 
 div#bullets_modules {
-  display: inline-block;
+  display: flex;
   margin-left: 2em;
 }
 
 div#bullets_modules div {
-  display: inline-block;
-  margin: 0 0.5em;
+  display: flex;
+  align-items: center;
+  margin: 0 5px;
 }
 
 .orange_background {
@@ -5986,27 +5981,22 @@ div#bullets_modules div {
   border: 1px solid #e2e2e2;
   border-radius: 5px;
   flex: 0 1 auto;
-  margin: 5px auto;
 }
 
 .agent_details_col_left {
   width: 35%;
-  min-width: 390px;
+  min-width: 470px;
 }
 .agent_details_col_right {
   width: 64%;
   min-width: 455px;
 }
-@media screen and (max-width: 1400px) {
+@media screen and (max-width: 1600px) {
   .agent_details_col {
     flex: 1 1 auto;
   }
 }
 
-.agent_details_bullets {
-  padding-bottom: 2em;
-}
-
 .buttons_agent_view {
   display: flex;
   justify-content: flex-end;
@@ -6023,7 +6013,10 @@ div#bullets_modules div {
 
 /* Agent details in agent view */
 div#status_pie path {
-  stroke-width: 15px !important;
+  stroke-width: 8px !important;
+}
+div#status_pie {
+  margin-bottom: 2em;
 }
 
 .agent_details_header {
@@ -6038,6 +6031,7 @@ div#status_pie path {
   display: flex;
   align-items: center;
   padding: 20px;
+  padding-bottom: 10px;
 }
 
 .agent_details_agent_name {
@@ -6056,13 +6050,15 @@ div#status_pie path {
 
 .agent_details_info {
   max-width: 45%;
+  overflow: hidden;
+}
+.agent_details_info span {
+  text-overflow: ellipsis;
 }
 
 .agent_details_info p {
   display: flex;
   align-items: center;
-  padding-left: 5px;
-  padding-right: 5px;
 }
 
 .agent_details_info img {
@@ -6101,6 +6097,9 @@ div#status_pie path {
   font-weight: bold;
 }
 
+.white_table_graph_header div#bullets_modules {
+  float: right;
+}
 .white_table_graph_header img,
 .white_table_graph_header span {
   vertical-align: middle;
@@ -6119,6 +6118,12 @@ div#status_pie path {
   border-bottom-right-radius: 4px;
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
+}
+
+div.white_table_graph_content div.pagination {
+  width: 100%;
+  padding: 0 1em;
 }
 
 /* White tables */
@@ -6147,10 +6152,6 @@ div#status_pie path {
   padding-top: 25px;
 }
 
-.white_table tbody tr:last-child td {
-  padding-bottom: 25px;
-}
-
 .white_table tr td:first-child,
 .white_table tr th:first-child {
   padding-left: 50px;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 86d84ec9c7..2f1346f958 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -406,8 +406,6 @@ if ($agent['url_address'] != '') {
     if ($agent['url_address'] != '') {
         $data_opcional[] = '<a href='.$agent['url_address'].'>'.$agent['url_address'].'</a>';
     }
-
-        array_push($data_opcional);
 }
 
 
@@ -418,8 +416,6 @@ if (!empty($addresses)) {
     if (!empty($addresses)) {
         $data_opcional[] = '<div style="overflow-y: scroll;">'.implode('<br>', $addresses).'</div>';
     }
-
-     array_push($data_opcional);
 }
 
 // Timezone Offset.
@@ -428,8 +424,6 @@ if ($agent['timezone_offset'] != 0) {
     if ($agent['timezone_offset'] != 0) {
         $data_opcional[] = $agent['timezone_offset'];
     }
-
-    array_push($data_opcional);
 }
 
 
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index a7c2cb6578..c3f9a0d433 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -147,44 +147,42 @@ $sort_field = get_parameter('sort_field', 'name');
 $sort = get_parameter('sort', 'up');
 
 
-echo "<h4 style='padding-top:0px !important;'>";
-
-echo ui_print_help_tip(
-    __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
-    true
-);
-echo '<span>'.__('Full list of monitors').'</span>';
-echo reporting_tiny_stats(
-    $agent,
-    true,
-    'modules',
-    ':',
-    true
-);
-
 $modules_not_init = agents_monitor_notinit($id_agente);
 if (!empty($modules_not_init)) {
     echo clippy_context_help('modules_not_init');
 }
 
-echo '</h4>';
-
-
 ob_start();
 
-print_form_filter_monitors($id_agente, $status_filter_monitor, $status_text_monitor, $status_hierachy_mode);
+print_form_filter_monitors(
+    $id_agente,
+    $status_filter_monitor,
+    $status_text_monitor,
+    $status_hierachy_mode
+);
 
-echo "<div id='module_list_loading'>".html_print_image('images/spinner.gif', true).'</div>';
-echo "<div id='module_list'>".'</div>';
+echo '<div class="white_table_graph_content" id="module_list_loading">'.html_print_image('images/spinner.gif', true).'</div>';
+echo '<div class="white_table_graph_content" style="padding: 0;" id="module_list"></div>';
 
 $html_toggle = ob_get_clean();
+
 ui_toggle(
     $html_toggle,
-    __('List of modules'),
+    __('List of modules').ui_print_help_tip(
+        __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
+        true
+    ).reporting_tiny_stats(
+        $agent,
+        true,
+        'modules',
+        ':',
+        true
+    ),
     'status_monitor_agent',
     false
 );
 
+
 ?>
 <script type="text/javascript">
     var sort_field = '<?php echo $sort_field; ?>';
@@ -493,7 +491,8 @@ function print_form_filter_monitors(
 ) {
     $form_text = '';
     $table = new stdClass();
-    $table->class = 'databox filters';
+    $table->class = 'info_table';
+    $table->styleTable = 'width: 100%;border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
     $table->width = '100%';
     $table->style[0] = 'font-weight: bold;';
     $table->style[2] = 'font-weight: bold;';

From 99e485e96ea6015ddc7f98674ed4cdfd9eec3b0b Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 16:24:28 +0200
Subject: [PATCH 27/61] toggle updated

---
 pandora_console/include/functions_ui.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 84b3206bdf..2e75e82c6b 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2784,7 +2784,7 @@ function ui_toggle(
 
     // Link to toggle.
     $output = '<div class="white_table_graph">';
-    $output .= '<div class="white_table_graph_header" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
+    $output .= '<div class="white_table_graph_header" style="cursor: pointer;" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
         [
@@ -2796,7 +2796,7 @@ function ui_toggle(
     // if (!defined("METACONSOLE"))
         // $output .= '<br />';
     // Code into a div
-    $output .= "<div id='tgl_div_".$uniqid."' style='".$style."' class='".$toggle_class."'>\n";
+    $output .= "<div id='tgl_div_".$uniqid."' style='".$style.";margin-top: -1px;' class='".$toggle_class."'>\n";
     $output .= $code;
     $output .= '</div>';
 

From 70469c49090ebbe5eb588c1ec8f42f4ed2e61dcd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 28 May 2019 18:03:01 +0200
Subject: [PATCH 28/61] Event list agent view

---
 pandora_console/include/functions_events.php  | 39 +++++-----
 pandora_console/include/functions_ui.php      | 74 +++++++++++++++++++
 pandora_console/include/styles/events.css     | 20 +++++
 pandora_console/include/styles/pandora.css    | 45 +++++++++--
 .../operation/agentes/alerts_status.php       | 29 +++++++-
 .../agentes/estado_generalagente.php          |  2 +-
 .../operation/agentes/estado_monitores.php    | 15 +++-
 .../operation/agentes/status_events.php       |  4 +-
 8 files changed, 194 insertions(+), 34 deletions(-)
 create mode 100644 pandora_console/include/styles/events.css

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 4d2238f274..07f9d1d2be 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -959,6 +959,8 @@ function events_print_event_table(
 ) {
     global $config;
 
+    ui_require_css_file('events');
+
     if ($agent_id == 0) {
         $agent_condition = '';
     } else {
@@ -1011,7 +1013,7 @@ function events_print_event_table(
         $table->data = [];
         $table->align = [];
         $table->style[0] = 'width:25px;';
-        $table->style[1] = 'width:25px;';
+        $table->style[1] = 'width:25px;padding: 0;';
         $table->style[2] = 'width:25px;';
         if ($agent_id == 0) {
             $table->style[3] = 'word-break: break-all;';
@@ -1041,6 +1043,11 @@ function events_print_event_table(
         $table->align[5] = 'left';
         $table->size[5] = '15%';
 
+        $table->head[6] = __('Status');
+        $table->headclass[6] = 'datos3 f9';
+        $table->align[6] = 'left';
+        $table->size[6] = '13%';
+
         $all_groups = [];
         if ($agent_id != 0) {
             $all_groups = agents_get_all_groups_agent($agent_id);
@@ -1109,16 +1116,7 @@ function events_print_event_table(
                 break;
             }
 
-            $data[1] = html_print_image(
-                $img,
-                true,
-                [
-                    'class'  => 'image_status',
-                    'width'  => 12,
-                    'height' => 12,
-                    'title'  => get_priority_name($event['criticity']),
-                ]
-            );
+            $data[1] = ui_print_event_priority($event['criticity'], true, true);
 
             // Event type.
             $data[2] = events_print_type_img($event['event_type'], true);
@@ -1135,9 +1133,7 @@ function events_print_event_table(
                 if ($event['id_agente'] > 0) {
                     // Agent name.
                     // Get class name, for the link color, etc.
-                    $myclass = get_priority_class($event['criticity']);
-
-                    $data[4] = "<a class='".$myclass."' href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>';
+                    $data[4] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>';
                     // For System or SNMP generated alerts.
                 } else if ($event['event_type'] == 'system') {
                     $data[4] = __('System');
@@ -1149,12 +1145,17 @@ function events_print_event_table(
             // Timestamp.
             $data[5] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']);
 
-            $class = get_priority_class($event['criticity']);
-            $cell_classes[3] = $class;
-            $cell_classes[4] = $class;
-            $cell_classes[5] = $class;
+            // Status.
+            $data[6] = ui_print_event_priority($event['criticity'], true);
 
-            array_push($table->cellclass, $cell_classes);
+            /*
+                $class = get_priority_class($event['criticity']);
+                $cell_classes[3] = $class;
+                $cell_classes[4] = $class;
+                $cell_classes[5] = $class;
+
+                array_push($table->cellclass, $cell_classes);
+            */
 
             /*
                 Commented out (old).
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2e75e82c6b..006ef0a8d0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2748,6 +2748,80 @@ function ui_progress(
 }
 
 
+/**
+ * Returns a div wich represents the priority received.
+ *
+ * Requires ui_require_css_file('events');.
+ *
+ * @param integer $priority priority level.
+ * @param boolean $return   Or print.
+ * @param boolean $min      Show mini div.
+ *
+ * @return string HTML.
+ */
+function ui_print_event_priority(
+    $priority,
+    $return=false,
+    $mini=false
+) {
+    global $config;
+
+    $output = '';
+    switch ($priority) {
+        case EVENT_CRIT_MAINTENANCE:
+            $color = COL_MAINTENANCE;
+            $criticity = __('MAINTENANCE');
+        break;
+
+        case EVENT_CRIT_INFORMATIONAL:
+            $color = COL_INFORMATIONAL;
+            $criticity = __('INFORMATIONAL');
+        break;
+
+        case EVENT_CRIT_NORMAL:
+            $color = COL_NORMAL;
+            $criticity = __('NORMAL');
+        break;
+
+        case EVENT_CRIT_WARNING:
+            $color = COL_WARNING;
+            $criticity = __('WARNING');
+        break;
+
+        case EVENT_CRIT_CRITICAL:
+            $color = COL_CRITICAL;
+            $criticity = __('CRITICAL');
+        break;
+
+        case EVENT_CRIT_MINOR:
+            $color = COL_MINOR;
+            $criticity = __('MINOR');
+        break;
+
+        case EVENT_CRIT_MAJOR:
+            $color = COL_MAJOR;
+            $criticity = __('MAJOR');
+        break;
+
+        default:
+            $color = COL_UNKNOWN;
+            $criticity = __('UNKNOWN');
+        break;
+    }
+
+    if ($mini === false) {
+        $output = '<div class="criticity" style="background: '.$color.'">';
+        $output .= $criticity;
+        $output .= '</div>';
+    } else {
+        $output = '<div class="mini-criticity" style="background: '.$color.'">';
+        $output .= '</div>';
+    }
+
+    return $output;
+}
+
+
 /**
  * Print a code into a DIV and enable a toggle to show and hide it.
  *
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
new file mode 100644
index 0000000000..cceffc4739
--- /dev/null
+++ b/pandora_console/include/styles/events.css
@@ -0,0 +1,20 @@
+div.criticity {
+  width: 150px;
+  height: 2em;
+  color: #fff;
+  text-align: center;
+  border-radius: 5px;
+  font-size: 1.4em;
+  padding: 0;
+  margin: 0;
+  display: table-cell;
+  vertical-align: middle;
+}
+
+div.mini-criticity {
+  width: 5px;
+  height: 4em;
+  padding: 0;
+  margin: 0;
+  display: inline-block;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2276ee5c3d..48f76a089e 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -453,6 +453,16 @@ select:-internal-list-box {
   max-width: 100%;
 }
 
+.no-padding {
+  padding: 0;
+}
+.no-padding-imp {
+  padding: 0 !important;
+}
+.no-margin {
+  margin: 0;
+}
+
 div#page {
   background: #fbfbfb;
   background-image: none;
@@ -5985,16 +5995,38 @@ div#bullets_modules div {
 
 .agent_details_col_left {
   width: 35%;
-  min-width: 470px;
+  min-width: 300px;
 }
 .agent_details_col_right {
   width: 64%;
-  min-width: 455px;
+  min-width: 480px;
 }
-@media screen and (max-width: 1600px) {
+
+.agent_access_rate_events {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
+.white_table_graph#table_access_rate {
+  flex: 1 1 auto;
+  min-width: 450px;
+  margin-right: 1%;
+}
+
+.white_table_graph#table_events {
+  flex: 1 1 auto;
+  min-width: 450px;
+}
+
+@media screen and (max-width: 1150px) {
   .agent_details_col {
     flex: 1 1 auto;
   }
+  .white_table_graph#table_access_rate {
+    margin-right: 0;
+  }
 }
 
 .buttons_agent_view {
@@ -6083,8 +6115,6 @@ div#status_pie {
 /* White tables to show graphs */
 .white_table_graph {
   margin-bottom: 20px;
-  display: grid;
-  grid-template-rows: max-content;
 }
 
 .white_table_graph_header {
@@ -6121,10 +6151,13 @@ div#status_pie {
   flex-wrap: wrap;
 }
 
-div.white_table_graph_content div.pagination {
+.white_table_graph_content div.pagination {
   width: 100%;
   padding: 0 1em;
 }
+.white_table_graph_content div.action-buttons {
+  padding: 10px;
+}
 
 /* White tables */
 .white_table,
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 7575eaaa9d..9a54ed1b15 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -140,8 +140,10 @@ if ($idAgent != 0) {
 
     $tab = get_parameter('tab', 'main');
 
+    ob_start();
+
     if ($tab == 'main') {
-        echo "<h4 style='padding-top:0px !important;'>".__('Full list of alerts').'</h4>';
+        $agent_view_page = true;
     }
 } else {
     $agent_a = check_acl($config['id_user'], 0, 'AR');
@@ -610,7 +612,12 @@ foreach ($alerts['alerts_simple'] as $alert) {
 }
 
 if (!empty($table->data)) {
-    echo '<form method="post" action="'.$url.'">';
+    $class = '';
+    if ($agent_view_page === true) {
+        $class = 'white_table_graph_content w100p no-padding-imp';
+    }
+
+    echo '<form class="'.$class.'" method="post" action="'.$url.'">';
 
     ui_pagination(
         $countAlertsSimple,
@@ -647,6 +654,22 @@ if (!empty($table->data)) {
     ui_print_info_message(['no_close' => true, 'message' => __('No alerts found') ]);
 }
 
+$html_content = ob_get_clean();
+
+if ($agent_view_page === true) {
+    // Create controlled toggle content.
+    ui_toggle(
+        $html_content,
+        __('Full list of alerts'),
+        'status_monitor_agent',
+        false
+    );
+} else {
+    // Dump entire content.
+    echo $html_content;
+}
+
+
 // strict user hidden
 echo '<div id="strict_hidden" style="display:none;">';
 html_print_input_text('strict_user_hidden', $strict_user);
@@ -716,4 +739,4 @@ ui_require_jquery_file('cluetip');
         }
     }).change();
     
-</script>
\ No newline at end of file
+</script>
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 2f1346f958..27bcfcafa1 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -817,7 +817,7 @@ echo '<div id="agent_details_first_row">
 
 // Show both graphs, events and access rate.
 if ($table_access_rate) {
-    echo '<div style="display:grid; grid-template-columns: 1fr 1fr; grid-column-gap: 20px;">'.$table_access_rate.$table_events.'</div>';
+    echo '<div class="agent_access_rate_events">'.$table_access_rate.$table_events.'</div>';
 } else {
     echo '<div style="width: 100%">'.$table_events.'</div>';
 }
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index c3f9a0d433..ed98b11a99 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -492,11 +492,13 @@ function print_form_filter_monitors(
     $form_text = '';
     $table = new stdClass();
     $table->class = 'info_table';
-    $table->styleTable = 'width: 100%;border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
+    $table->styleTable = 'border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
     $table->width = '100%';
     $table->style[0] = 'font-weight: bold;';
     $table->style[2] = 'font-weight: bold;';
     $table->style[4] = 'font-weight: bold;';
+    $table->style[6] = 'font-weight: bold;';
+    $table->style[6] = 'min-width: 150px;';
     $table->data[0][0] = html_print_input_hidden('filter_monitors', 1, true);
     $table->data[0][0] .= html_print_input_hidden('monitors_change_filter', 1, true);
     $table->data[0][0] .= __('Status:');
@@ -525,7 +527,14 @@ function print_form_filter_monitors(
         true
     );
 
-    $table->data[0][3] = html_print_input_text('status_text_monitor', $status_text_monitor, '', 30, 100, true);
+    $table->data[0][3] = html_print_input_text(
+        'status_text_monitor',
+        $status_text_monitor,
+        '',
+        '',
+        100,
+        true
+    );
     $table->data[0][4] = __('Module group');
     $rows = db_get_all_rows_sql(
         sprintf(
@@ -575,7 +584,7 @@ function print_form_filter_monitors(
         'class="sub search"',
         true
     );
-    $table->data[0][8] = '&nbsp;'.html_print_button(
+    $table->data[0][8] = html_print_button(
         __('Reset'),
         'filter',
         false,
diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php
index 825a4c2c42..9313a5642c 100755
--- a/pandora_console/operation/agentes/status_events.php
+++ b/pandora_console/operation/agentes/status_events.php
@@ -20,9 +20,9 @@ if (!isset($id_agente)) {
 }
 
 require_once 'include/functions_events.php';
-
+ui_require_css_file('events');
 ui_toggle(
-    "<div id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
+    "<div class='white_table_graph_content' id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
     __('Latest events for this agent'),
     __('Latest events for this agent'),
     false

From c8649a8dc4a33aa1b2c99e26fcd2567ba28d2e0f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 11:21:57 +0200
Subject: [PATCH 29/61] Styles

---
 .../godmode/agentes/configurar_agente.php     |   1 +
 pandora_console/include/functions_events.php  |   2 +-
 pandora_console/include/functions_ui.php      |  80 ++++++++-
 .../include/styles/agent_manager.css          | 158 +++++++++++++++++
 pandora_console/include/styles/agent_view.css |   7 +
 pandora_console/include/styles/pandora.css    | 159 ------------------
 .../agentes/estado_generalagente.php          |   1 +
 .../operation/agentes/ver_agente.php          |   1 +
 8 files changed, 247 insertions(+), 162 deletions(-)
 create mode 100644 pandora_console/include/styles/agent_manager.css
 create mode 100644 pandora_console/include/styles/agent_view.css

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 2d070944db..46ead7da19 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -35,6 +35,7 @@ enterprise_include_once('include/functions_modules.php');
 require_once $config['homedir'].'/include/functions_agents.php';
 require_once $config['homedir'].'/include/functions_cron.php';
 ui_require_javascript_file('encode_decode_base64');
+ui_require_css_file('agent_manager');
 
 check_login();
 
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index c94fa7500d..8cfb587eb2 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1146,7 +1146,7 @@ function events_print_event_table(
             $data[5] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']);
 
             // Status.
-            $data[6] = ui_print_event_priority($event['criticity'], true);
+            $data[6] = ui_print_event_type($event['event_type'], true);
 
             /*
                 $class = get_priority_class($event['criticity']);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 006ef0a8d0..05e93df661 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2748,14 +2748,90 @@ function ui_progress(
 }
 
 
+/**
+ * Returns a div wich represents the type received.
+ *
+ * Requires ui_require_css_file('events');.
+ *
+ * @param integer $type   Event type.
+ * @param boolean $return Or print.
+ * @param boolean $mini   Show mini div.
+ *
+ * @return string HTML.
+ */
+function ui_print_event_type(
+    $type,
+    $return=false,
+    $mini=false
+) {
+    global $config;
+
+    $output = '';
+    switch ($type) {
+        case EVENTS_ALERT_FIRED:
+        case EVENTS_ALERT_RECOVERED:
+        case EVENTS_ALERT_CEASED:
+        case EVENTS_ALERT_MANUAL_VALIDATION:
+            $text = __('ALERT');
+            $color = COL_ALERTFIRED;
+        break;
+
+        case EVENTS_RECON_HOST_DETECTED:
+        case EVENTS_SYSTEM:
+        case EVENTS_ERROR:
+        case EVENTS_NEW_AGENT:
+        case EVENTS_CONFIGURATION_CHANGE:
+            $text = __('SYSTEM');
+            $color = COL_MAINTENANCE;
+        break;
+
+        case EVENTS_GOING_UP_WARNING:
+        case EVENTS_GOING_DOWN_WARNING:
+            $color = COL_WARNING;
+            $text = __('WARNING');
+        break;
+
+        case EVENTS_GOING_DOWN_NORMAL:
+        case EVENTS_GOING_UP_NORMAL:
+            $color = COL_NORMAL;
+            $text = __('NORMAL');
+        break;
+
+        case EVENTS_GOING_DOWN_CRITICAL:
+        case EVENTS_GOING_UP_CRITICAL:
+            $color = COL_CRITICAL;
+            $text = __('CRITICAL');
+        break;
+
+        case EVENTS_UNKNOWN:
+        case EVENTS_GOING_UNKNOWN:
+        default:
+            $color = COL_UNKNOWN;
+            $text = __('UNKNOWN');
+        break;
+    }
+
+    if ($mini === false) {
+        $output = '<div class="criticity" style="background: '.$color.'">';
+        $output .= $text;
+        $output .= '</div>';
+    } else {
+        $output = '<div class="mini-criticity" style="background: '.$color.'">';
+        $output .= '</div>';
+    }
+
+    return $output;
+}
+
+
 /**
  * Returns a div wich represents the priority received.
  *
  * Requires ui_require_css_file('events');.
  *
- * @param integer $priority priority level.
+ * @param integer $priority Priority level.
  * @param boolean $return   Or print.
- * @param boolean $min      Show mini div.
+ * @param boolean $mini     Show mini div.
  *
  * @return string HTML.
  */
diff --git a/pandora_console/include/styles/agent_manager.css b/pandora_console/include/styles/agent_manager.css
new file mode 100644
index 0000000000..fc648aefba
--- /dev/null
+++ b/pandora_console/include/styles/agent_manager.css
@@ -0,0 +1,158 @@
+/*
+ * ---------------------------------------------------------------------
+ * - Create/Update Agent - agent_manager.php
+ * ---------------------------------------------------------------------
+ */
+.agent_options {
+  width: 100%;
+  margin-right: 0px;
+  display: flex;
+  flex-flow: row wrap;
+  flex-direction: row;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+
+.agent_options_update {
+  width: 85%;
+  margin-right: 20px;
+}
+
+.agent_options_column_left,
+.agent_options_column_right {
+  width: 50%;
+  box-sizing: border-box;
+}
+
+.agent_options_column_left {
+  padding-right: 50px;
+}
+
+.agent_qr {
+  width: 15%;
+  text-align: center;
+  box-sizing: border-box;
+  padding: 20px 0px;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  min-width: 150px;
+}
+
+a#qr_code_agent_view {
+  margin-top: 5px;
+}
+
+.first_row .agent_options_column_right select,
+.first_row .agent_options_column_right input,
+.first_row .agent_options_column_left select#grupo {
+  width: 95%;
+  box-sizing: border-box;
+}
+
+.first_row .agent_options_column_left .p-switch {
+  margin-right: 5px;
+  margin-left: 10px;
+}
+
+.agent_options_column_left input#text-direccion,
+.agent_options_column_left select#address_list,
+.agent_options_column_left input#text-agente,
+.agent_options_column_left input#text-alias {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.agent_options_agent_name > * {
+  margin-left: 5px;
+}
+
+.custom_fields_table {
+  border-spacing: 0px;
+}
+
+.custom_fields_table tr.datos {
+  background-color: #f7f7f7;
+  display: none;
+}
+
+.custom_fields_table tr.datos2 {
+  cursor: pointer;
+}
+
+.custom_fields_table tr td {
+  border: 1px solid #e0e0e0;
+}
+
+.custom_fields_table tr.datos2 td div.field_title {
+  padding: 10px;
+}
+
+.custom_fields_table tr.datos2 td {
+  border-radius: 4px;
+  padding: 0px;
+}
+
+.custom_fields_table tr.datos td {
+  padding: 15px 10px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+.custom_fields_table .custom_field_row_opened td {
+  border-bottom-left-radius: 0px !important;
+  border-bottom-right-radius: 0px !important;
+}
+
+.secondary_groups_select {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 15px;
+}
+
+.secondary_groups_select .secondary_groups_select_arrows input {
+  display: grid;
+  margin: 0 auto;
+}
+
+.secondary_groups_select .secondary_groups_list_left {
+  text-align: right;
+  width: 50%;
+}
+
+.secondary_groups_select .secondary_groups_list_right {
+  text-align: left;
+  width: 50%;
+}
+
+.secondary_groups_select .secondary_groups_select_arrows {
+  padding: 0 50px;
+}
+
+.secondary_groups_select_arrows a {
+  display: block;
+}
+
+.agent_options_adv .agent_options_column_right .label_select select,
+.agent_options_adv .agent_options_column_right .label_select input[type="text"],
+.agent_options_adv #text-custom_id,
+.agent_options_adv #cps {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.agent_options_adv .label_select_simple.label_simple_one_item .p-switch {
+  margin-right: 5px;
+}
+
+.agent_description {
+  min-height: 4.8em !important;
+}
+.agent_custom_id {
+  padding-bottom: 0.7em;
+  padding-top: 0.5em;
+  display: inline-block;
+  border-radius: 5px !important;
+  border: 1px solid #ccc;
+}
diff --git a/pandora_console/include/styles/agent_view.css b/pandora_console/include/styles/agent_view.css
new file mode 100644
index 0000000000..713ff5ad7f
--- /dev/null
+++ b/pandora_console/include/styles/agent_view.css
@@ -0,0 +1,7 @@
+text.text-tooltip {
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
+
+div#bullets_modules span {
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8582484509..320c4289ef 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5660,165 +5660,6 @@ table.info_table.policy_sub_table {
   margin-bottom: 4px;
 }
 
-/*
- * ---------------------------------------------------------------------
- * - Create/Update Agent - agent_manager.php
- * ---------------------------------------------------------------------
- */
-.agent_options {
-  width: 100%;
-  margin-right: 0px;
-  display: flex;
-  flex-flow: row wrap;
-  flex-direction: row;
-  justify-content: space-between;
-  box-sizing: border-box;
-}
-
-.agent_options_update {
-  width: 85%;
-  margin-right: 20px;
-}
-
-.agent_options_column_left,
-.agent_options_column_right {
-  width: 50%;
-  box-sizing: border-box;
-}
-
-.agent_options_column_left {
-  padding-right: 50px;
-}
-
-.agent_qr {
-  width: 15%;
-  text-align: center;
-  box-sizing: border-box;
-  padding: 20px 0px;
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  min-width: 150px;
-}
-
-a#qr_code_agent_view {
-  margin-top: 5px;
-}
-
-.first_row .agent_options_column_right select,
-.first_row .agent_options_column_right input,
-.first_row .agent_options_column_left select#grupo {
-  width: 95%;
-  box-sizing: border-box;
-}
-
-.first_row .agent_options_column_left .p-switch {
-  margin-right: 5px;
-  margin-left: 10px;
-}
-
-.agent_options_column_left input#text-direccion,
-.agent_options_column_left select#address_list,
-.agent_options_column_left input#text-agente,
-.agent_options_column_left input#text-alias {
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.agent_options_agent_name > * {
-  margin-left: 5px;
-}
-
-.custom_fields_table {
-  border-spacing: 0px;
-}
-
-.custom_fields_table tr.datos {
-  background-color: #f7f7f7;
-  display: none;
-}
-
-.custom_fields_table tr.datos2 {
-  cursor: pointer;
-}
-
-.custom_fields_table tr td {
-  border: 1px solid #e0e0e0;
-}
-
-.custom_fields_table tr.datos2 td div.field_title {
-  padding: 10px;
-}
-
-.custom_fields_table tr.datos2 td {
-  border-radius: 4px;
-  padding: 0px;
-}
-
-.custom_fields_table tr.datos td {
-  padding: 15px 10px;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
-}
-
-.custom_fields_table .custom_field_row_opened td {
-  border-bottom-left-radius: 0px !important;
-  border-bottom-right-radius: 0px !important;
-}
-
-.secondary_groups_select {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-bottom: 15px;
-}
-
-.secondary_groups_select .secondary_groups_select_arrows input {
-  display: grid;
-  margin: 0 auto;
-}
-
-.secondary_groups_select .secondary_groups_list_left {
-  text-align: right;
-  width: 50%;
-}
-
-.secondary_groups_select .secondary_groups_list_right {
-  text-align: left;
-  width: 50%;
-}
-
-.secondary_groups_select .secondary_groups_select_arrows {
-  padding: 0 50px;
-}
-
-.secondary_groups_select_arrows a {
-  display: block;
-}
-
-.agent_options_adv .agent_options_column_right .label_select select,
-.agent_options_adv .agent_options_column_right .label_select input[type="text"],
-.agent_options_adv #text-custom_id,
-.agent_options_adv #cps {
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.agent_options_adv .label_select_simple.label_simple_one_item .p-switch {
-  margin-right: 5px;
-}
-
-.agent_description {
-  min-height: 4.8em !important;
-}
-.agent_custom_id {
-  padding-bottom: 0.7em;
-  padding-top: 0.5em;
-  display: inline-block;
-  border-radius: 5px !important;
-  border: 1px solid #ccc;
-}
-
 /*
  * ---------------------------------------------------------------------
  * - CLASSES FOR THE NEW TOGGLES                     								-
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index de8a5e6c79..7aa48d3006 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -82,6 +82,7 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')
     return;
 }
 
+
 /*
  * START: TABLE AGENT BUILD.
  */
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 12ebe35082..557f9d78b6 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -37,6 +37,7 @@ require_once $config['homedir'].'/include/functions_users.php';
 enterprise_include_once('include/functions_metaconsole.php');
 
 ui_require_javascript_file('openlayers.pandora');
+ui_require_css_file('agent_view');
 
 enterprise_include_once('operation/agentes/ver_agente.php');
 

From 5ec162e058f7a85c69baa39ca291555e9e8ae08c Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 11:24:17 +0200
Subject: [PATCH 30/61] Data title events

---
 pandora_console/include/functions_ui.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 05e93df661..48a4a52fe0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2816,7 +2816,11 @@ function ui_print_event_type(
         $output .= $text;
         $output .= '</div>';
     } else {
-        $output = '<div class="mini-criticity" style="background: '.$color.'">';
+        $output = '<div data-title="';
+        $output .= $text;
+        $output .= '" data-use_title_for_force_title="1" ';
+        $output .= 'class="forced_title mini-criticity" ';
+        $output .= 'style="background: '.$color.'">';
         $output .= '</div>';
     }
 
@@ -2890,7 +2894,11 @@ function ui_print_event_priority(
         $output .= $criticity;
         $output .= '</div>';
     } else {
-        $output = '<div class="mini-criticity" style="background: '.$color.'">';
+        $output = '<div data-title="';
+        $output .= $criticity;
+        $output .= '" data-use_title_for_force_title="1" ';
+        $output .= 'class="forced_title mini-criticity" ';
+        $output .= 'style="background: '.$color.'">';
         $output .= '</div>';
     }
 

From 37af0ad612ac2f2b7d268c777c7b8adcd77a1a7a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 12:06:05 +0200
Subject: [PATCH 31/61] Styles

---
 pandora_console/include/ajax/module.php       |  7 ++-
 pandora_console/include/styles/agent_view.css | 12 +++++
 pandora_console/include/styles/events.css     |  2 +-
 pandora_console/include/styles/pandora.css    | 12 +++++
 .../agentes/estado_generalagente.php          | 51 +++++++++++++------
 .../operation/agentes/estado_monitores.php    |  7 +--
 6 files changed, 70 insertions(+), 21 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 42cd794ada..76dc24e145 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -823,7 +823,6 @@ if (check_login()) {
         $table->head[6] = __('Thresholds');
         $table->head[7] = __('Data');
         $table->head[8] = __('Graph');
-        $table->headstyle[8] = 'min-width: 60px';
         $table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
         $table->align = [
             'left',
@@ -837,6 +836,12 @@ if (check_login()) {
             'left',
         ];
 
+        $table->headstyle[2] = 'min-width: 60px';
+        $table->headstyle[3] = 'min-width: 100px';
+        $table->headstyle[5] = 'min-width: 60px';
+        $table->headstyle[8] = 'min-width: 85px';
+        $table->headstyle[9] = 'min-width: 100px';
+
         $last_modulegroup = 0;
         $rowIndex = 0;
 
diff --git a/pandora_console/include/styles/agent_view.css b/pandora_console/include/styles/agent_view.css
index 713ff5ad7f..fca8aaa4fc 100644
--- a/pandora_console/include/styles/agent_view.css
+++ b/pandora_console/include/styles/agent_view.css
@@ -5,3 +5,15 @@ text.text-tooltip {
 div#bullets_modules span {
   font-family: "lato-bolder", "Open Sans", sans-serif !important;
 }
+
+table#agent_interface_info .noresizevc.graph {
+  width: 500px !important;
+}
+
+div.agent_details_agent_alias {
+  flex: 1;
+}
+
+div.agent_details_agent_alias * {
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+}
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index cceffc4739..ef0244490e 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -4,7 +4,7 @@ div.criticity {
   color: #fff;
   text-align: center;
   border-radius: 5px;
-  font-size: 1.4em;
+  font-size: 1.2em;
   padding: 0;
   margin: 0;
   display: table-cell;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 320c4289ef..3e42319d92 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5994,6 +5994,18 @@ div#status_pie {
   flex-wrap: wrap;
 }
 
+.white_table_graph_content.min-height-100 {
+  min-height: 100px;
+}
+
+.white_table_graph_content.min-height-50 {
+  min-height: 50px;
+}
+
+.white_table_graph_content.min-height-200 {
+  min-height: 200px;
+}
+
 .white_table_graph_content div.pagination {
   width: 100%;
   padding: 0 1em;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 7aa48d3006..5c9e5e03ff 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -101,7 +101,6 @@ $in_planned_downtime = db_get_sql(
 	WHERE tplanned_downtime_agents.id_agent = '.$agent['id_agente'].' AND tplanned_downtime.executed = 1'
 );
 
-
 if ($agent['disabled']) {
     if ($in_planned_downtime) {
         $agent_name = '<em>'.$agent_name.ui_print_help_tip(__('Disabled'), true);
@@ -134,7 +133,10 @@ if ($in_planned_downtime && !$agent['disabled'] && !$agent['quiet']) {
     ).'</em>';
 }
 
-$table_agent_header = '<div class="agent_details_agent_name">';
+$table_agent_header = '<div class="agent_details_agent_alias">';
+$table_agent_header .= $agent_name;
+$table_agent_header .= '</div>';
+$table_agent_header .= '<div class="agent_details_agent_name">';
 if (!$config['show_group_name']) {
     $table_agent_header .= ui_print_group_icon(
         $agent['id_grupo'],
@@ -239,18 +241,20 @@ if ($has_remote_conf) {
 
 // $table_agent_count_modules .= ui_print_help_tip(__('Agent statuses are re-calculated by the server, they are not  shown in real time.'), true);
 $table_agent = '
-    <div class="agent_details_header">'.$table_agent_header.'</div>
-        <div class="agent_details_content">
-            <div class="agent_details_graph">
-                '.$table_agent_graph.'
-                <div class="agent_details_bullets">
-                    '.$table_agent_count_modules.'
-                </div>
+    <div class="agent_details_header">
+        '.$table_agent_header.'
+    </div>
+    <div class="agent_details_content">
+        <div class="agent_details_graph">
+            '.$table_agent_graph.'
+            <div class="agent_details_bullets">
+                '.$table_agent_count_modules.'
             </div>
-            <div class="agent_details_info">
-                '.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
-            </div>
-        </div>';
+        </div>
+        <div class="agent_details_info">
+            '.$table_agent_os.$table_agent_ip.$table_agent_version.$table_agent_description.$remote_cfg.'
+        </div>
+    </div>';
 
 /*
  * END: TABLE AGENT BUILD.
@@ -505,7 +509,8 @@ if ($config['agentaccess'] && $access_agent > 0) {
         'images/arrow_down_green.png',
         true
     ).'<span>'.__('Agent access rate (24h)').'</span></div>
-                            <div class="white_table_graph_content">'.graphic_agentaccess(
+    <div class="white_table_graph_content min-height-100">
+'.graphic_agentaccess(
         $id_agente,
         '95%',
         100,
@@ -624,7 +629,14 @@ if (!empty($network_interfaces)) {
                 $params_json = json_encode($params);
                 $params_encoded = base64_encode($params_json);
                 $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
-                $graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=$params_encoded','$win_handle', 1000, 650)\">".html_print_image('images/chart_curve.png', true, ['title' => __('Interface traffic')]).'</a>';
+                $graph_link = "<a href=\"javascript:winopeng_var('operation/agentes/interface_traffic_graph_win.php?params=";
+                $graph_link .= $params_encoded."','";
+                $graph_link .= $win_handle."', 1000, 650)\">";
+                $graph_link .= html_print_image(
+                    'images/chart_curve.png',
+                    true,
+                    ['title' => __('Interface traffic')]
+                ).'</a>';
             } else {
                 $graph_link = '';
             }
@@ -785,12 +797,19 @@ if (!empty($network_interfaces)) {
     </script>
 <?php
 // EVENTS.
+if ($config['agentaccess'] && $access_agent > 0) {
+    $extra_class = 'min-height-100';
+} else {
+    $extra_class = '';
+}
+
 $table_events = '<div class="white_table_graph" id="table_events">
             <div class="white_table_graph_header">'.html_print_image(
     'images/arrow_down_green.png',
     true
 ).'<span>'.__('Events (24h)').'</span></div>
-            <div class="white_table_graph_content">'.graph_graphic_agentevents(
+            <div class="white_table_graph_content '.$extra_class.'">
+'.graph_graphic_agentevents(
     $id_agente,
     100,
     45,
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index ed98b11a99..b841ff5c73 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -149,7 +149,9 @@ $sort = get_parameter('sort', 'up');
 
 $modules_not_init = agents_monitor_notinit($id_agente);
 if (!empty($modules_not_init)) {
-    echo clippy_context_help('modules_not_init');
+    $help_not_init = clippy_context_help('modules_not_init');
+} else {
+    $help_not_init = '';
 }
 
 ob_start();
@@ -161,7 +163,6 @@ print_form_filter_monitors(
     $status_hierachy_mode
 );
 
-echo '<div class="white_table_graph_content" id="module_list_loading">'.html_print_image('images/spinner.gif', true).'</div>';
 echo '<div class="white_table_graph_content" style="padding: 0;" id="module_list"></div>';
 
 $html_toggle = ob_get_clean();
@@ -171,7 +172,7 @@ ui_toggle(
     __('List of modules').ui_print_help_tip(
         __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
         true
-    ).reporting_tiny_stats(
+    ).$help_not_init.reporting_tiny_stats(
         $agent,
         true,
         'modules',

From 487ff53825736e74c6e699f9913acba6f0ebf70d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 12:09:45 +0200
Subject: [PATCH 32/61] Min. fields lenght headers

---
 .../godmode/wizards/DiscoveryTaskList.class.php        | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 4aa172bb35..7da9ca15f2 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -377,13 +377,15 @@ class DiscoveryTaskList extends Wizard
             }
 
             // Status.
-            $table->headstyle[5] .= 'width: 100px';
+            $table->headstyle[5] .= 'min-width: 100px; width: 100px;';
+            // Task type.
+            $table->headstyle[6] .= 'min-width: 150px; width: 150px;';
             // Progress.
-            $table->headstyle[7] .= 'width: 150px';
+            $table->headstyle[7] .= 'min-width: 150px; width: 150px;';
             // Updated at.
-            $table->headstyle[8] .= 'width: 150px';
+            $table->headstyle[8] .= 'min-width: 150px; width: 150px;';
             // Operations.
-            $table->headstyle[9] .= 'width: 150px';
+            $table->headstyle[9] .= 'min-width: 150px; width: 150px;';
 
             $table->head[0] = __('Force');
             $table->align[0] = 'left';

From ca083556c3eac0889e3e734fe8e4d4f4fbc5357f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 12:23:54 +0200
Subject: [PATCH 33/61] minor alignment select-multiple

---
 pandora_console/include/styles/pandora.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 3e42319d92..1f39a66536 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5111,7 +5111,7 @@ input:checked + .p-slider:before {
 
 #autorefresh_list_out,
 #autorefresh_list {
-  text-align: center;
+  text-align: left;
 }
 
 .autorefresh_select .autorefresh_select_list_out,

From 49dee1e2bc9082e177a2aa6f1673a3a37ff483f7 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 12:42:55 +0200
Subject: [PATCH 34/61] Next contact to seconds

---
 pandora_console/include/functions_ui.php               | 10 ++++++++--
 .../operation/agentes/estado_generalagente.php         |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 48a4a52fe0..c67db8fb2f 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2712,6 +2712,7 @@ function ui_print_module_status(
  * @param integer $height   Height in 'em'.
  * @param string  $color    Color.
  * @param boolean $return   Return or paint (if false).
+ * @param boolean $text     Text to be displayed,by default progress %.
  *
  * @return string HTML code.
  */
@@ -2720,7 +2721,8 @@ function ui_progress(
     $width='100%',
     $height='2.5',
     $color='#80ba27',
-    $return=true
+    $return=true,
+    $text=''
 ) {
     if (!$progress) {
         $progress = 0;
@@ -2734,9 +2736,13 @@ function ui_progress(
         $progress = 0;
     }
 
+    if (empty($text)) {
+        $text = $progress.'%';
+    }
+
     ui_require_css_file('progress');
     $output .= '<div class="progress_main" style="width: '.$width.'; height: '.$height.'em; border: 1px solid '.$color.'">';
-    $output .= '<span class="progress_text" style="font-size:'.($height - 0.5).'em;">'.$progress.'%</span>';
+    $output .= '<span class="progress_text" style="font-size:'.($height - 0.5).'em;">'.$text.'</span>';
     $output .= '<div class="progress" style="width: '.$progress.'%; background: '.$color.'"></div>';
     $output .= '</div>';
 
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 5c9e5e03ff..c4beec6aa0 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -314,7 +314,14 @@ $table_contact->data[] = $data;
 
 $data = [];
 $table_contact->colspan[3][0] = 2;
-$data[0] = ui_progress($progress, '80%');
+$data[0] = ui_progress(
+    $progress,
+    '60%',
+    2,
+    '#BBB',
+    true,
+    ($agent['intervalo'] * (100 - $progress) / 100).' s'
+);
 
 if ($progress > 100) {
     $data[0] .= clippy_context_help('agent_out_of_limits');

From 505229abe4f5dbce3d5b336c530220dbec55e20e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 13:03:58 +0200
Subject: [PATCH 35/61] minor style change - box

---
 pandora_console/include/functions_ui.php                  | 2 +-
 pandora_console/include/styles/pandora.css                | 8 ++++++--
 .../operation/agentes/estado_generalagente.php            | 8 ++++----
 pandora_console/operation/agentes/estado_monitores.php    | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index c67db8fb2f..e497b7bad1 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2947,7 +2947,7 @@ function ui_toggle(
     }
 
     // Link to toggle.
-    $output = '<div class="white_table_graph">';
+    $output = '<div class="box-shadow white_table_graph">';
     $output .= '<div class="white_table_graph_header" style="cursor: pointer;" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 75d7c35402..964a704cf8 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -462,6 +462,9 @@ select:-internal-list-box {
 .no-margin {
   margin: 0;
 }
+.box-shadow {
+  box-shadow: 0px 0px 15px -4px #dadada;
+}
 
 div#page {
   background: #fbfbfb;
@@ -5838,11 +5841,11 @@ div#bullets_modules div {
 }
 
 .agent_details_col_left {
-  width: 35%;
+  width: 40%;
   min-width: 300px;
 }
 .agent_details_col_right {
-  width: 64%;
+  width: 59%;
   min-width: 480px;
 }
 
@@ -5927,6 +5930,7 @@ div#status_pie {
 .agent_details_info {
   max-width: 45%;
   overflow: hidden;
+  min-width: 220px;
 }
 .agent_details_info span {
   text-overflow: ellipsis;
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index c4beec6aa0..d5ffa38c1f 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -511,7 +511,7 @@ $access_agent = db_get_value_sql(
 );
 
 if ($config['agentaccess'] && $access_agent > 0) {
-    $table_access_rate = '<div class="white_table_graph" id="table_access_rate">
+    $table_access_rate = '<div class="box-shadow white_table_graph" id="table_access_rate">
                             <div class="white_table_graph_header">'.html_print_image(
         'images/arrow_down_green.png',
         true
@@ -810,7 +810,7 @@ if ($config['agentaccess'] && $access_agent > 0) {
     $extra_class = '';
 }
 
-$table_events = '<div class="white_table_graph" id="table_events">
+$table_events = '<div class="box-shadow white_table_graph" id="table_events">
             <div class="white_table_graph_header">'.html_print_image(
     'images/arrow_down_green.png',
     true
@@ -838,8 +838,8 @@ $agent_info = empty($table_data->data) ? '' : html_print_table($table_data, true
 $agent_incidents = !isset($table_incident) ? '' : html_print_table($table_incident, true);
 
 echo '<div id="agent_details_first_row">
-    <div class="agent_details_col agent_details_col_left">'.$table_agent.'</div>
-    <div class="agent_details_col agent_details_col_right">'.$agent_contact.'</div>
+    <div class="box-shadow agent_details_col agent_details_col_left">'.$table_agent.'</div>
+    <div class="box-shadow agent_details_col agent_details_col_right">'.$agent_contact.'</div>
     </div>'.$agent_info;
 
 // Show both graphs, events and access rate.
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index b841ff5c73..387731e24b 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -163,7 +163,7 @@ print_form_filter_monitors(
     $status_hierachy_mode
 );
 
-echo '<div class="white_table_graph_content" style="padding: 0;" id="module_list"></div>';
+echo '<div class="box-shadow white_table_graph_content" style="padding: 0;" id="module_list"></div>';
 
 $html_toggle = ob_get_clean();
 

From 72999244c2ba454c9197f51b63a8517ad15c0a64 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 13:13:01 +0200
Subject: [PATCH 36/61] 
 pandora_console/operation/agentes/estado_generalagente.php

---
 pandora_console/include/styles/pandora.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 964a704cf8..0e81f3e777 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -465,6 +465,9 @@ select:-internal-list-box {
 .box-shadow {
   box-shadow: 0px 0px 15px -4px #dadada;
 }
+.align-top td {
+  vertical-align: top;
+}
 
 div#page {
   background: #fbfbfb;

From 3046cc5224830e7f1d3555c38bff1c6b58c3f7bc Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 13:13:24 +0200
Subject: [PATCH 37/61] Style align-top

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

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index d5ffa38c1f..644879733f 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -375,7 +375,7 @@ $table_data->id = 'agent_data_main';
 $table_data->width = '100%';
 $table_data->cellspacing = 0;
 $table_data->cellpadding = 0;
-$table_data->class = 'white_table white_table_droppable';
+$table_data->class = 'white_table white_table_droppable align-top';
 $table_data->style = array_fill(0, 3, 'width: 25%;');
 
 $table_data->head[0] = html_print_image(

From 8bd4a2f8f79fef6f8ce7eb91b333b0739df2da8e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 13:20:31 +0200
Subject: [PATCH 38/61] Style align-top

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

diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 644879733f..cd30819b23 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -375,7 +375,7 @@ $table_data->id = 'agent_data_main';
 $table_data->width = '100%';
 $table_data->cellspacing = 0;
 $table_data->cellpadding = 0;
-$table_data->class = 'white_table white_table_droppable align-top';
+$table_data->class = 'box-shadow white_table white_table_droppable align-top';
 $table_data->style = array_fill(0, 3, 'width: 25%;');
 
 $table_data->head[0] = html_print_image(

From f58d1bc6ee300ffec5cb388b0c99e5a41a7048de Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 15:14:13 +0200
Subject: [PATCH 39/61] Styling review

---
 pandora_console/include/functions_events.php  | 128 +++++++-----------
 pandora_console/include/styles/events.css     |   4 +-
 pandora_console/include/styles/pandora.css    |  23 ++--
 .../agentes/estado_generalagente.php          |  12 +-
 .../operation/agentes/tactical.php            |   4 +-
 5 files changed, 68 insertions(+), 103 deletions(-)

diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 8cfb587eb2..7f1118ce3f 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -999,7 +999,7 @@ function events_print_event_table(
         $table->cellpadding = 0;
         $table->cellspacing = 0;
         $table->width = $width;
-        $table->class = 'info_table';
+        $table->class = 'info_table no-td-padding';
         if (!$tactical_view) {
             $table->title = __('Latest events');
         }
@@ -1012,41 +1012,38 @@ function events_print_event_table(
         $table->cellclass = [];
         $table->data = [];
         $table->align = [];
-        $table->style[0] = 'width:25px;';
-        $table->style[1] = 'width:25px;padding: 0;';
-        $table->style[2] = 'width:25px;';
-        if ($agent_id == 0) {
-            $table->style[3] = 'word-break: break-all;';
-        }
+        $table->style = [];
 
-        $table->style[4] = 'width:120px; word-break: break-all;';
+        $i = 0;
+        $table->head[$i] = "<span title='".__('Severity')."'>".__('S.').'</span>';
+        $table->headstyle[$i] = 'width: 1%;text-align: center;';
+        $table->style[$i++] = 'text-align: center;';
 
-        $table->head[0] = "<span title='".__('Validated')."'>".__('V.').'</span>';
-        $table->align[0] = 'center';
+        $table->head[$i] = __('Type');
+        $table->headstyle[$i] = 'width: 3%;text-align: center;';
+        $table->style[$i++] = 'text-align: center;';
 
-        $table->head[1] = "<span title='".__('Severity')."'>".__('S.').'</span>';
-        $table->align[1] = 'center';
-
-        $table->head[2] = __('Type');
-        $table->headclass[2] = 'datos3 f9';
-        $table->align[2] = 'center';
-
-        $table->head[3] = __('Event name');
+        $table->head[$i] = __('Event name');
+        $table->headstyle[$i] = '';
+        $table->style[$i++] = 'word-break: break-word;';
 
         if ($agent_id == 0) {
-            $table->head[4] = __('Agent name');
-            $table->size[4] = '15%';
+            $table->head[$i] = __('Agent name');
+            $table->headstyle[$i] = '';
+            $table->style[$i++] = 'word-break: break-all;';
         }
 
-        $table->head[5] = __('Timestamp');
-        $table->headclass[5] = 'datos3 f9';
-        $table->align[5] = 'left';
-        $table->size[5] = '15%';
+        $table->head[$i] = __('Timestamp');
+        $table->headstyle[$i] = 'width: 120px;';
+        $table->style[$i++] = 'word-break: break-word;';
 
-        $table->head[6] = __('Status');
-        $table->headclass[6] = 'datos3 f9';
-        $table->align[6] = 'left';
-        $table->size[6] = '13%';
+        $table->head[$i] = __('Status');
+        $table->headstyle[$i] = 'width: 150px;text-align: center;';
+        $table->style[$i++] = 'text-align: center;';
+
+        $table->head[$i] = "<span title='".__('Validated')."'>".__('V.').'</span>';
+        $table->headstyle[$i] = 'width: 1%;text-align: center;';
+        $table->style[$i++] = 'text-align: center;';
 
         $all_groups = [];
         if ($agent_id != 0) {
@@ -1085,44 +1082,15 @@ function events_print_event_table(
                 break;
             }
 
-            $data[0] = html_print_image(
-                $img,
-                true,
-                [
-                    'class' => 'image_status',
-                    'title' => $title,
-                ]
-            );
-
-            switch ($event['criticity']) {
-                default:
-                case EVENT_CRIT_MAINTENANCE:
-                    $img = 'images/status_sets/default/severity_maintenance.png';
-                break;
-                case EVENT_CRIT_INFORMATIONAL:
-                    $img = 'images/status_sets/default/severity_informational.png';
-                break;
-
-                case EVENT_CRIT_NORMAL:
-                    $img = 'images/status_sets/default/severity_normal.png';
-                break;
-
-                case EVENT_CRIT_WARNING:
-                    $img = 'images/status_sets/default/severity_warning.png';
-                break;
-
-                case EVENT_CRIT_CRITICAL:
-                    $img = 'images/status_sets/default/severity_critical.png';
-                break;
-            }
-
-            $data[1] = ui_print_event_priority($event['criticity'], true, true);
+            $i = 0;
+            // Criticity.
+            $data[$i++] = ui_print_event_priority($event['criticity'], true, true);
 
             // Event type.
-            $data[2] = events_print_type_img($event['event_type'], true);
+            $data[$i++] = events_print_type_img($event['event_type'], true);
 
             // Event text.
-            $data[3] = ui_print_string_substr(
+            $data[$i++] = ui_print_string_substr(
                 strip_tags(io_safe_output($event['evento'])),
                 75,
                 true,
@@ -1133,36 +1101,32 @@ function events_print_event_table(
                 if ($event['id_agente'] > 0) {
                     // Agent name.
                     // Get class name, for the link color, etc.
-                    $data[4] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>';
+                    $data[$i] = "<a href='index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=".$event['id_agente']."'>".agents_get_alias($event['id_agente']).'</A>';
                     // For System or SNMP generated alerts.
                 } else if ($event['event_type'] == 'system') {
-                    $data[4] = __('System');
+                    $data[$i] = __('System');
                 } else {
-                    $data[4] = __('Alert').'SNMP';
+                    $data[$i] = __('Alert').'SNMP';
                 }
+
+                $i++;
             }
 
             // Timestamp.
-            $data[5] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']);
+            $data[$i++] = ui_print_timestamp($event['timestamp'], true, ['style' => 'font-size: 7.5pt; letter-spacing: 0.3pt;']);
 
             // Status.
-            $data[6] = ui_print_event_type($event['event_type'], true);
+            $data[$i++] = ui_print_event_type($event['event_type'], true);
 
-            /*
-                $class = get_priority_class($event['criticity']);
-                $cell_classes[3] = $class;
-                $cell_classes[4] = $class;
-                $cell_classes[5] = $class;
-
-                array_push($table->cellclass, $cell_classes);
-            */
-
-            /*
-                Commented out (old).
-                // array_push ($table->rowclass, get_priority_class ($event["criticity"]));
-            */
-
-            array_push($table->data, $data);
+            $data[$i++] = html_print_image(
+                $img,
+                true,
+                [
+                    'class' => 'image_status',
+                    'title' => $title,
+                ]
+            );
+            $table->data[] = $data;
         }
 
         $events_table = html_print_table($table, true);
diff --git a/pandora_console/include/styles/events.css b/pandora_console/include/styles/events.css
index ef0244490e..20b1f59d15 100644
--- a/pandora_console/include/styles/events.css
+++ b/pandora_console/include/styles/events.css
@@ -4,8 +4,8 @@ div.criticity {
   color: #fff;
   text-align: center;
   border-radius: 5px;
-  font-size: 1.2em;
-  padding: 0;
+  font-size: 0.8em;
+  padding: 3px;
   margin: 0;
   display: table-cell;
   vertical-align: middle;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 0e81f3e777..34c162a07d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -468,6 +468,12 @@ select:-internal-list-box {
 .align-top td {
   vertical-align: top;
 }
+.no-td-borders td {
+  border: none !important;
+}
+.no-td-padding td {
+  padding: 0 !important;
+}
 
 div#page {
   background: #fbfbfb;
@@ -1809,12 +1815,14 @@ div#main_pure {
 /* big_data is used in tactical and logon_ok */
 .big_data {
   text-decoration: none;
-  font: bold 2em Arial, Sans-serif;
+  font-family: "lato", "Open Sans", sans-serif;
+  font-size: 2em;
 }
 
 .med_data {
   text-decoration: none;
-  font: bold 1.5em Arial, Sans-serif;
+  font-family: "lato", "Open Sans", sans-serif;
+  font-size: 1.5em;
 }
 
 .notify {
@@ -2361,6 +2369,7 @@ td.cellBig {
 tr.group_view_data,
 .group_view_data {
   color: #3f3f3f;
+  font-family: "lato", "Open Sans", sans-serif;
 }
 
 tr.group_view_crit,
@@ -3292,7 +3301,8 @@ table#policy_modules td * {
   color: #fff;
   margin: 2px;
   padding: 10px 30px;
-  font-size: 15px;
+  font-size: 16px;
+  font-family: "lato-bolder", "Open Sans", sans-serif;
   font-weight: bold;
   border-radius: 2px;
 }
@@ -5913,7 +5923,7 @@ div#status_pie {
   display: flex;
   align-items: center;
   padding: 20px;
-  padding-bottom: 10px;
+  padding-bottom: 0;
 }
 
 .agent_details_agent_name {
@@ -6038,13 +6048,10 @@ div#status_pie {
 .white_table thead tr:first-child > th {
   border-top-left-radius: 4px;
   border-top-right-radius: 4px;
+  border-bottom: 1px solid #e2e2e2;
 }
 
 .white_table tbody tr:first-child > td {
-  border-top: 1px solid #e2e2e2;
-}
-
-.white_table tbody tr:first-child td {
   padding-top: 25px;
 }
 
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index cd30819b23..5d2411d0d3 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -306,18 +306,12 @@ $table_contact->data[] = $data;
 
 
 $data = [];
-$table_contact->colspan[2][0] = 2;
 $data[0] = '<b>'.__('Next contact').'</b>';
 $progress = agents_get_next_contact($id_agente);
-$table_contact->data[] = $data;
-
-
-$data = [];
-$table_contact->colspan[3][0] = 2;
-$data[0] = ui_progress(
+$data[1] = ui_progress(
     $progress,
-    '60%',
-    2,
+    '100%',
+    1.8,
     '#BBB',
     true,
     ($agent['intervalo'] * (100 - $progress) / 100).' s'
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 9264cba0b3..e56f7f0e77 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -122,7 +122,7 @@ echo '<td style="vertical-align: top; min-width: 180px; width:25%; padding-right
 // ---------------------------------------------------------------------
 $table = new stdClass();
 $table->width = '100%';
-$table->class = '';
+$table->class = 'info_table no-td-borders';
 $table->cellpadding = 2;
 $table->cellspacing = 2;
 $table->border = 0;
@@ -130,7 +130,7 @@ $table->head = [];
 $table->data = [];
 $table->style = [];
 
-$table->head[0] = '<span>'.__('Report of State').'</span>';
+$table->head[0] = '<b><span>'.__('Report of State').'</span></b>';
 $stats = reporting_get_stats_indicators($data, 120, 10, false);
 $status = '<table class="status_tactical">';
 foreach ($stats as $stat) {

From 4f27ae1021ab40cd88f4c9ae9d3213eb406e445e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 15:25:35 +0200
Subject: [PATCH 40/61] minor style fix

---
 pandora_console/include/styles/pandora.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 34c162a07d..4efd092e6e 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -6043,6 +6043,7 @@ div#status_pie {
   border: 1px solid #e2e2e2;
   border-radius: 4px;
   margin-bottom: 20px;
+  padding-bottom: 10px;
 }
 
 .white_table thead tr:first-child > th {

From 4a42756ec6f89730576968bd51371ea96829114e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 15:44:51 +0200
Subject: [PATCH 41/61] group_management styles profiles

---
 pandora_console/godmode/groups/group_list.php           | 8 ++++++++
 pandora_console/godmode/reporting/reporting_builder.php | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index dfd2fbc30d..ee61cdaf79 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -516,14 +516,22 @@ if ($tab == 'tree') {
         $table = new StdClass();
         $table->width = '100%';
         $table->class = 'info_table';
+        $table->headstyle = [];
         $table->head = [];
         $table->head[0] = __('ID');
+        $table->headstyle[0] = 'min-width: 100px;';
         $table->head[1] = __('Name');
+        $table->headstyle[1] = 'min-width: 100px;';
         $table->head[2] = __('Icon');
+        $table->headstyle[2] = 'min-width: 100px;';
         $table->head[3] = __('Alerts');
+        $table->headstyle[3] = 'min-width: 100px;';
         $table->head[4] = __('Parent');
+        $table->headstyle[4] = 'min-width: 100px;';
         $table->head[5] = __('Description');
+        $table->headstyle[5] = 'min-width: 100px;';
         $table->head[6] = __('Actions');
+        $table->headstyle[6] = 'min-width: 100px;';
         $table->align = [];
         $table->align[0] = 'left';
         $table->align[2] = 'left';
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index e8af78ed62..ffd980bf11 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -760,6 +760,9 @@ switch ($action) {
 
             $table->head = [];
             $table->align = [];
+            $table->headstyle = [];
+            $table->style = [];
+
             $table->align[2] = 'left';
             $table->align[3] = 'left';
             $table->align[4] = 'left';
@@ -775,7 +778,9 @@ switch ($action) {
             $table->size[4] = '2%';
             $table->size[5] = '2%';
             $table->size[6] = '2%';
-            $table->size['csv'] = '5%';
+            $table->size[7] = '5%';
+            $table->headstyle[7] = 'min-width: 30px;';
+            $table->style[7] = 'text-align: center;';
 
             $next = 4;
             // Calculate dinamically the number of the column.
@@ -814,7 +819,6 @@ switch ($action) {
                 // $table->size = array ();
                 $table->size[$next] = '10%';
                 $table->align[$next] = 'left';
-                $table->headstyle[$next] = 'text-align:left;';
             }
 
             $columnview = false;
@@ -996,7 +1000,6 @@ switch ($action) {
                         $table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
                         $table->size = [];
                         // $table->size[$next] = '80px';
-                        $table->style[$next] = 'text-align:left;';
                     }
 
                     if ($edit) {

From e9198af17c99700b3b9479813efafebf9ee07a05 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 16:45:53 +0200
Subject: [PATCH 42/61] multiple changes

---
 .../godmode/reporting/reporting_builder.php   |  7 ++++++-
 pandora_console/include/styles/pandora.css    | 19 +++++++++----------
 .../operation/agentes/estado_monitores.php    |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index ffd980bf11..ddbd30a962 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -774,12 +774,17 @@ switch ($action) {
             $table->size[0] = '20%';
             $table->size[1] = '30%';
             $table->size[2] = '2%';
+            $table->headstyle[2] = 'min-width: 35px;';
             $table->size[3] = '2%';
+            $table->headstyle[3] = 'min-width: 35px;';
             $table->size[4] = '2%';
+            $table->headstyle[4] = 'min-width: 35px;';
             $table->size[5] = '2%';
+            $table->headstyle[5] = 'min-width: 35px;';
             $table->size[6] = '2%';
+            $table->headstyle[6] = 'min-width: 35px;';
             $table->size[7] = '5%';
-            $table->headstyle[7] = 'min-width: 30px;';
+            $table->headstyle['csv'] = 'min-width: 65px;';
             $table->style[7] = 'text-align: center;';
 
             $next = 4;
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4efd092e6e..868d3a2b55 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -569,12 +569,13 @@ input.sub {
   -webkit-border-radius: 2px;
   border-radius: 2px;
   font-size: 8pt;
-  background-color: #333 !important;
-  background-repeat: no-repeat !important;
-  background-position: 92% 3px !important;
-  color: white !important;
+  background-color: #fff;
+  background-repeat: no-repeat;
+  background-position: 92% 3px;
+  color: #000;
   padding: 3px 3px 5px 12px;
-  border-color: #333;
+  border-color: #888;
+  font-family: "lato", "Open Sans", sans-serif !important;
 }
 
 input.sub[disabled] {
@@ -5200,11 +5201,6 @@ table.info_table {
   border-radius: 5px;
 }
 
-table.info_table tr,
-table.info_table th,
-table.info_table td {
-  border: 1px solid #e2e2e2;
-}
 table.info_table > tbody > tr:nth-child(even) {
   background-color: #f5f5f5;
 }
@@ -5527,6 +5523,9 @@ table.info_table.policy_sub_table {
 .sort_arrow a {
   padding: 0 0 0 5px !important;
 }
+.sort_arrow img {
+  width: 0.8em;
+}
 
 /*
  * ---------------------------------------------------------------------
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 387731e24b..3cff3c83ae 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -493,7 +493,7 @@ function print_form_filter_monitors(
     $form_text = '';
     $table = new stdClass();
     $table->class = 'info_table';
-    $table->styleTable = 'border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
+    $table->styleTable = 'border: 1px solid #ebebeb;border-radius: 0;padding: 0;margin: 0;margin-top: -1px;';
     $table->width = '100%';
     $table->style[0] = 'font-weight: bold;';
     $table->style[2] = 'font-weight: bold;';

From 53f6649a577e78459b48f99839e5fb32292b3545 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 16:49:51 +0200
Subject: [PATCH 43/61] tip img sty

---
 pandora_console/include/styles/pandora.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 868d3a2b55..96edcc9583 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2939,7 +2939,8 @@ a.tip {
 a.tip > img {
   margin-left: 2px;
   margin-right: 2px;
-  margin-bottom: -0.3em;
+  position: absolute;
+  margin-top: -3px;
 }
 
 .head_tip {

From 8c0bfd72a85bab4b2886671823b95aa323168034 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 16:52:38 +0200
Subject: [PATCH 44/61] avoid icon overlap report view lsit

---
 pandora_console/godmode/reporting/reporting_builder.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index ddbd30a962..44e616977d 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -787,6 +787,9 @@ switch ($action) {
             $table->headstyle['csv'] = 'min-width: 65px;';
             $table->style[7] = 'text-align: center;';
 
+            $table->headstyle[9] = 'min-width: 100px;';
+            $table->style[9] = 'text-align: center;';
+
             $next = 4;
             // Calculate dinamically the number of the column.
             if (enterprise_hook('load_custom_reporting_1') !== ENTERPRISE_NOT_HOOK) {

From 47c9220cbb8c87dd8e957fcd648cdeef06fb359c Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 17:02:01 +0200
Subject: [PATCH 45/61] clippy positions and control overflow

---
 pandora_console/godmode/wizards/DiscoveryTaskList.class.php | 2 +-
 pandora_console/include/functions_clippy.php                | 2 +-
 pandora_console/include/functions_ui.php                    | 1 +
 pandora_console/operation/agentes/estado_monitores.php      | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 7da9ca15f2..9392d03ad4 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -379,7 +379,7 @@ class DiscoveryTaskList extends Wizard
             // Status.
             $table->headstyle[5] .= 'min-width: 100px; width: 100px;';
             // Task type.
-            $table->headstyle[6] .= 'min-width: 150px; width: 150px;';
+            $table->headstyle[6] .= 'min-width: 200px; width: 150px;';
             // Progress.
             $table->headstyle[7] .= 'min-width: 150px; width: 150px;';
             // Updated at.
diff --git a/pandora_console/include/functions_clippy.php b/pandora_console/include/functions_clippy.php
index f3bc6a5967..67999a75e0 100644
--- a/pandora_console/include/functions_clippy.php
+++ b/pandora_console/include/functions_clippy.php
@@ -296,7 +296,7 @@ function clippy_context_help($help=null)
     $code = str_replace('{clippy}', '#'.$id, $code);
     $code = str_replace('{clippy_obj}', 'intro_'.$id, $code);
 
-    $return = $code.'<div id="'.$id.'" style="display: inline;"><a onclick="show_'.$id.'();" href="javascript: void(0);" >'.html_print_image(
+    $return = $code.'<div id="'.$id.'" style="display: inline-block;"><a onclick="show_'.$id.'();" href="javascript: void(0);" >'.html_print_image(
         'images/clippy_icon.png',
         true
     ).'</a></div>
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index e497b7bad1..1193d84c51 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2673,6 +2673,7 @@ function ui_print_module_status(
 
     $options['style'] .= 'width: 50px;';
     $options['style'] .= 'height: 2em;';
+    $options['style'] .= 'display: inline-block;';
 
     include_once __DIR__.'/functions_modules.php';
     $options['style'] .= 'background: '.modules_get_color_status($status).';';
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 3cff3c83ae..112d02a933 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -169,10 +169,10 @@ $html_toggle = ob_get_clean();
 
 ui_toggle(
     $html_toggle,
-    __('List of modules').ui_print_help_tip(
+    __('List of modules').$help_not_init.ui_print_help_tip(
         __('To see the list of modules paginated, enable this option in the Styles Configuration.'),
         true
-    ).$help_not_init.reporting_tiny_stats(
+    ).reporting_tiny_stats(
         $agent,
         true,
         'modules',

From 3c730fbedf90795f7c30962eab1c98e744fde3f0 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 17:10:21 +0200
Subject: [PATCH 46/61] BC updated

---
 .../godmode/agentes/configurar_agente.php        | 16 ++++++++++++++--
 pandora_console/include/functions_ui.php         |  6 ++++--
 pandora_console/operation/agentes/ver_agente.php |  8 +++++++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index 46ead7da19..eaf65771fd 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -708,7 +708,13 @@ if ($id_agente) {
         '',
         $config['item_title_size_text'],
         '',
-        __('Resources').ui_print_breadcrums($tab_name)
+        ui_print_breadcrums(
+            [
+                __('Resources'),
+                __('Manage agents'),
+                '<span class="breadcrumb_active">'.$tab_name.'</span>',
+            ]
+        )
     );
 } else {
     // Create agent.
@@ -723,7 +729,13 @@ if ($id_agente) {
         '',
         GENERIC_SIZE_TEXT,
         '',
-        __('Resources').ui_print_breadcrums('Create agent')
+        ui_print_breadcrums(
+            [
+                __('Resources'),
+                __('Manage agents'),
+                '<span class="breadcrumb_active">'.__('Create agent').'</span>',
+            ]
+        )
     );
 }
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 1193d84c51..2bbcf544c7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -5020,10 +5020,12 @@ function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
  */
 function ui_print_breadcrums($tab_name)
 {
-    if ($tab_name != '') {
+    if (is_array($tab_name)) {
+        return join(' / ', $tab_name);
+    } else if ($tab_name != '') {
         $section = str_replace('_', ' ', $tab_name);
         $section = ucwords($section);
-        $section = ' / <span class="breadcrumb_active">'.___($section).'</span>';
+        $section = ' / '.___($section);
     }
 
     return $section;
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 4a370b4eb4..9bed24a3db 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1498,7 +1498,13 @@ ui_print_page_header(
     '',
     $config['item_title_size_text'],
     '',
-    __('Resources').ui_print_breadcrums($tab_name)
+    ui_print_breadcrums(
+        [
+            __('Monitoring'),
+            __('View'),
+            '<span class="breadcrumb_active">'.$tab_name.'</span>',
+        ]
+    )
 );
 
 

From 121ae89b1dd784c4fd82c233a0fcb5eaff7de775 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 17:34:11 +0200
Subject: [PATCH 47/61] dyn style ui_print_help_tip

---
 pandora_console/include/functions_ui.php      |  7 +++++--
 pandora_console/include/styles/pandora.css    |  1 -
 .../agentes/estado_generalagente.php          | 19 ++++---------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 2bbcf544c7..d784578a83 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2267,6 +2267,7 @@ function ui_print_session_action_icon($action, $return=false)
  * @param boolean $return      Whether to return an output string or echo now.
  * @param string  $img         Displayed image.
  * @param boolean $is_relative Print image in relative way.
+ * @param string  $style       Specific style.
  *
  * @return string HTML code if return parameter is true.
  */
@@ -2274,9 +2275,11 @@ function ui_print_help_tip(
     $text,
     $return=false,
     $img='images/tip_help.png',
-    $is_relative=false
+    $is_relative=false,
+    $style=''
 ) {
-    $output = '<a href="javascript:" class="tip" >'.html_print_image(
+    $output = '<a href="javascript:" class="tip" style="'.$style.'" >';
+    $output .= html_print_image(
         $img,
         true,
         ['title' => $text],
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 96edcc9583..71c0baac62 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2939,7 +2939,6 @@ a.tip {
 a.tip > img {
   margin-left: 2px;
   margin-right: 2px;
-  position: absolute;
   margin-top: -3px;
 }
 
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 5d2411d0d3..8e6074eadc 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -605,14 +605,6 @@ if (!empty($network_interfaces)) {
         'class' => 'closed',
         'style' => 'cursor:pointer;',
     ];
-    $table_interface->head[0] = html_print_image(
-        'images/arrow_down_green.png',
-        true,
-        $options
-    ).'&nbsp;&nbsp;';
-    $table_interface->head[0] .= '<span style="vertical-align: middle; font-weight:bold;">'.__('Interface information').' (SNMP)</span>';
-    $table_interface->head_colspan = [];
-    $table_interface->head_colspan[0] = 8;
     $table_interface->data = [];
     $event_text_cont = 0;
 
@@ -747,12 +739,6 @@ if (!empty($network_interfaces)) {
 ?>
     <script type="text/javascript">
         $(document).ready (function () {
-            $("#agent_interface_info").find("tbody").hide();
-            $("#agent_interface_info").find("thead").click (function () {
-                close_table('#agent_interface_info');
-            })
-            .css('cursor', 'pointer');
-
             $("#agent_data_main").find("thead").click (function () {
                 close_table('#agent_data_main');
             })
@@ -846,5 +832,8 @@ if ($table_access_rate) {
 echo $agent_incidents;
 
 if (isset($table_interface)) {
-    echo html_print_table($table_interface, true);
+    ui_toggle(
+        '<div class="white_table_graph_content">'.html_print_table($table_interface, true).'</div>',
+        '<b>'.__('Interface information (SNMP)').'</b>'
+    );
 }

From f16f35ad10ac88e44759eaefc5b0e68fc428d34f Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 17:49:09 +0200
Subject: [PATCH 48/61] Changes styles

---
 pandora_console/godmode/servers/servers.build_table.php    | 7 ++++++-
 pandora_console/include/functions_ui.php                   | 2 ++
 pandora_console/operation/agentes/estado_generalagente.php | 2 +-
 pandora_console/operation/agentes/estado_monitores.php     | 2 +-
 pandora_console/operation/agentes/status_events.php        | 2 +-
 pandora_console/operation/agentes/tactical.php             | 7 ++++++-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 2ab1b8d967..1b5486b570 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -231,7 +231,12 @@ if ($tiny) {
 }
 
 if ($tiny) {
-    ui_toggle(html_print_table($table, true), __('Tactical server information'), false, $hidden_toggle);
+    ui_toggle(
+        html_print_table($table, true),
+        __('Tactical server information'),
+        false,
+        $hidden_toggle
+    );
 } else {
     html_print_table($table);
 }
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d784578a83..e5b4c3a968 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2965,8 +2965,10 @@ function ui_toggle(
         // $output .= '<br />';
     // Code into a div
     $output .= "<div id='tgl_div_".$uniqid."' style='".$style.";margin-top: -1px;' class='".$toggle_class."'>\n";
+    $output .= '<div class="box-shadow white_table_graph_content no-padding-imp">';
     $output .= $code;
     $output .= '</div>';
+    $output .= '</div>';
 
     // JQuery Toggle.
     $output .= '<script type="text/javascript">'."\n";
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 8e6074eadc..360a7fd332 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -833,7 +833,7 @@ echo $agent_incidents;
 
 if (isset($table_interface)) {
     ui_toggle(
-        '<div class="white_table_graph_content">'.html_print_table($table_interface, true).'</div>',
+        html_print_table($table_interface, true),
         '<b>'.__('Interface information (SNMP)').'</b>'
     );
 }
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 112d02a933..2ad10e87c5 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -163,7 +163,7 @@ print_form_filter_monitors(
     $status_hierachy_mode
 );
 
-echo '<div class="box-shadow white_table_graph_content" style="padding: 0;" id="module_list"></div>';
+echo '<div id="module_list"></div>';
 
 $html_toggle = ob_get_clean();
 
diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php
index 9313a5642c..5cbb742b0c 100755
--- a/pandora_console/operation/agentes/status_events.php
+++ b/pandora_console/operation/agentes/status_events.php
@@ -22,7 +22,7 @@ if (!isset($id_agente)) {
 require_once 'include/functions_events.php';
 ui_require_css_file('events');
 ui_toggle(
-    "<div class='white_table_graph_content' id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
+    "<div style='width: 100%;' id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
     __('Latest events for this agent'),
     __('Latest events for this agent'),
     false
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index e56f7f0e77..10e4ff5736 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -187,7 +187,12 @@ if (check_acl($config['id_user'], 0, 'ER')) {
     }
 
     $events = events_print_event_table($event_filter, 10, '100%', true, false, true);
-    ui_toggle($events, __('Latest events'), false, false);
+    ui_toggle(
+        $events,
+        __('Latest events'),
+        false,
+        false
+    );
 }
 
 // ---------------------------------------------------------------------

From c2346842c95c435f2b79af1e6afd6fe9ab90fee0 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 18:13:21 +0200
Subject: [PATCH 49/61] ui_toggle revierw

---
 pandora_console/include/functions_ui.php           |  5 +++--
 pandora_console/include/styles/pandora.css         | 14 +++++++++++++-
 .../operation/agentes/alerts_status.php            |  7 ++++++-
 .../operation/agentes/estado_monitores.php         |  5 ++++-
 .../operation/agentes/status_events.php            |  5 ++++-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index e5b4c3a968..59b76ba00f 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2934,7 +2934,8 @@ function ui_toggle(
     $title='',
     $hidden_default=true,
     $return=false,
-    $toggle_class=''
+    $toggle_class='',
+    $container_class='white-box-content'
 ) {
     // Generate unique Id.
     $uniqid = uniqid('');
@@ -2965,7 +2966,7 @@ function ui_toggle(
         // $output .= '<br />';
     // Code into a div
     $output .= "<div id='tgl_div_".$uniqid."' style='".$style.";margin-top: -1px;' class='".$toggle_class."'>\n";
-    $output .= '<div class="box-shadow white_table_graph_content no-padding-imp">';
+    $output .= '<div class="'.$container_class.'">';
     $output .= $code;
     $output .= '</div>';
     $output .= '</div>';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 71c0baac62..4657c8b52a 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5999,6 +5999,15 @@ div#status_pie {
   padding-left: 10px;
 }
 
+.white-box-content {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
 .white_table_graph_content {
   border: 1px solid #e2e2e2;
   border-top: none;
@@ -6006,11 +6015,14 @@ div#status_pie {
   padding: 20px;
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
-  display: flex;
   align-items: center;
   flex-wrap: wrap;
 }
 
+.white_table_graph_content.no-padding-imp .info_box {
+  margin: 0 !important;
+}
+
 .white_table_graph_content.min-height-100 {
   min-height: 100px;
 }
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 9a54ed1b15..e231266667 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -650,8 +650,10 @@ if (!empty($table->data)) {
     }
 
     echo '</form>';
+    $alerts_defined = true;
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('No alerts found') ]);
+    $alerts_defined = false;
 }
 
 $html_content = ob_get_clean();
@@ -662,7 +664,10 @@ if ($agent_view_page === true) {
         $html_content,
         __('Full list of alerts'),
         'status_monitor_agent',
-        false
+        !$alerts_defined,
+        false,
+        '',
+        'white_table_graph_content no-padding-imp'
     );
 } else {
     // Dump entire content.
diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php
index 2ad10e87c5..7536d294ae 100755
--- a/pandora_console/operation/agentes/estado_monitores.php
+++ b/pandora_console/operation/agentes/estado_monitores.php
@@ -180,7 +180,10 @@ ui_toggle(
         true
     ),
     'status_monitor_agent',
-    false
+    false,
+    false,
+    '',
+    'white_table_graph_content no-padding-imp'
 );
 
 
diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php
index 5cbb742b0c..5e6e060f82 100755
--- a/pandora_console/operation/agentes/status_events.php
+++ b/pandora_console/operation/agentes/status_events.php
@@ -25,7 +25,10 @@ ui_toggle(
     "<div style='width: 100%;' id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
     __('Latest events for this agent'),
     __('Latest events for this agent'),
-    false
+    false,
+    false,
+    '',
+    'white_table_graph_content no-padding-imp'
 );
 
 ?>

From 48094ffb2e36230bb04b5680900fa2a1420cf13e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 29 May 2019 18:24:45 +0200
Subject: [PATCH 50/61] greater icons

---
 pandora_console/include/styles/pandora.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 4657c8b52a..b4fa370521 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -567,13 +567,16 @@ input.sub {
   font-weight: normal;
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
+  height: auto !important;
   border-radius: 2px;
-  font-size: 8pt;
+  font-size: 1.2em;
   background-color: #fff;
   background-repeat: no-repeat;
-  background-position: 92% 3px;
+  background-position: 92% 10px;
   color: #000;
-  padding: 3px 3px 5px 12px;
+  padding-bottom: 10px;
+  padding-top: 10px;
+  padding-left: 15px;
   border-color: #888;
   font-family: "lato", "Open Sans", sans-serif !important;
 }

From bfef8e61ea347ee384a2fe38bfbb7557ab264425 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 30 May 2019 00:01:06 +0200
Subject: [PATCH 51/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 752edf5936..a2dd863980 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-190529
+Version: 7.0NG.735-190530
 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 2a46a4b2ce..9b99a75a82 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-190529"
+pandora_version="7.0NG.735-190530"
 
 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 ee7e608d18..f7ecd59b00 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 => '190529';
+use constant AGENT_BUILD => '190530';
 
 # 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 cd93cda48a..d9146aa154 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     190529
+%define release     190530
 
 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 eed9c0b196..daf54ce34f 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     190529
+%define release     190530
 
 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 8e3b4f662f..5ac4870afe 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="190529"
+PI_BUILD="190530"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c1e8908e68..9a07ea0492 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190529}
+{190530}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 0c988e2a7c..e2b2469a86 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 190529)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190530)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 57e8a1d67f..cc8526ed5f 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 190529))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190530))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 2f275f8c11..364379881e 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190529
+Version: 7.0NG.735-190530
 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 b3f827589c..fba5eb142f 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-190529"
+pandora_version="7.0NG.735-190530"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d671f0bb81..9b26507f79 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 = 'PC190529';
+$build_version = 'PC190530';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fd7e5cceab..9324ecdc5f 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 = '190529';
+            $build = '190530';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index cbc86f89b4..a60d0b4fae 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     190529
+%define release     190530
 
 # 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 f5bab7605c..9c6519d4b9 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     190529
+%define release     190530
 
 # 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 73aed51663..4d69c257f2 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     190529
+%define release     190530
 %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 e0881cb7ba..b1b891cfec 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190529
+Version: 7.0NG.735-190530
 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 5882dc1df3..60154afb46 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-190529"
+pandora_version="7.0NG.735-190530"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 68f3ab5333..0df45788a6 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 = "190529";
+my $pandora_build = "190530";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 1c68096c9b..13081c2b31 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 = "190529";
+my $pandora_build = "190530";
 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 19f1b806ef..d0a013eff8 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     190529
+%define release     190530
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 83f672ba23..45c9472a32 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     190529
+%define release     190530
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 49b65e5bdf..2ef6793323 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190529"
+PI_BUILD="190530"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 51e944ff7a..b42035737b 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 PS190529";
+my $version = "7.0NG.735 PS190530";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index da6aab09d5..44e33af08d 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 PS190529";
+my $version = "7.0NG.735 PS190530";
 
 # save program name for logging
 my $progname = basename($0);

From 30320b789754efadfeab1f645fd62814a1d31481 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 30 May 2019 11:12:37 +0200
Subject: [PATCH 52/61] Fixed login button style and removed help icons from
 agent_management

---
 pandora_console/general/login_page.php         |  6 +++---
 .../godmode/agentes/agent_manager.php          | 18 +++++-------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index d8e28223c6..880f1531a1 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -186,7 +186,7 @@ switch ($login_screen) {
             echo '</div>';
 
             echo '<div id="log_button" class="login_button" style="display: none;">';
-                html_print_submit_button(__('Login as admin'), 'login_button', false, 'class="sub next_login"');
+                html_print_submit_button(__('Login as admin'), 'login_button', false, 'class="next_login"');
             echo '</div>';
 
             echo '<div class="login_button" id="remove_button">';
@@ -226,7 +226,7 @@ switch ($login_screen) {
                 );
             echo '</div>';
             echo '<div class="login_button">';
-                html_print_submit_button(__('Login'), 'login_button', false, 'class="sub next_login"');
+                html_print_submit_button(__('Login'), 'login_button', false, 'class="next_login"');
             echo '</div>';
         }
     break;
@@ -245,7 +245,7 @@ switch ($login_screen) {
         html_print_input_text_extended('auth_code', '', 'auth_code', '', '', '', false, '', 'class="login login_password" placeholder="'.__('Authentication code').'"', false, true);
         echo '</div>';
         echo '<div class="login_button">';
-        html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, 'class="sub next_login"');
+        html_print_submit_button(__('Check code').'&nbsp;&nbsp;>', 'login_button', false, 'class="next_login"');
         echo '</div>';
     break;
 
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 93bf1931b5..dfdd7390c3 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -219,14 +219,6 @@ if (!$new_agent && $alias != '') {
     // Delete link from here.
     $table_agent_name .= "<a onClick=\"if (!confirm('".__('Are you sure?')."')) return false;\" href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&borrar_agente=".$id_agente."&search=&offset=0&sort_field=&sort=none'>".html_print_image('images/cross.png', true, ['title' => __('Delete agent')]).'</a>';
 
-    // Help link.
-    $table_agent_name .= ui_print_help_icon(
-        $help_header,
-        true,
-        '',
-        'images/help_g.png'
-    );
-
     // Remote configuration available.
     if (isset($filename)) {
         if (file_exists($filename['md5'])) {
@@ -393,7 +385,7 @@ $table_server .= html_print_select(
     __('None'),
     0,
     true
-).'<div class="label_select_child_icons">'.ui_print_help_icon('agent_server', true).'</div></div></div>';
+).'<div class="label_select_child_icons"></div></div></div>';
 
 // Description.
 $table_description = '<div class="label_select"><p class="input_label">'.__('Description').': </p>';
@@ -421,7 +413,7 @@ echo '</div>';
 
 if (enterprise_installed()) {
     $secondary_groups_selected = enterprise_hook('agents_get_secondary_groups', [$id_agente]);
-    $table_adv_secondary_groups = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': '.ui_print_help_icon('secondary_groups', true).'</p></div>';
+    $table_adv_secondary_groups = '<div class="label_select"><p class="input_label">'.__('Secondary groups').': </p></div>';
     $table_adv_secondary_groups_left = html_print_select_groups(
         false,
         // Use the current user to select the groups.
@@ -576,7 +568,7 @@ if (enterprise_installed()) {
 
     $cps_html = '<div class="label_select"><div class="label_simple_items">';
     $cps_html .= html_print_checkbox_switch('cps', $cps_val, ($cps >= 0), true);
-    $cps_html .= __('Cascade protection services').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
+    $cps_html .= __('Cascade protection services').'&nbsp;';
     $cps_html .= ui_print_help_tip(
         __('Alerts and events will be managed by the service joined by this agent.'),
         true
@@ -607,7 +599,7 @@ if (enterprise_installed()) {
         1,
         $cascade_protection,
         true
-    ).__('Cascade protection').'&nbsp;'.ui_print_help_icon('cascade_protection', true);
+    ).__('Cascade protection').'&nbsp;';
 }
 
 $table_adv_parent .= __('Module').'&nbsp;'.html_print_select(
@@ -621,7 +613,7 @@ $table_adv_parent .= __('Module').'&nbsp;'.html_print_select(
 ).'</div></div>';
 
 // Learn mode / Normal mode.
-$table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': '.ui_print_help_icon('module_definition', true).'</p>';
+$table_adv_module_mode = '<div class="label_select"><p class="input_label">'.__('Module definition').': </p>';
 $table_adv_module_mode .= '<div class="switch_radio_button">';
 $table_adv_module_mode .= html_print_radio_button_extended(
     'modo',

From 94153b823f5635b1e663ed9687dcef0026f83f71 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 30 May 2019 11:25:09 +0200
Subject: [PATCH 53/61] Help links

---
 pandora_console/godmode/agentes/configurar_agente.php | 3 +--
 pandora_console/include/functions.php                 | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index eaf65771fd..22410b0e23 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -700,8 +700,7 @@ if ($id_agente) {
         agents_get_alias($id_agente),
         'images/setup.png',
         false,
-        // Previous: $help_header.
-        '',
+        $help_header,
         true,
         $onheader,
         false,
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index a5f1d92a7a..f299153da6 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -4946,6 +4946,14 @@ function get_help_info($section_name)
             }
         break;
 
+        case 'create_agent':
+            if ($es) {
+                $result .= 'Intro_Monitorizacion&printable=yes#Configuraci.C3.B3n_del_agente_en_consola';
+            } else {
+                $result .= 'Intro_Monitoring&printable=yes#Agent_configuration_in_the_console';
+            }
+        break;
+
         case 'agent_snmp_explorer_tab':
             if ($es) {
                 $result .= 'Monitorizacion_remota&printable=yes#Wizard_SNMP';

From 2f734f2454f36151aa57351f768f5c4f15d5c37b Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 31 May 2019 00:01:07 +0200
Subject: [PATCH 54/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index a2dd863980..3f8e9ffe25 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-190530
+Version: 7.0NG.735-190531
 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 9b99a75a82..fcd30e2335 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-190530"
+pandora_version="7.0NG.735-190531"
 
 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 f7ecd59b00..6106928cd7 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 => '190530';
+use constant AGENT_BUILD => '190531';
 
 # 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 d9146aa154..31f5ce22af 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     190530
+%define release     190531
 
 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 daf54ce34f..d9160cc717 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     190530
+%define release     190531
 
 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 5ac4870afe..dfd3b79ea3 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="190530"
+PI_BUILD="190531"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 9a07ea0492..5f93c31d06 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190530}
+{190531}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e2b2469a86..cc4078526a 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 190530)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190531)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index cc8526ed5f..7bfdc7bc26 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 190530))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190531))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 364379881e..280c7467a7 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190530
+Version: 7.0NG.735-190531
 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 fba5eb142f..f975e630c4 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-190530"
+pandora_version="7.0NG.735-190531"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9b26507f79..a5e1bf8f95 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 = 'PC190530';
+$build_version = 'PC190531';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9324ecdc5f..b01b642951 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 = '190530';
+            $build = '190531';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index a60d0b4fae..7dcd58f00a 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     190530
+%define release     190531
 
 # 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 9c6519d4b9..c46c4c4fad 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     190530
+%define release     190531
 
 # 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 4d69c257f2..68a21414aa 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     190530
+%define release     190531
 %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 b1b891cfec..45f5a94727 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190530
+Version: 7.0NG.735-190531
 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 60154afb46..15d8cd863a 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-190530"
+pandora_version="7.0NG.735-190531"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 0df45788a6..ae1142df4d 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 = "190530";
+my $pandora_build = "190531";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 13081c2b31..df9abb851b 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 = "190530";
+my $pandora_build = "190531";
 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 d0a013eff8..93bead985a 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     190530
+%define release     190531
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 45c9472a32..c25a72ff91 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     190530
+%define release     190531
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2ef6793323..cfb50d2e56 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190530"
+PI_BUILD="190531"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index b42035737b..efb91204c1 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 PS190530";
+my $version = "7.0NG.735 PS190531";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 44e33af08d..de938641fe 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 PS190530";
+my $version = "7.0NG.735 PS190531";
 
 # save program name for logging
 my $progname = basename($0);

From f06d1601410578d46e921670d50af59c0eb8e822 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 1 Jun 2019 00:01:06 +0200
Subject: [PATCH 55/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 3f8e9ffe25..9f5af23bbf 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-190531
+Version: 7.0NG.735-190601
 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 fcd30e2335..9556f03d4c 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-190531"
+pandora_version="7.0NG.735-190601"
 
 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 6106928cd7..1de1c9b1cb 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 => '190531';
+use constant AGENT_BUILD => '190601';
 
 # 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 31f5ce22af..ee5b85a373 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     190531
+%define release     190601
 
 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 d9160cc717..4b40918a04 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     190531
+%define release     190601
 
 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 dfd3b79ea3..4692c058b0 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="190531"
+PI_BUILD="190601"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 5f93c31d06..d5ac711192 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190531}
+{190601}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index cc4078526a..d2bc047b9c 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 190531)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190601)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 7bfdc7bc26..5619c74fd9 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 190531))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190601))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 280c7467a7..6d1a6f11a2 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190531
+Version: 7.0NG.735-190601
 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 f975e630c4..80cb7e2a2d 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-190531"
+pandora_version="7.0NG.735-190601"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a5e1bf8f95..0566ba1a0c 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 = 'PC190531';
+$build_version = 'PC190601';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b01b642951..45087382e9 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 = '190531';
+            $build = '190601';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 7dcd58f00a..7336aee14d 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     190531
+%define release     190601
 
 # 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 c46c4c4fad..f36b3140bd 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     190531
+%define release     190601
 
 # 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 68a21414aa..7b34ce7c76 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     190531
+%define release     190601
 %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 45f5a94727..6aecacc748 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190531
+Version: 7.0NG.735-190601
 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 15d8cd863a..d597c5835e 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-190531"
+pandora_version="7.0NG.735-190601"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index ae1142df4d..6fec3cde9b 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 = "190531";
+my $pandora_build = "190601";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index df9abb851b..dd89b9f1b1 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 = "190531";
+my $pandora_build = "190601";
 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 93bead985a..d9c8c0462b 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     190531
+%define release     190601
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c25a72ff91..b1d032c3db 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     190531
+%define release     190601
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index cfb50d2e56..484a38dbcd 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190531"
+PI_BUILD="190601"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index efb91204c1..d0a270d9a2 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 PS190531";
+my $version = "7.0NG.735 PS190601";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index de938641fe..8316bd39c7 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 PS190531";
+my $version = "7.0NG.735 PS190601";
 
 # save program name for logging
 my $progname = basename($0);

From cfc8d7d177ae11bee4680e79a4797b74f287e6f7 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 2 Jun 2019 00:01:05 +0200
Subject: [PATCH 56/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 9f5af23bbf..c53fa209c1 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-190601
+Version: 7.0NG.735-190602
 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 9556f03d4c..2cccf6d459 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-190601"
+pandora_version="7.0NG.735-190602"
 
 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 1de1c9b1cb..f55d18beb2 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 => '190601';
+use constant AGENT_BUILD => '190602';
 
 # 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 ee5b85a373..c4365b0936 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     190601
+%define release     190602
 
 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 4b40918a04..2d8efad87b 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     190601
+%define release     190602
 
 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 4692c058b0..a8affe2305 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="190601"
+PI_BUILD="190602"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index d5ac711192..3ffbe8d309 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190601}
+{190602}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index d2bc047b9c..38ce47940d 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 190601)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190602)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 5619c74fd9..bf26750c8e 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 190601))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190602))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6d1a6f11a2..9d9d35c305 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190601
+Version: 7.0NG.735-190602
 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 80cb7e2a2d..d2dd5f2373 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-190601"
+pandora_version="7.0NG.735-190602"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0566ba1a0c..dc94fee9c6 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 = 'PC190601';
+$build_version = 'PC190602';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 45087382e9..3c38cc5396 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 = '190601';
+            $build = '190602';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 7336aee14d..88b73afbff 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     190601
+%define release     190602
 
 # 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 f36b3140bd..f6eaa4f375 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     190601
+%define release     190602
 
 # 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 7b34ce7c76..44503ed902 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     190601
+%define release     190602
 %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 6aecacc748..a548980f78 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190601
+Version: 7.0NG.735-190602
 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 d597c5835e..2b8229268d 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-190601"
+pandora_version="7.0NG.735-190602"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 6fec3cde9b..d80478f5b7 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 = "190601";
+my $pandora_build = "190602";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index dd89b9f1b1..ac13e98d20 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 = "190601";
+my $pandora_build = "190602";
 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 d9c8c0462b..20cf18769c 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     190601
+%define release     190602
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b1d032c3db..1c2eca60ca 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     190601
+%define release     190602
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 484a38dbcd..7c65ef24f8 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190601"
+PI_BUILD="190602"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d0a270d9a2..fa45db043d 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 PS190601";
+my $version = "7.0NG.735 PS190602";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 8316bd39c7..52116753e1 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 PS190601";
+my $version = "7.0NG.735 PS190602";
 
 # save program name for logging
 my $progname = basename($0);

From a11b674467f63ac7fb5e1c1f19de3434bb7d2705 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 3 Jun 2019 00:01:06 +0200
Subject: [PATCH 57/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index c53fa209c1..f9c18d1803 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-190602
+Version: 7.0NG.735-190603
 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 2cccf6d459..df6d0ddafb 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-190602"
+pandora_version="7.0NG.735-190603"
 
 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 f55d18beb2..2f07c16bdb 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 => '190602';
+use constant AGENT_BUILD => '190603';
 
 # 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 c4365b0936..e25ec45570 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     190602
+%define release     190603
 
 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 2d8efad87b..e98f09fe82 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     190602
+%define release     190603
 
 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 a8affe2305..964972dcb7 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="190602"
+PI_BUILD="190603"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 3ffbe8d309..8b06da5ae2 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190602}
+{190603}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 38ce47940d..3b7eebf6e5 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 190602)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190603)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bf26750c8e..005a397ef2 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 190602))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190603))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9d9d35c305..f5afe29f9f 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190602
+Version: 7.0NG.735-190603
 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 d2dd5f2373..f2fdf35d7f 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-190602"
+pandora_version="7.0NG.735-190603"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index dc94fee9c6..28807adbf9 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 = 'PC190602';
+$build_version = 'PC190603';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3c38cc5396..42ada30277 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 = '190602';
+            $build = '190603';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 88b73afbff..97a74603e2 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     190602
+%define release     190603
 
 # 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 f6eaa4f375..4729d549e1 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     190602
+%define release     190603
 
 # 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 44503ed902..74563251d6 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     190602
+%define release     190603
 %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 a548980f78..fb604a347f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190602
+Version: 7.0NG.735-190603
 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 2b8229268d..d6c6d4086f 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-190602"
+pandora_version="7.0NG.735-190603"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d80478f5b7..e1c4f426aa 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 = "190602";
+my $pandora_build = "190603";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index ac13e98d20..636248cb85 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 = "190602";
+my $pandora_build = "190603";
 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 20cf18769c..534307afbe 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     190602
+%define release     190603
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1c2eca60ca..de71febe82 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     190602
+%define release     190603
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 7c65ef24f8..a6e2918863 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190602"
+PI_BUILD="190603"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index fa45db043d..b615050dbf 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 PS190602";
+my $version = "7.0NG.735 PS190603";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 52116753e1..5007c1edad 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 PS190602";
+my $version = "7.0NG.735 PS190603";
 
 # save program name for logging
 my $progname = basename($0);

From 87a9ce2d46942ed8afd0d0cc404122f4d1cd240c Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Mon, 3 Jun 2019 10:56:16 +0200
Subject: [PATCH 58/61] changes of core.pm reverted

---
 pandora_server/lib/PandoraFMS/Core.pm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 536669afd2..4d5dcdd904 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -360,15 +360,12 @@ sub pandora_generate_alerts ($$$$$$$$;$$$) {
 	my ($pa_config, $data, $status, $agent, $module, $utimestamp, $dbh, $timestamp, $extra_macros, $last_data_value, $alert_type) = @_;
 
 	# No alerts when event storm protection is enabled
-	if(isnumber $EventStormProtection ){
-		if ($EventStormProtection == 1)
-		{
+	
+	if ($EventStormProtection == 1)
+	{
 		return;
-		}
-	}else{
-		$EventStormProtection = 0;
-		return;
-	}   
+	}
+ 
 
 	# Warmup interval for alerts.
 	if ($pa_config->{'warmup_alert_on'} == 1) {

From 2c0e8273a24b0bc1f30a56c089066cc891635516 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Mon, 3 Jun 2019 10:56:58 +0200
Subject: [PATCH 59/61] changes of core.pm reverted

---
 pandora_server/lib/PandoraFMS/Core.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 4d5dcdd904..5682923c93 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -361,8 +361,7 @@ sub pandora_generate_alerts ($$$$$$$$;$$$) {
 
 	# No alerts when event storm protection is enabled
 	
-	if ($EventStormProtection == 1)
-	{
+	if ($EventStormProtection == 1)	{
 		return;
 	}
  

From 9b1e5a64b8480abebf7dcfcfe6dfc145ccd26bd6 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Mon, 3 Jun 2019 10:57:24 +0200
Subject: [PATCH 60/61] changes of core.pm reverted

---
 pandora_server/lib/PandoraFMS/Core.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 5682923c93..0dbc8f963a 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -362,6 +362,7 @@ sub pandora_generate_alerts ($$$$$$$$;$$$) {
 	# No alerts when event storm protection is enabled
 	
 	if ($EventStormProtection == 1)	{
+		
 		return;
 	}
  

From c584367c14f68c3b28ee7e00308206e970272533 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 4 Jun 2019 00:01:06 +0200
Subject: [PATCH 61/61] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index f9c18d1803..41321b7837 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-190603
+Version: 7.0NG.735-190604
 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 df6d0ddafb..dcd6e1773d 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-190603"
+pandora_version="7.0NG.735-190604"
 
 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 2f07c16bdb..54f76969c7 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 => '190603';
+use constant AGENT_BUILD => '190604';
 
 # 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 e25ec45570..432fb23bcc 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     190603
+%define release     190604
 
 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 e98f09fe82..b60141796d 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     190603
+%define release     190604
 
 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 964972dcb7..b8bae000eb 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="190603"
+PI_BUILD="190604"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 8b06da5ae2..2755e2bdea 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190603}
+{190604}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 3b7eebf6e5..0686c724f8 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 190603)")
+#define PANDORA_VERSION ("7.0NG.735(Build 190604)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 005a397ef2..8650b54e46 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 190603))"
+      VALUE "ProductVersion", "(7.0NG.735(Build 190604))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index f5afe29f9f..6d045e7ee0 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.735-190603
+Version: 7.0NG.735-190604
 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 f2fdf35d7f..13cc28aa57 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-190603"
+pandora_version="7.0NG.735-190604"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 28807adbf9..a91ee7173c 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 = 'PC190603';
+$build_version = 'PC190604';
 $pandora_version = 'v7.0NG.735';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 42ada30277..074e1e2960 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 = '190603';
+            $build = '190604';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 97a74603e2..dc34716474 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     190603
+%define release     190604
 
 # 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 4729d549e1..70c2917e1a 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     190603
+%define release     190604
 
 # 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 74563251d6..f0e6ae655f 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     190603
+%define release     190604
 %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 fb604a347f..04db8ea473 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.735-190603
+Version: 7.0NG.735-190604
 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 d6c6d4086f..68b7711564 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-190603"
+pandora_version="7.0NG.735-190604"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e1c4f426aa..922831a71d 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 = "190603";
+my $pandora_build = "190604";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 636248cb85..15600b5cce 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 = "190603";
+my $pandora_build = "190604";
 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 534307afbe..86e0cd9036 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     190603
+%define release     190604
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index de71febe82..fa2d8a0fbf 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     190603
+%define release     190604
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index a6e2918863..c104051082 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.735"
-PI_BUILD="190603"
+PI_BUILD="190604"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index b615050dbf..c37bdc6a3e 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 PS190603";
+my $version = "7.0NG.735 PS190604";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 5007c1edad..dc410bc5b6 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 PS190603";
+my $version = "7.0NG.735 PS190604";
 
 # save program name for logging
 my $progname = basename($0);