From 845cb85c557c1ac05cfa032af7bc216c3b4337b0 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 27 Mar 2019 17:03:55 +0100
Subject: [PATCH 01/32] New design for tables - #3707

Former-commit-id: 923414d8bf98d6264e6cebc27706118e16710b70
---
 pandora_console/extensions/agents_alerts.php  |  19 +-
 .../extensions/users_connected.php            |   6 +-
 pandora_console/general/logon_ok.php          |   4 +-
 .../godmode/agentes/fields_manager.php        |  17 +-
 .../godmode/agentes/modificar_agente.php      |   4 +-
 .../godmode/agentes/planned_downtime.list.php |   4 +-
 .../godmode/events/event_responses.list.php   |   4 +-
 .../godmode/groups/modu_group_list.php        |   9 +-
 pandora_console/godmode/reporting/graphs.php  |   6 +-
 .../godmode/reporting/map_builder.php         |   5 +-
 .../godmode/reporting/reporting_builder.php   |   3 +-
 .../godmode/servers/servers.build_table.php   |   4 +-
 pandora_console/include/ajax/module.php       |   8 +-
 pandora_console/include/functions_ui.php      |  39 ++--
 pandora_console/include/styles/pandora.css    | 167 ++++++++++++++++++
 .../operation/agentes/alerts_status.php       |  12 +-
 .../operation/agentes/estado_agente.php       |  23 +--
 .../operation/agentes/pandora_networkmap.php  |  22 ++-
 .../operation/agentes/status_monitor.php      |   6 +-
 .../operation/events/events.build_table.php   |   7 +
 .../operation/servers/recon_view.php          |   6 +-
 21 files changed, 312 insertions(+), 63 deletions(-)

diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 46272504f6..5b0cc4a72d 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -378,7 +378,7 @@ function mainAgentsAlerts()
             'alerts_agents'
         );
 
-        echo '<table class="databox data" cellpadding="0" cellspacing="0" border="0" width=100%>';
+        echo '<table class="info_table" cellpadding="0" cellspacing="0" border="0" width=100%>';
         echo "<th width='140px' >".__('Agents').' / '.__('Alert templates').'</th>';
 
         if ($hor_offset > 0) {
@@ -478,6 +478,23 @@ function mainAgentsAlerts()
         }
 
         echo '</table>';
+
+        ui_pagination(
+            $nagents,
+            false,
+            0,
+            0,
+            false,
+            'offset',
+            true,
+            'pagination-bottom',
+            '',
+            [
+                'count'  => '',
+                'offset' => 'offset_param',
+            ],
+            'alerts_agents'
+        );
     }
 
 }
diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php
index 562d757a20..e26b0dab1e 100644
--- a/pandora_console/extensions/users_connected.php
+++ b/pandora_console/extensions/users_connected.php
@@ -66,10 +66,10 @@ function users_extension_main_god($god=true)
         $rows = [];
         echo "<div class='nf'>".__('No other users connected').'</div>';
     } else {
-        $table->cellpadding = 4;
-        $table->cellspacing = 4;
+        $table->cellpadding = 0;
+        $table->cellspacing = 0;
         $table->width = '100%';
-        $table->class = 'databox data';
+        $table->class = 'info_table';
         $table->size = [];
         $table->data = [];
         $table->head = [];
diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index 21c9713a48..9e83e0b793 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -195,7 +195,9 @@ if (!empty($all_data)) {
             echo '<div id="activity">';
 
             $table = new stdClass();
-            $table->class = 'databox data';
+            $table->class = 'info_table';
+            $table->cellpadding = 0;
+            $table->cellspacing = 0;
             $table->width = '100%';
             // Don't specify px
             $table->data = [];
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index 0be7166062..ee94813a59 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -97,11 +97,22 @@ if ($delete_field) {
     }
 }
 
-$fields = db_get_all_fields_in_table('tagent_custom_fields');
+// Prepare pagination.
+$offset = (int) get_parameter('offset');
+$limit = $config['block_size'];
+$count_fields = db_get_value('count(*)', 'tagent_custom_fields');
+
+$fields = db_get_all_rows_filter(
+    'tagent_custom_fields',
+    [
+        'limit'  => $limit,
+        'offset' => $offset,
+    ]
+);
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 if ($fields) {
     $table->head = [];
     $table->head[0] = __('ID');
@@ -142,7 +153,9 @@ foreach ($fields as $field) {
 }
 
 if ($fields) {
+    ui_pagination($count_fields, false, $offset);
     html_print_table($table);
+    ui_pagination($count_fields, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
 }
 
 echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configure_field">';
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index 4673bf2f46..cee4f06f8e 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -441,7 +441,7 @@ if (($config['dbtype'] == 'oracle') && ($agents !== false)) {
 ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled&os=$os", $offset);
 
 if ($agents !== false) {
-    echo "<table cellpadding='4' id='agent_list' cellspacing='4' width='100%' class='databox data'>";
+    echo "<table cellpadding='0' id='agent_list' cellspacing='0' width='100%' class='info_table'>";
     echo '<th>'.__('Agent name').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).'</a>';
     echo '</th>';
     echo "<th title='".__('Remote agent configuration')."'>".__('R').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown]).'</a>';
@@ -670,7 +670,7 @@ if ($agents !== false) {
     }
 
     echo '</table>';
-    ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled&os=$os", $offset);
+    ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled&os=$os", $offset, 0, false, 'offset', true, 'pagination-bottom');
     echo "<table width='100%'><tr><td align='right'>";
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('There are no defined agents') ]);
diff --git a/pandora_console/godmode/agentes/planned_downtime.list.php b/pandora_console/godmode/agentes/planned_downtime.list.php
index 790944b472..a9529248b0 100755
--- a/pandora_console/godmode/agentes/planned_downtime.list.php
+++ b/pandora_console/godmode/agentes/planned_downtime.list.php
@@ -393,7 +393,7 @@ else {
 
     // View available downtimes present in database (if any of them)
     $table = new StdClass();
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->width = '100%';
     $table->cellstyle = [];
 
@@ -518,9 +518,9 @@ else {
     }
 
     html_print_table($table);
+    ui_pagination($downtimes_number, "index.php?sec=estado&sec2=godmode/agentes/planned_downtime.list&$filter_params_str", $offset, 0, false, 'offset', true, 'pagination-bottom');
     echo '<div class="action-buttons" style="width: '.$table->width.'">';
 
-    echo '<br>';
     // CSV export button
     echo '<div style="display: inline;">';
         html_print_button(
diff --git a/pandora_console/godmode/events/event_responses.list.php b/pandora_console/godmode/events/event_responses.list.php
index e3b27a32d4..10f9b4c47b 100644
--- a/pandora_console/godmode/events/event_responses.list.php
+++ b/pandora_console/godmode/events/event_responses.list.php
@@ -36,7 +36,9 @@ if (empty($event_responses)) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 
 $table->size = [];
 $table->size[0] = '200px';
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index 9dbc9311a6..6af3f98197 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -212,14 +212,11 @@ if ($delete_group) {
     }
 }
 
+// Prepare pagination.
 $total_groups = db_get_num_rows('SELECT * FROM tmodule_group');
-
 $url = ui_get_url_refresh(['offset' => false]);
-
 $offset = (int) get_parameter('offset', 0);
 
-ui_pagination($total_groups, $url, $offset);
-
 
 $sql = 'SELECT *
     FROM tmodule_group
@@ -230,7 +227,7 @@ $groups = db_get_all_rows_sql($sql);
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 if (!empty($groups)) {
     $table->head = [];
@@ -257,7 +254,9 @@ if (!empty($groups)) {
         array_push($table->data, $data);
     }
 
+    ui_pagination($total_groups, $url, $offset);
     html_print_table($table);
+    ui_pagination($total_groups, $url, $offset, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     ui_print_info_message(
         [
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 633ed82f4d..0e1a0c3afc 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -159,7 +159,9 @@ ui_pagination(count($graphs));
 if (!empty($graphs)) {
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
+    $table->cellpadding = 0;
+    $table->cellspacing = 0;
     $table->align = [];
     $table->head = [];
     $table->head[0] = __('Graph name');
@@ -213,6 +215,7 @@ if (!empty($graphs)) {
         echo "<form method='post' style='' action='index.php?sec=reporting&sec2=godmode/reporting/graphs'>";
             html_print_input_hidden('multiple_delete', 1);
             html_print_table($table);
+            ui_pagination(count($graphs), false, 0, 0, false, 'offset', true, 'pagination-bottom');
             echo "<div style='float: right;'>";
                 html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
             echo '</div>';
@@ -228,7 +231,6 @@ if (!empty($graphs)) {
     }
 
     echo '</div>';
-    ui_pagination(count($graphs));
 } else {
     include_once $config['homedir'].'/general/firts_task/custom_graphs.php';
 }
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 6a20eeb30d..79130eda11 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -327,7 +327,9 @@ echo '</tr></table>';
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->data = [];
 $table->head = [];
 $table->head[0] = __('Map name');
@@ -462,6 +464,7 @@ if (!$maps && !is_metaconsole()) {
     }
 
     html_print_table($table);
+    ui_pagination($total_maps, $url, $offset, $pagination, false, 'offset', true, 'pagination-bottom');
 }
 
 if ($maps) {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 7253b931d4..84a9eb0267 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -646,7 +646,7 @@ switch ($action) {
             $table = new stdClass();
             $table->id = 'report_list';
             $table->width = '100%';
-            $table->class = 'databox data';
+            $table->class = 'info_table';
             $table->cellpadding = 0;
             $table->cellspacing = 0;
 
@@ -887,6 +887,7 @@ switch ($action) {
             }
 
             html_print_table($table);
+            ui_pagination($total_reports, $url, $offset, $pagination, false, 'offset', true, 'pagination-bottom');
         } else {
             ui_print_info_message([ 'no_close' => true, 'message' => __('No data found.') ]);
         }
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 2bb4f6ab00..65a76690e0 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -40,7 +40,9 @@ if ($servers === false) {
 
 $table = new StdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->size = [];
 
 $table->style = [];
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 6e93f12165..fb62ff8339 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -758,9 +758,9 @@ if (check_login()) {
 
         $table = new stdClass();
         $table->width = '100%';
-        $table->cellpadding = 4;
-        $table->cellspacing = 4;
-        $table->class = 'databox data';
+        $table->cellpadding = 0;
+        $table->cellspacing = 0;
+        $table->class = 'info_table';
         $table->head = [];
         $table->data = [];
 
@@ -1199,7 +1199,7 @@ if (check_login()) {
                     false,
                     'offset',
                     true,
-                    '',
+                    'pagination-bottom',
                     'pagination_list_modules(offset_param)',
                     [
                         'count'  => '',
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index eee8138e1e..71227e27ca 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1884,7 +1884,7 @@ function ui_pagination(
         if ($print_total_items) {
             $output = "<div class='pagination $other_class' $set_id>";
             // Show the count of items
-            $output .= sprintf(__('Total items: %s'), $count);
+            $output .= '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
             // End div and layout
             $output .= '</div>';
 
@@ -1910,10 +1910,11 @@ function ui_pagination(
 
     // Show the count of items
     if ($print_total_items) {
-        $output .= sprintf(__('Total items: %s'), $count);
-        $output .= '<br>';
+        $output .= '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
     }
 
+    $output .= "<div class='total_number'>";
+
     // Show GOTO FIRST PAGE button
     if ($number_of_pages > $block_limit) {
         if (!empty($script)) {
@@ -1929,10 +1930,10 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_0'
-				href='javascript: $script_modified;'>".html_print_image('images/go_first.png', true, ['class' => 'bot']).'</a>&nbsp;';
+            $output .= "<a class='pagination-arrows $other_class offset_0'
+				href='javascript: $script_modified;'>".html_print_image('images/go_first.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination $other_class offset_0' href='$url&amp;$offset_name=0'>".html_print_image('images/go_first.png', true, ['class' => 'bot']).'</a>&nbsp;';
+            $output .= "<a class='pagination-arrows $other_class offset_0' href='$url&amp;$offset_name=0'>".html_print_image('images/go_first.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
@@ -1958,10 +1959,10 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_$offset_previous_page'
+            $output .= "<a class='pagination-arrows $other_class offset_$offset_previous_page'
 				href='javacript: $script_modified;'>".html_print_image('images/go_previous.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination $other_class offset_$offset_previous_page' href='$url&amp;$offset_name=$offset_previous_page'>".html_print_image('images/go_previous.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.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
@@ -1970,9 +1971,9 @@ function ui_pagination(
         $actual_page = (int) ($offset / $pagination);
 
         if ($iterator == $actual_page) {
-            $output .= "<span style='font-weight: bold;'>";
+            $output .= "<div class='page_number page_number_active'>";
         } else {
-            $output .= '<span>';
+            $output .= "<div class='page_number'>";
         }
 
         $offset_page = ($iterator * $pagination);
@@ -1990,15 +1991,15 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_$offset_page'
+            $output .= "<a 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='offset_$offset_page' href='$url&amp;$offset_name=$offset_page'>";
         }
 
-        $output .= "[ $iterator ]";
+        $output .= $iterator;
 
-        $output .= '</a></span>';
+        $output .= '</a></div>';
     }
 
     // Show NEXT PAGE GROUP OF PAGES
@@ -2023,10 +2024,10 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_$offset_next_page'
+            $output .= "<a class='pagination-arrows $other_class offset_$offset_next_page'
 				href='javascript: $script_modified;'>".html_print_image('images/go_next.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination $other_class offset_$offset_next_page' href='$url&amp;$offset_name=$offset_next_page'>".html_print_image('images/go_next.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.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
@@ -2047,13 +2048,15 @@ function ui_pagination(
                 $script_modified
             );
 
-            $output .= "<a class='pagination $other_class offset_$offset_lastpage'
+            $output .= "<a class='pagination-arrows $other_class offset_$offset_lastpage'
 				href='javascript: $script_modified;'>".html_print_image('images/go_last.png', true, ['class' => 'bot']).'</a>';
         } else {
-            $output .= "<a class='pagination $other_class offset_$offset_lastpage' href='$url&amp;$offset_name=$offset_lastpage'>".html_print_image('images/go_last.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.png', true, ['class' => 'bot']).'</a>';
         }
     }
 
+    $output .= '</div>';
+    // total_number
     // End div and layout
     $output .= '</div>';
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6631a5dc48..af40f50077 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5006,3 +5006,170 @@ select#autorefresh_list:-internal-list-box {
 .table_three_columns .table_td {
   width: 33%;
 }
+
+/*
+ * ---------------------------------------------------------------------
+ * - TABLES TO SHOW INFORMATION
+ * ---------------------------------------------------------------------
+ */
+
+table.info_table {
+  background-color: #fff;
+  /* margin-bottom: 20px;*/
+  border-spacing: 0;
+}
+
+table.info_table tr:nth-child(even) {
+  background-color: #f5f5f5;
+}
+
+table.info_table tr:first-child > th {
+  background-color: #373737;
+  color: #fff;
+  /*font-size: 9pt;*/
+}
+
+table.info_table tr:first-child > th span {
+  /*font-size: 9pt;*/
+}
+
+table.info_table th {
+  color: #fff;
+  background-color: #666;
+  font-size: 7.5pt;
+  letter-spacing: 0.3pt;
+}
+
+table.info_table > thead > tr:first-child > th:last-child {
+  border-right: 1px solid #373737;
+  border-top-right-radius: 4px;
+}
+
+table.info_table > thead > tr:first-child > th:first-child {
+  border-left: 1px solid #373737;
+  border-top-left-radius: 4px;
+}
+
+table.info_table > thead > tr > th,
+table.info_table > tbody > tr > th,
+table.info_table > thead > tr > th a {
+  padding: 9px 7px;
+  font-weight: normal;
+  color: #fff;
+}
+
+table.info_table > tbody > tr > td {
+  -moz-border-radius: 0px;
+  -webkit-border-radius: 0px;
+  border-radius: 0px;
+  border: none;
+  /*padding: 9px 7px;*/
+  padding-left: 9px;
+  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,
+table.info_table > thead > tr > th > img,
+table.info_table > tbody > tr > td > div > a > img,
+table.info_table > tbody > tr > td > span > img,
+table.info_table > tbody > tr > td > span > a > img,
+table.info_table > tbody > tr > td > a > img,
+table.info_table > tbody > tr > td > form > a > img {
+  vertical-align: middle;
+}
+
+table.info_table > tbody > tr:hover {
+  background-color: #eee;
+}
+
+table.info_table td:last-child img {
+  border-radius: 4px;
+  /* border: 2px solid #dcdcdc !important;*/
+  /* padding: 2px;*/
+  border: 1px solid #dcdcdc !important;
+  padding: 1px;
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+.pagination {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  margin-bottom: 10px;
+}
+
+.pagination .page_number {
+  border: 1px solid #cacaca;
+  border-right: 0px;
+  text-align: center;
+}
+
+.pagination .page_number a {
+  padding: 5px;
+  width: 12px;
+  display: block;
+}
+
+.pagination .total_number > *:first-child {
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+.pagination .total_number > *:last-child {
+  border-top-right-radius: 2px;
+  border-bottom-right-radius: 2px;
+  border-right: 1px solid #cacaca !important;
+}
+
+.pagination .page_number_active {
+  font-weight: bold;
+  background-color: #82b92e;
+  color: #fff;
+  border-color: #82b92e;
+}
+
+.pagination .page_number_active a {
+  color: #fff;
+}
+
+.pagination .total_pages {
+}
+
+.pagination .total_number {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.pagination a {
+  margin: 0 !important;
+}
+
+.pagination .pagination-arrows {
+  border: 1px solid #cacaca;
+  border-right: 0px;
+}
+
+.pagination-bottom {
+  margin-bottom: 15px;
+  margin-top: 10px;
+  align-items: flex-start;
+}
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index f0d7565c70..706a1a8552 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -442,7 +442,7 @@ if ($print_agent) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->cellpadding = '0';
 $table->cellspacing = '0';
 $table->size = [];
@@ -608,6 +608,16 @@ if (!empty($table->data)) {
         'offset_simple'
     );
     html_print_table($table);
+    ui_pagination(
+        $countAlertsSimple,
+        $url,
+        $offset_simple,
+        0,
+        false,
+        'offset_simple',
+        true,
+        'pagination-bottom'
+    );
 
     if (!is_metaconsole()) {
         if (check_acl($config['id_user'], $id_group, 'AW') || check_acl($config['id_user'], $id_group, 'LM')) {
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index b823ad02d9..16c080edd3 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -631,7 +631,7 @@ $table = new stdClass();
 $table->cellpadding = 0;
 $table->cellspacing = 0;
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
 $table->head[0] = __('Agent').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).'</a>';
@@ -795,14 +795,6 @@ foreach ($agents as $agent) {
 
 if (!empty($table->data)) {
     html_print_table($table);
-    if (check_acl($config['id_user'], 0, 'AW') || check_acl($config['id_user'], 0, 'AM')) {
-        echo '<div style="text-align: right; float: right;">';
-        echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
-            html_print_input_hidden('new_agent', 1);
-            html_print_submit_button(__('Create agent'), 'crt', false, 'class="sub next"');
-        echo '</form>';
-        echo '</div>';
-    }
 
     ui_pagination(
         $total_agents,
@@ -819,8 +811,19 @@ if (!empty($table->data)) {
         0,
         false,
         'offset',
-        false
+        true,
+        'pagination-bottom'
     );
+
+    if (check_acl($config['id_user'], 0, 'AW') || check_acl($config['id_user'], 0, 'AM')) {
+        echo '<div style="text-align: right; float: right;">';
+        echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente">';
+            html_print_input_hidden('new_agent', 1);
+            html_print_submit_button(__('Create agent'), 'crt', false, 'class="sub next"');
+        echo '</form>';
+        echo '</div>';
+    }
+
     unset($table);
 } else {
     ui_print_info_message([ 'no_close' => true, 'message' => __('There are no defined agents') ]);
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 604d800307..67407eb319 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -612,7 +612,9 @@ switch ($tab) {
 
         $table = new stdClass();
         $table->width = '100%';
-        $table->class = 'databox data';
+        $table->class = 'info_table';
+        $table->cellpadding = 0;
+        $table->cellspacing = 0;
         $table->headstyle['copy'] = 'text-align: center;';
         $table->headstyle['edit'] = 'text-align: center;';
 
@@ -657,11 +659,24 @@ switch ($tab) {
 
         $id_groups = array_keys(users_get_groups());
 
-        $network_maps = db_get_all_rows_filter(
+        // Prepare pagination.
+        $offset = (int) get_parameter('offset');
+        $limit = $config['block_size'];
+        $count_maps = db_get_value_filter(
+            'count(*)',
             'tmap',
             ['id_group' => $id_groups]
         );
 
+        $network_maps = db_get_all_rows_filter(
+            'tmap',
+            [
+                'id_group' => $id_groups,
+                'limit'    => $limit,
+                'offset'   => $offset,
+            ]
+        );
+
         if ($network_maps !== false) {
             $table->data = [];
 
@@ -732,7 +747,9 @@ switch ($tab) {
                 $table->data[] = $data;
             }
 
+            ui_pagination($count_maps, false, $offset);
             html_print_table($table);
+            ui_pagination($count_maps, false, 0, 0, false, 'offset', true, 'pagination-bottom');
         } else {
             ui_print_info_message(['no_close' => true, 'message' => __('There are no maps defined.') ]);
         }
@@ -756,4 +773,3 @@ switch ($tab) {
         }
     break;
 }
-
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index fa0473c771..9a51210216 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -987,7 +987,7 @@ if ($autosearch) {
         if ($result === false) {
             $result = [];
         } else {
-            ui_pagination($count, false, $offset);
+            ui_pagination($count, false, $offset, 0, false, 'offset', true);
         }
     } else {
         // For each server defined and not disabled:
@@ -1073,7 +1073,7 @@ if (!empty($result)) {
     $table->cellpadding = 0;
     $table->cellspacing = 0;
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->head = [];
     $table->data = [];
     $table->size = [];
@@ -1659,6 +1659,8 @@ if (!empty($result)) {
     }
 
     html_print_table($table);
+
+    ui_pagination($count, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     if ($first_interaction) {
         ui_print_info_message(['no_close' => true, 'message' => __('This group doesn\'t have any monitor')]);
diff --git a/pandora_console/operation/events/events.build_table.php b/pandora_console/operation/events/events.build_table.php
index d38bd1918e..d4b3ed3a30 100644
--- a/pandora_console/operation/events/events.build_table.php
+++ b/pandora_console/operation/events/events.build_table.php
@@ -929,6 +929,13 @@ if ($group_rep == 2) {
         }
 
         html_print_table($table);
+        if ($allow_pagination) {
+            $params_to_paginate = $params;
+            unset($params_to_paginate['offset']);
+            $url_paginate = 'index.php?'.http_build_query($params_to_paginate, '', '&amp;');
+            ui_pagination($total_events, $url_paginate, $offset, $pagination, false, 'offset', true, 'pagination-bottom');
+        }
+
         echo '</div>';
 
         if ($allow_action) {
diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php
index 84a057d69c..b647d0ef20 100644
--- a/pandora_console/operation/servers/recon_view.php
+++ b/pandora_console/operation/servers/recon_view.php
@@ -76,10 +76,10 @@ if ($servers === false) {
             }
 
             $table = new StdClass();
-            $table->cellpadding = 4;
-            $table->cellspacing = 4;
+            $table->cellpadding = 0;
+            $table->cellspacing = 0;
             $table->width = '100%';
-            $table->class = 'databox data';
+            $table->class = 'info_table';
             $table->head = [];
             $table->data = [];
             $table->align = [];

From 3f4156162870a00669c0b56eeb15254396169e77 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Fri, 29 Mar 2019 09:23:38 +0100
Subject: [PATCH 02/32] Added pandoradb.sql without output column in
 tnetflow_filter

Former-commit-id: 7bb1ce608678dbbc192bf734515ce96caba25c66
---
 pandora_console/pandoradb.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0ecc9b8f5d..4aa8c0122c 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1963,7 +1963,6 @@ CREATE TABLE IF NOT EXISTS `tnetflow_filter` (
 	`advanced_filter` TEXT NOT NULL,
 	`filter_args` TEXT NOT NULL,
 	`aggregate` varchar(60),
-	`output` varchar(60),
 	PRIMARY KEY  (`id_sg`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 

From 26451c41a1d685bfe43a6a8dbf867a173fce5229 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 29 Mar 2019 11:05:52 +0100
Subject: [PATCH 03/32] New design for the tables - #3707

Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
---
 pandora_console/godmode/admin_access_logs.php |  7 +--
 .../godmode/alerts/alert_actions.php          |  2 +-
 .../godmode/alerts/alert_commands.php         |  2 +-
 .../godmode/alerts/alert_list.list.php        |  7 ++-
 .../godmode/alerts/alert_templates.php        |  3 +-
 pandora_console/godmode/category/category.php | 11 ++++-
 .../godmode/events/event_filter.php           |  2 +-
 pandora_console/godmode/groups/group_list.php |  7 +--
 .../modules/manage_network_components.php     |  3 +-
 .../modules/manage_network_templates.php      | 19 +++++++-
 pandora_console/godmode/servers/plugin.php    |  2 +-
 pandora_console/godmode/setup/gis.php         |  1 +
 pandora_console/godmode/setup/links.php       |  2 +-
 pandora_console/godmode/setup/news.php        |  2 +-
 pandora_console/godmode/setup/os.list.php     | 18 +++++++-
 pandora_console/godmode/tag/tag.php           |  3 +-
 pandora_console/godmode/users/user_list.php   |  3 +-
 pandora_console/include/styles/pandora.css    | 46 +++++++++++++------
 .../operation/gis_maps/gis_map.php            |  2 +-
 .../operation/messages/message_list.php       |  6 +--
 pandora_console/operation/users/user_edit.php |  2 +-
 21 files changed, 109 insertions(+), 41 deletions(-)

diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index 93c668f00c..0a2c545eb1 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -183,10 +183,10 @@ if (empty($result)) {
 }
 
 $table = new stdClass();
-$table->cellpadding = 4;
-$table->cellspacing = 4;
+$table->cellpadding = 0;
+$table->cellspacing = 0;
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->size = [];
 $table->data = [];
 $table->head = [];
@@ -247,6 +247,7 @@ foreach ($result as $row) {
 }
 
 html_print_table($table);
+ui_pagination($count, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
 
 if ($enterprise_include !== ENTERPRISE_NOT_HOOK) {
     enterprise_hook('enterpriseAuditFooter');
diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index 6140d5407a..1530c6207f 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -221,7 +221,7 @@ if ($delete_action) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->data = [];
 $table->head = [];
 $table->head[0] = __('Name');
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 455ae72d73..8bbfa01dee 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -388,7 +388,7 @@ if ($copy_command) {
 }
 
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->data = [];
 $table->head = [];
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 77bb7067bb..ee6411fe96 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -407,7 +407,7 @@ $table = new stdClass();
 if (is_metaconsole()) {
     $table->class = 'alert_list databox';
 } else {
-    $table->class = 'databox data';
+    $table->class = 'info_table';
 }
 
 $table->width = '100%';
@@ -815,6 +815,11 @@ foreach ($simple_alerts as $alert) {
 
 if (isset($data)) {
     html_print_table($table);
+    if ($id_agente) {
+        ui_pagination($total, 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&id_agente='.$id_agente.$form_params.$sort_params, 0, 0, false, 'offset', true, 'pagination-bottom');
+    } else {
+        ui_pagination($total, 'index.php?sec='.$sec.'&sec2=godmode/alerts/alert_list'.$form_params.$sort_params, 0, 0, false, 'offset', true, 'pagination-bottom');
+    }
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('No alerts defined') ]);
 }
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index f00dbe5827..90e01b712d 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -339,7 +339,7 @@ if ($templates === false) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->data = [];
 $table->head = [];
 $table->head[0] = __('Name');
@@ -396,6 +396,7 @@ foreach ($templates as $template) {
 ui_pagination($total_templates, $url);
 if (isset($data)) {
     html_print_table($table);
+    ui_pagination($total_templates, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('No alert templates defined') ]);
 }
diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php
index 727be02057..ba7155cc6b 100755
--- a/pandora_console/godmode/category/category.php
+++ b/pandora_console/godmode/category/category.php
@@ -82,7 +82,13 @@ $filter['limit'] = (int) $config['block_size'];
 // Search action: This will filter the display category view
 $result = false;
 
-$result = categories_get_all_categories();
+$result = db_get_all_rows_filter(
+    'tcategory',
+    [
+        'limit'  => $filter['limit'],
+        'offset' => $filter['offset'],
+    ]
+);
 
 // Display categories previously filtered or not
 $rowPair = true;
@@ -94,7 +100,7 @@ if (!empty($result)) {
 
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
 
     $table->data = [];
     $table->head = [];
@@ -131,6 +137,7 @@ if (!empty($result)) {
     }
 
     html_print_table($table);
+    ui_pagination($total_categories, $url, $offset, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     // No categories available or selected
     ui_print_info_message(['no_close' => true, 'message' => __('No categories found') ]);
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index 40d60650f6..59bd219ee6 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -113,7 +113,7 @@ if ($filters === false) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
 $table->head[0] = __('Name');
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 6fc899a5d8..e24342ff6d 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -515,7 +515,7 @@ if ($tab == 'tree') {
 
         $table = new StdClass();
         $table->width = '100%';
-        $table->class = 'databox data';
+        $table->class = 'info_table';
         $table->head = [];
         $table->head[0] = __('ID');
         $table->head[1] = __('Name');
@@ -592,7 +592,7 @@ if ($tab == 'tree') {
             $block_size,
             true,
             'offset',
-            false
+            true
         );
         html_print_table($table);
         echo ui_pagination(
@@ -602,7 +602,8 @@ if ($tab == 'tree') {
             $block_size,
             true,
             'offset',
-            true
+            true,
+            'pagination-bottom'
         );
     } else {
         ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups') ]);
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index f1fae1785d..6014ef08c5 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -634,7 +634,7 @@ unset($table);
 
 $table->width = '100%';
 $table->head = [];
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->head[0] = __('Module name');
 $table->head[1] = __('Type');
 $table->head[3] = __('Description');
@@ -698,6 +698,7 @@ if (isset($data)) {
     echo "<form method='post' action='index.php?sec=".$sec.'&sec2=godmode/modules/manage_network_components&search_id_group=0search_string=&pure='.$pure."'>";
     html_print_input_hidden('multiple_delete', 1);
     html_print_table($table);
+    ui_pagination($total_components, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
     echo "<div style='float: right; margin-left: 5px;'>";
     html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
     echo '</div>';
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index b179bdfd91..10468e75bf 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -189,7 +189,20 @@ if ($export_profile) {
     exit;
 }
 
-$result = db_get_all_rows_in_table('tnetwork_profile', 'name');
+// Prepare pagination.
+$offset = (int) get_parameter('offset');
+$limit = $config['block_size'];
+$count_network_templates = db_get_value('count(*)', 'tnetwork_profile');
+
+$result = db_get_all_rows_filter(
+    'tnetwork_profile',
+    [
+        'order'  => 'name',
+        'limit'  => $limit,
+        'offset' => $offset,
+    ]
+);
+
 if ($result === false) {
     $result = [];
 }
@@ -197,7 +210,7 @@ if ($result === false) {
 $table->cellpadding = 0;
 $table->cellspacing = 0;
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
 $table->head[0] = __('Name');
@@ -241,7 +254,9 @@ foreach ($result as $row) {
 if (!empty($table->data)) {
     echo '<form method="post" action="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates">';
     html_print_input_hidden('multiple_delete', 1);
+    ui_pagination($count_network_templates, false, $offset);
     html_print_table($table);
+    ui_pagination($count_network_templates, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
     echo "<div style='padding-left: 5px; float: right; '>";
     html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete"');
     echo '</div>';
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index b04643e1c3..9520bb6625 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -954,7 +954,7 @@ if (($create != '') || ($view != '')) {
         if (defined('METACONSOLE')) {
             echo '<table width="100%" cellspacing="4" cellpadding="4" class="databox data">';
         } else {
-            echo '<table width="100%" cellspacing="4" cellpadding="4" class="databox data">';
+            echo '<table width="100%" cellspacing="4" cellpadding="4" class="info_table">';
         }
 
         echo '<th>'.__('Name').'</th>';
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 946d0526ea..3acd113014 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -63,6 +63,7 @@ switch ($action) {
     break;
 }
 
+$table->class = 'info_table';
 $table->width = '98%';
 $table->head[0] = __('Map connection name');
 $table->head[1] = __('Group');
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index f5016e666e..450115590a 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -137,7 +137,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
     if (empty($rows)) {
         ui_print_info_message(['no_close' => true, 'message' => __("There isn't links") ]);
     } else {
-        echo "<table cellpadding='4' cellspacing='4' class='databox data' style='width:100%'>";
+        echo "<table cellpadding='0' cellspacing='0' class='info_table' style='width:100%'>";
         echo "<th width='180px'>".__('Link name').'</th>';
         echo "<th width='10px'>".__('Delete').'</th>';
 
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index 7b663bad53..3339b8cd88 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -231,7 +231,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
         ui_print_info_message(['no_close' => true, 'message' => __('There are no defined news') ]);
     } else {
         // Main list view for Links editor
-        echo "<table cellpadding='4' cellspacing='4' class='databox data' width=100%>";
+        echo "<table cellpadding='0' cellspacing='0' class='info_table' width=100%>";
         echo '<th>'.__('Subject').'</th>';
         echo '<th>'.__('Type').'</th>';
         echo '<th>'.__('Author').'</th>';
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index f00b8cb00d..5673dd476a 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -25,7 +25,7 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 $table = new stdClass();
 
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head[0] = '';
 $table->head[1] = __('ID');
@@ -37,7 +37,19 @@ $table->align[4] = 'center';
 $table->size[0] = '20px';
 $table->size[4] = '20px';
 
-$osList = db_get_all_rows_in_table('tconfig_os');
+// Prepare pagination.
+$offset = (int) get_parameter('offset');
+$limit = $config['block_size'];
+$count_osList = db_get_value('count(*)', 'tconfig_os');
+
+$osList = db_get_all_rows_filter(
+    'tconfig_os',
+    [
+        'offset' => $offset,
+        'limit'  => $limit,
+    ]
+);
+
 if ($osList === false) {
     $osList = [];
 }
@@ -69,7 +81,9 @@ foreach ($osList as $os) {
 }
 
 if (isset($data)) {
+    ui_pagination($count_osList, false, $offset);
     html_print_table($table);
+    ui_pagination($count_osList, false, $offset, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     ui_print_info_message(['no_close' => true, 'message' => __('There are no defined operating systems') ]);
 }
diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php
index d717a9095e..e8678bb1ad 100644
--- a/pandora_console/godmode/tag/tag.php
+++ b/pandora_console/godmode/tag/tag.php
@@ -191,7 +191,7 @@ if (!empty($result)) {
 
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
 
     $table->data = [];
     $table->head = [];
@@ -284,6 +284,7 @@ if (!empty($result)) {
     }
 
     html_print_table($table);
+    ui_pagination($total_tags, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
 } else {
     if (is_metaconsole()) {
         ui_toggle($filter_form, __('Show Options'));
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 6b4d19ad28..b5904225a2 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -304,7 +304,7 @@ $table = new stdClass();
 $table->cellpadding = 0;
 $table->cellspacing = 0;
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
 $table->data = [];
@@ -535,6 +535,7 @@ foreach ($info as $user_id => $user_info) {
 }
 
 html_print_table($table);
+ui_pagination(count($info), false, 0, 0, false, 'offset', true, 'pagination-bottom');
 
 echo '<div style="width: '.$table->width.'" class="action-buttons">';
 unset($table);
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index b81387a4e5..e4b3e86cd2 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -3958,7 +3958,7 @@ span.log_zone_line_error {
   background-color: #eee;
 }
 .checkselected {
-  background-color: #eee;
+  background-color: #eee !important;
 }
 .tag-wrapper {
   padding: 0 10px 0 0;
@@ -5040,18 +5040,22 @@ select#autorefresh_list:-internal-list-box {
 
 table.info_table {
   background-color: #fff;
-  /* margin-bottom: 20px;*/
+  margin-bottom: 10px;
   border-spacing: 0;
 }
 
-table.info_table tr:nth-child(even) {
+table.info_table tbody tr:nth-child(even) {
   background-color: #f5f5f5;
 }
 
 table.info_table tr:first-child > th {
-  background-color: #373737;
-  color: #fff;
+  /*background-color: #373737;*/
+  /*color: #fff;*/
   /*font-size: 9pt;*/
+  background-color: #fff;
+  border-top: 1px solid #e2e2e2;
+  color: #000;
+  text-align: left !important;
 }
 
 table.info_table tr:first-child > th span {
@@ -5059,19 +5063,35 @@ table.info_table tr:first-child > th span {
 }
 
 table.info_table th {
-  color: #fff;
-  background-color: #666;
+  /*color: #fff;*/
+  /*background-color: #666;*/
   font-size: 7.5pt;
   letter-spacing: 0.3pt;
+  color: #000;
+  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;
 }
 
 table.info_table > thead > tr:first-child > th:last-child {
-  border-right: 1px solid #373737;
+  /*border-right: 1px solid #373737;*/
+  /*border-right: 1px solid #e2e2e2;*/
   border-top-right-radius: 4px;
 }
 
 table.info_table > thead > tr:first-child > th:first-child {
-  border-left: 1px solid #373737;
+  /*border-left: 1px solid #373737;*/
+  /* border-left: 1px solid #e2e2e2;*/
   border-top-left-radius: 4px;
 }
 
@@ -5079,8 +5099,8 @@ table.info_table > thead > tr > th,
 table.info_table > tbody > tr > th,
 table.info_table > thead > tr > th a {
   padding: 9px 7px;
-  font-weight: normal;
-  color: #fff;
+  font-weight: bold;
+  color: #000;
 }
 
 table.info_table > tbody > tr > td {
@@ -5150,7 +5170,7 @@ table.info_table td:last-child img {
 
 .pagination .page_number a {
   padding: 5px;
-  width: 12px;
+  min-width: 12px;
   display: block;
 }
 
@@ -5195,6 +5215,6 @@ table.info_table td:last-child img {
 
 .pagination-bottom {
   margin-bottom: 15px;
-  margin-top: 10px;
+  margin-top: 0px;
   align-items: flex-start;
 }
diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php
index 9e6ea1a50a..6b6f5fad25 100644
--- a/pandora_console/operation/gis_maps/gis_map.php
+++ b/pandora_console/operation/gis_maps/gis_map.php
@@ -96,7 +96,7 @@ $maps = gis_get_maps();
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
 $table->head['name'] = __('Name');
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index 9427159432..88153b8fc9 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -135,9 +135,9 @@ if (empty($messages)) {
 } else {
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
-    $table->cellpadding = 4;
-    $table->cellspacing = 4;
+    $table->class = 'info_table';
+    $table->cellpadding = 0;
+    $table->cellspacing = 0;
     $table->head = [];
     $table->data = [];
     $table->align = [];
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index a5e3390c69..47e0f9f687 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -575,7 +575,7 @@ if (!defined('METACONSOLE')) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 if (defined('METACONSOLE')) {
     $table->width = '100%';
     $table->class = 'databox data';

From 7412a7cef0a07017bd3a623758d9e3d5bbeb77a0 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Fri, 29 Mar 2019 13:37:12 +0100
Subject: [PATCH 04/32] change

Former-commit-id: 47ccc5dce928453e1fac9c1036094e6a03c6cde7
---
 pandora_console/pandoradb.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 4aa8c0122c..77c5ab9324 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1989,7 +1989,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
 	`date` bigint(20) NOT NULL default '0',
 	`period` int(11) NOT NULL default 0,
 	`max` int (11) NOT NULL default 0,
-	`show_graph` varchar(60),
+	`show_graph` varchar(60)
 	`order` int (11) NOT NULL default 0,
 	PRIMARY KEY(`id_rc`),
 	FOREIGN KEY (`id_report`) REFERENCES tnetflow_report(`id_report`)

From b3c7a9fb4d28a73f89aecffec2845738b04e9a62 Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Fri, 29 Mar 2019 13:38:36 +0100
Subject: [PATCH 05/32] change

Former-commit-id: 3fe44307ee0118db78b80a21d0aa209e709e0d7d
---
 pandora_console/pandoradb.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 77c5ab9324..4aa8c0122c 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1989,7 +1989,7 @@ CREATE TABLE IF NOT EXISTS `tnetflow_report_content` (
 	`date` bigint(20) NOT NULL default '0',
 	`period` int(11) NOT NULL default 0,
 	`max` int (11) NOT NULL default 0,
-	`show_graph` varchar(60)
+	`show_graph` varchar(60),
 	`order` int (11) NOT NULL default 0,
 	PRIMARY KEY(`id_rc`),
 	FOREIGN KEY (`id_report`) REFERENCES tnetflow_report(`id_report`)

From 48c4eb9c01d4d518d9a06b82ac71d053e6b0b87b Mon Sep 17 00:00:00 2001
From: "marcos.alconada" <marcos.alconada@artica.es>
Date: Fri, 29 Mar 2019 13:58:53 +0100
Subject: [PATCH 06/32] Add changes in migrate and 27.sql file

Former-commit-id: 60c2e2f2dc9a78ff9fb236efe7ac57a288d3717a
---
 pandora_console/extras/mr/27.sql                             | 5 +++++
 .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql            | 2 ++
 2 files changed, 7 insertions(+)
 create mode 100644 pandora_console/extras/mr/27.sql

diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql
new file mode 100644
index 0000000000..2ed92ecbaf
--- /dev/null
+++ b/pandora_console/extras/mr/27.sql
@@ -0,0 +1,5 @@
+START TRANSACTION;
+
+ALTER TABLE tnetflow_filter DROP COLUMN output;
+
+COMMIT;
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 6e5e2ebcc9..276a984831 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -2058,3 +2058,5 @@ INSERT INTO `trecon_script` (`name`,`description`,`script`,`macros`) VALUES ('Di
 -- Add column in table `tagent_custom_fields`
 -- ----------------------------------------------------------------------
 ALTER TABLE tagent_custom_fields ADD COLUMN `combo_values` VARCHAR(255) DEFAULT '';
+ALTER TABLE tnetflow_filter DROP COLUMN output;
+

From f497d3bd2e4b2b32af35be06bc49806e7b26a844 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Tue, 2 Apr 2019 13:42:30 +0200
Subject: [PATCH 07/32] Added class to action buttons and moved checkbox to the
 left side

Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
---
 pandora_console/extensions/agents_alerts.php  |   4 +-
 pandora_console/godmode/admin_access_logs.php |  10 +++
 .../godmode/agentes/fields_manager.php        |   3 +-
 .../godmode/agentes/modificar_agente.php      |   6 +-
 .../godmode/alerts/alert_actions.php          |   4 +
 .../godmode/alerts/alert_commands.php         |   1 +
 .../godmode/alerts/alert_list.list.php        |   5 +-
 .../godmode/alerts/alert_templates.php        |   3 +-
 pandora_console/godmode/category/category.php |   3 +-
 .../godmode/events/event_filter.php           |  45 ++++++-----
 .../godmode/events/event_responses.list.php   |   3 +-
 pandora_console/godmode/extensions.php        |   3 +-
 pandora_console/godmode/groups/group_list.php |   3 +-
 .../godmode/groups/modu_group_list.php        |   1 +
 .../godmode/modules/manage_nc_groups.php      |  16 ++--
 .../modules/manage_network_components.php     |   9 ++-
 .../modules/manage_network_templates.php      |  29 ++++---
 .../godmode/modules/module_list.php           |   4 +-
 pandora_console/godmode/netflow/nf_edit.php   |  28 ++++---
 pandora_console/godmode/reporting/graphs.php  |  19 +++--
 .../godmode/reporting/map_builder.php         |   4 +
 .../godmode/reporting/reporting_builder.php   |  16 ++--
 pandora_console/godmode/servers/plugin.php    |   3 +
 .../godmode/servers/servers.build_table.php   |  14 ++--
 pandora_console/godmode/setup/gis.php         |   7 +-
 pandora_console/godmode/setup/links.php       |   4 +-
 pandora_console/godmode/setup/news.php        |   5 +-
 pandora_console/godmode/setup/os.list.php     |   2 +
 pandora_console/godmode/tag/tag.php           |   3 +-
 .../godmode/users/profile_list.php            |   5 +-
 pandora_console/godmode/users/user_list.php   |   1 +
 pandora_console/images/go_first_g.png         | Bin 0 -> 245 bytes
 pandora_console/images/go_last_g.png          | Bin 0 -> 241 bytes
 pandora_console/images/go_next_g.png          | Bin 0 -> 209 bytes
 pandora_console/images/go_previous_g.png      | Bin 0 -> 199 bytes
 pandora_console/include/functions_ui.php      |  49 ++++++------
 pandora_console/include/styles/pandora.css    |  75 ++++++++++--------
 .../operation/agentes/alerts_status.php       |  66 +++++++--------
 .../operation/agentes/pandora_networkmap.php  |   5 ++
 .../operation/gis_maps/gis_map.php            |   3 +-
 .../operation/incidents/incident.php          |  65 ++++++++-------
 .../operation/messages/message_list.php       |  13 ++-
 .../operation/servers/recon_view.php          |   1 +
 43 files changed, 324 insertions(+), 216 deletions(-)
 create mode 100644 pandora_console/images/go_first_g.png
 create mode 100644 pandora_console/images/go_last_g.png
 create mode 100644 pandora_console/images/go_next_g.png
 create mode 100644 pandora_console/images/go_previous_g.png

diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 5b0cc4a72d..373ff97819 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -379,6 +379,7 @@ function mainAgentsAlerts()
         );
 
         echo '<table class="info_table" cellpadding="0" cellspacing="0" border="0" width=100%>';
+        echo '<thead><tr>';
         echo "<th width='140px' >".__('Agents').' / '.__('Alert templates').'</th>';
 
         if ($hor_offset > 0) {
@@ -424,6 +425,7 @@ function mainAgentsAlerts()
             echo '<th width="20px" >'.io_safe_output($tname).html_print_image('images/information_alerts.png', true, ['title' => io_safe_output($tname), 'style' => 'margin-left:5px' ]).'</th>';
         }
 
+        echo '</tr></thead>';
         if (($hor_offset + $block) < $ntemplates) {
             $new_hor_offset = ($hor_offset + $block);
             echo "<th width='20px' style='' rowspan='".($nagents + 1)."'>
@@ -455,7 +457,7 @@ function mainAgentsAlerts()
                         $cellstyle = 'background:'.COL_ALERTFIRED.';';
                     }
 
-                    echo '<td style=";'.$cellstyle.'"> ';
+                    echo '<td style=";'.$cellstyle.'" class="action_buttons"> ';
 
                     $uniqid = uniqid();
                     echo '<div>';
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index 0a2c545eb1..67a933d8cb 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -246,6 +246,16 @@ foreach ($result as $row) {
     }
 }
 
+foreach ($table->rowclass as $key => $value) {
+    if (strpos($value, 'limit_scroll') !== false) {
+        $table->colspan[$key] = [7];
+    } else {
+        if ($enterprise_include !== ENTERPRISE_NOT_HOOK) {
+            $table->cellclass[$key][6] = 'action_buttons';
+        }
+    }
+}
+
 html_print_table($table);
 ui_pagination($count, $url, 0, 0, false, 'offset', true, 'pagination-bottom');
 
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index ee94813a59..20a9db547a 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -146,8 +146,9 @@ foreach ($fields as $field) {
         $data[2] = html_print_image('images/icono_stop.png', true, ['style' => 'width:21px;height:21px;']);
     }
 
+    $table->cellclass[][3] = 'action_buttons';
     $data[3] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configure_field&id_field='.$field['id_field'].'">'.html_print_image('images/config.png', true, ['alt' => __('Edit'), 'title' => __('Edit'), 'border' => '0']).'</a>';
-    $data[3] .= '&nbsp;&nbsp;<a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'border' => '0']).'</a>';
+    $data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/fields_manager&delete_field=1&id_field='.$field['id_field'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete'), 'border' => '0']).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index cee4f06f8e..b8d551091e 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -442,6 +442,7 @@ ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modific
 
 if ($agents !== false) {
     echo "<table cellpadding='0' id='agent_list' cellspacing='0' width='100%' class='info_table'>";
+    echo '<thead><tr>';
     echo '<th>'.__('Agent name').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).'</a>';
     echo '</th>';
     echo "<th title='".__('Remote agent configuration')."'>".__('R').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown]).'</a>';
@@ -453,6 +454,7 @@ if ($agents !== false) {
         echo '</th>';
     echo '<th>'.__('Description').'</th>';
     echo "<th style='text-align:left'>".__('Actions').'</th>';
+    echo '</tr></thead>';
     $color = 1;
 
     $rowPair = true;
@@ -628,7 +630,7 @@ if ($agents !== false) {
             $offsetArg = $offset;
         }
 
-        echo "<td class='$tdcolor' align='left' style='width:7%' valign='middle'>";
+        echo "<td class='$tdcolor action_buttons' align='left' style='width:7%' valign='middle'>";
 
         if ($agent['disabled']) {
             echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
@@ -654,7 +656,7 @@ if ($agents !== false) {
         }
 
         if ($check_aw) {
-            echo "&nbsp;&nbsp;<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
+            echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&
 			borrar_agente=".$agent['id_agente']."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort&disabled=$disabled'";
 
             if ($agent['id_os'] != 100) {
diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index 1530c6207f..0de86bf070 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -281,6 +281,10 @@ foreach ($actions as $action) {
     }
 
     if (check_acl($config['id_user'], $action['id_group'], 'LM')) {
+        $table->cellclass[] = [
+            2 => 'action_buttons',
+            3 => 'action_buttons',
+        ];
         $data[2] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_actions&amp;copy_action=1&amp;id='.$action['id'].'&pure='.$pure.'"
 			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true).'</a>';
         $data[3] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_actions&delete_action=1&id='.$action['id'].'&pure='.$pure.'"
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 8bbfa01dee..e8378d1fc0 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -431,6 +431,7 @@ foreach ($commands as $command) {
         io_safe_output($command['description'])
     );
     $data['action'] = '';
+    $table->cellclass[]['action'] = 'action_buttons';
     if (! $command['internal']) {
         $data['action'] = '<span style="display: inline-flex">';
         $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'"
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index ee6411fe96..dd4d0e0763 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -728,6 +728,7 @@ foreach ($simple_alerts as $alert) {
 
     $data[3] = ui_print_status_image($status, $title, true);
 
+    $table->cellclass[][4] = 'action_buttons';
     $data[4] = '<form class="disable_alert_form" action="'.$url.'" method="post" style="display: inline;">';
     if ($alert['disabled']) {
         $data[4] .= html_print_input_image('enable', 'images/lightbulb_off.png', 1, 'padding:0px', true);
@@ -742,7 +743,7 @@ foreach ($simple_alerts as $alert) {
 
     // To manage alert is necessary LW permissions in the agent group
     if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW')) {
-        $data[4] .= '&nbsp;&nbsp;<form class="standby_alert_form" action="'.$url.'" method="post" style="display: inline;">';
+        $data[4] .= '<form class="standby_alert_form" action="'.$url.'" method="post" style="display: inline;">';
         if (!$alert['standby']) {
             $data[4] .= html_print_input_image('standby_off', 'images/bell.png', 1, 'padding:0px;', true);
             $data[4] .= html_print_input_hidden('standbyon_alert', 1, true);
@@ -771,7 +772,7 @@ foreach ($simple_alerts as $alert) {
 
     // To manage alert is necessary LW permissions in the agent group
     if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW')) {
-        $data[4] .= '&nbsp;&nbsp;<form class="delete_alert_form" action="'.$url.'" method="post" style="display: inline;">';
+        $data[4] .= '<form class="delete_alert_form" action="'.$url.'" method="post" style="display: inline;">';
         $is_cluster = (bool) get_parameter('id_cluster');
         if (!$is_cluster) {
             if ($alert['disabled']) {
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 90e01b712d..f346673f46 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -350,7 +350,7 @@ $table->head[4] = __('Op.');
 $table->style = [];
 $table->style[0] = 'font-weight: bold';
 $table->size = [];
-$table->size[4] = '85px';
+$table->size[4] = '60px';
 $table->align = [];
 $table->align[1] = 'left';
 $table->align[4] = 'left';
@@ -375,6 +375,7 @@ foreach ($templates as $template) {
     $data[3] = alerts_get_alert_templates_type_name($template['type']);
 
     if (check_acl($config['id_user'], $template['id_group'], 'LM')) {
+        $table->cellclass[][4] = 'action_buttons';
         $data[4] = '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'" style="display: inline; float: left">';
         $data[4] .= html_print_input_hidden('duplicate_template', 1, true);
         $data[4] .= html_print_input_hidden('source_id', $template['id'], true);
diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php
index ba7155cc6b..e1a61a4db6 100755
--- a/pandora_console/godmode/category/category.php
+++ b/pandora_console/godmode/category/category.php
@@ -129,7 +129,8 @@ if (!empty($result)) {
             $data[1] .= '<a  href="index.php?sec=advanced&sec2=godmode/category/category&delete_category='.$category['id'].'&pure='.(int) $config['pure'].'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image('images/cross.png', true, ['title' => 'Delete']).'</a>';
         } else {
             $data[0] = "<a href='index.php?sec=gmodules&sec2=godmode/category/edit_category&action=update&id_category=".$category['id'].'&pure='.(int) $config['pure']."'>".$category['name'].'</a>';
-            $data[1] = "<a href='index.php?sec=gmodules&sec2=godmode/category/edit_category&action=update&id_category=".$category['id'].'&pure='.(int) $config['pure']."'>".html_print_image('images/config.png', true, ['title' => 'Edit']).'</a>&nbsp;&nbsp;';
+            $table->cellclass[][1] = 'action_buttons';
+            $data[1] = "<a href='index.php?sec=gmodules&sec2=godmode/category/edit_category&action=update&id_category=".$category['id'].'&pure='.(int) $config['pure']."'>".html_print_image('images/config.png', true, ['title' => 'Edit']).'</a>';
             $data[1] .= '<a  href="index.php?sec=gmodules&sec2=godmode/category/category&delete_category='.$category['id'].'&pure='.(int) $config['pure'].'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image('images/cross.png', true, ['title' => 'Delete']).'</a>';
         }
 
diff --git a/pandora_console/godmode/events/event_filter.php b/pandora_console/godmode/events/event_filter.php
index 59bd219ee6..60ba973996 100644
--- a/pandora_console/godmode/events/event_filter.php
+++ b/pandora_console/godmode/events/event_filter.php
@@ -116,28 +116,30 @@ $table->width = '100%';
 $table->class = 'info_table';
 
 $table->head = [];
-$table->head[0] = __('Name');
-$table->head[1] = __('Group');
-$table->head[2] = __('Event type');
-$table->head[3] = __('Event status');
-$table->head[4] = __('Severity');
-$table->head[5] = __('Action').html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[0] = html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[1] = __('Name');
+$table->head[2] = __('Group');
+$table->head[3] = __('Event type');
+$table->head[4] = __('Event status');
+$table->head[5] = __('Severity');
+$table->head[6] = __('Action');
 $table->style = [];
-$table->style[0] = 'font-weight: bold';
+$table->style[1] = 'font-weight: bold';
 $table->align = [];
-$table->align[1] = 'left';
 $table->align[2] = 'left';
 $table->align[3] = 'left';
-
 $table->align[4] = 'left';
+
 $table->align[5] = 'left';
+$table->align[6] = 'left';
 $table->size = [];
-$table->size[0] = '50%';
-$table->size[1] = '5px';
-$table->size[2] = '80px';
+$table->size[0] = '20px';
+$table->size[1] = '50%';
+$table->size[2] = '5px';
 $table->size[3] = '80px';
 $table->size[4] = '80px';
-$table->size[5] = '40px';
+$table->size[5] = '80px';
+$table->size[6] = '40px';
 $table->data = [];
 
 $total_filters = db_get_all_rows_filter('tevent_filter', false, 'COUNT(*) AS total');
@@ -147,13 +149,14 @@ $total_filters = $total_filters[0]['total'];
 foreach ($filters as $filter) {
     $data = [];
 
-    $data[0] = '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&id='.$filter['id_filter'].'&pure='.$config['pure'].'">'.$filter['id_name'].'</a>';
-    $data[1] = ui_print_group_icon($filter['id_group_filter'], true);
-    $data[2] = events_get_event_types($filter['event_type']);
-    $data[3] = events_get_status($filter['status']);
-    $data[4] = events_get_severity_types($filter['severity']);
-    $data[5] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-		href='index.php?sec=geventos&sec2=godmode/events/events&section=filter&delete=1&id=".$filter['id_filter'].'&offset=0&pure='.$config['pure']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $filter['id_filter'], false, false, '', 'class="check_delete"', true);
+    $data[0] = html_print_checkbox_extended('delete_multiple[]', $filter['id_filter'], false, false, '', 'class="check_delete"', true);
+    $data[1] = '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=edit_filter&id='.$filter['id_filter'].'&pure='.$config['pure'].'">'.$filter['id_name'].'</a>';
+    $data[2] = ui_print_group_icon($filter['id_group_filter'], true);
+    $data[3] = events_get_event_types($filter['event_type']);
+    $data[4] = events_get_status($filter['status']);
+    $data[5] = events_get_severity_types($filter['severity']);
+    $table->cellclass[][6] = 'action_buttons';
+    $data[6] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;'href='index.php?sec=geventos&sec2=godmode/events/events&section=filter&delete=1&id=".$filter['id_filter'].'&offset=0&pure='.$config['pure']."'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
 
     array_push($table->data, $data);
 }
@@ -188,8 +191,6 @@ echo '</div>';
 ?>
 
 <script type="text/javascript">
-
-$("input[name=all_delete]").css("margin-left", "32px");
     
     $( document ).ready(function() {
 
diff --git a/pandora_console/godmode/events/event_responses.list.php b/pandora_console/godmode/events/event_responses.list.php
index 10f9b4c47b..f8e4de7357 100644
--- a/pandora_console/godmode/events/event_responses.list.php
+++ b/pandora_console/godmode/events/event_responses.list.php
@@ -59,8 +59,9 @@ foreach ($event_responses as $response) {
     $data[0] = '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.$response['name'].'</a>';
     $data[1] = $response['description'];
     $data[2] = ui_print_group_icon($response['id_group'], true);
+    $table->cellclass[][3] = 'action_buttons';
     $data[3] = '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&action=delete_response&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
-    $data[3] .= '&nbsp;<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit')]).'</a>';
+    $data[3] .= '<a href="index.php?sec=geventos&sec2=godmode/events/events&section=responses&mode=editor&id_response='.$response['id'].'&amp;pure='.$config['pure'].'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit')]).'</a>';
     $table->data[] = $data;
 }
 
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index 54ac091161..abb41cd60e 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -149,7 +149,7 @@ $table->head[] = __('Operation');
     $table->width[] = '30%';
 */
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->align = [];
 $table->align[] = 'left';
@@ -254,6 +254,7 @@ foreach ($extensions as $file => $extension) {
 
     // Avoid to delete or disabled update_manager
     if ($file != 'update_manager.php') {
+        $table->cellclass[][10] = 'action_buttons';
         if (!$extension['enabled']) {
             $data[] = '<a title="'.__('Delete').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&delete='.$file.'" class="mn">'.html_print_image('images/cross.disabled.png', true).'</a>'.' <a title="'.__('Enable').'" href="index.php?sec=godmode/extensions&amp;sec2=godmode/extensions&enterprise='.(int) $extension['enterprise'].'&enabled='.$file.'" class="mn">'.html_print_image('images/lightbulb_off.png', true).'</a>';
         } else {
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index e24342ff6d..3659a87275 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -559,6 +559,7 @@ if ($tab == 'tree') {
             $table->data[$key][3] = $group['disabled'] ? __('Disabled') : __('Enabled');
             $table->data[$key][4] = $group['parent_name'];
             $table->data[$key][5] = $group['description'];
+            $table->cellclass[$key][6] = 'action_buttons';
             $table->data[$key][6] = "<a href='$url'>".html_print_image(
                 'images/config.png',
                 true,
@@ -574,7 +575,7 @@ if ($tab == 'tree') {
                 $confirm_message = __('The child groups will be updated to use the parent id of the deleted group').'. '.$confirm_message;
             }
 
-            $table->data[$key][6] .= '&nbsp;&nbsp;'.'<a href="'.$url_delete.'" onClick="if (!confirm(\' '.$confirm_message.'\')) return false;">'.html_print_image(
+            $table->data[$key][6] .= '<a href="'.$url_delete.'" onClick="if (!confirm(\' '.$confirm_message.'\')) return false;">'.html_print_image(
                 'images/cross.png',
                 true,
                 [
diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php
index 6af3f98197..1419e6f2e9 100644
--- a/pandora_console/godmode/groups/modu_group_list.php
+++ b/pandora_console/godmode/groups/modu_group_list.php
@@ -248,6 +248,7 @@ if (!empty($groups)) {
         if (is_metaconsole()) {
             $data[2] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=module_group&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0']).'</a>';
         } else {
+            $table->cellclass[][2] = 'action_buttons';
             $data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/groups/modu_group_list&id_group='.$id_group['id_mg'].'&delete_group=1" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0']).'</a>';
         }
 
diff --git a/pandora_console/godmode/modules/manage_nc_groups.php b/pandora_console/godmode/modules/manage_nc_groups.php
index 5fddce35f4..088d73026b 100644
--- a/pandora_console/godmode/modules/manage_nc_groups.php
+++ b/pandora_console/godmode/modules/manage_nc_groups.php
@@ -219,17 +219,19 @@ $groups = component_groups_get_groups_tree_recursive($groups_clean, 0, 0);
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->head = [];
+$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
 $table->head[0] = __('Name');
-$table->head[1] = __('Action').html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[1] = __('Action');
 $table->style = [];
 $table->style[0] = 'font-weight: bold';
 $table->align = [];
 $table->align[1] = 'left';
 $table->size = [];
-$table->size[0] = '80%';
-$table->size[1] = '10%';
+$table->size['checkbox'] = '20px';
+// $table->size[0] = '80%';
+$table->size[1] = '60px';
 $table->data = [];
 
 $total_groups = db_get_all_rows_filter('tnetwork_component_group', false, 'COUNT(*) AS total');
@@ -239,6 +241,9 @@ $total_groups = $total_groups[0]['total'];
 foreach ($groups as $group) {
     $data = [];
 
+    $data['checkbox'] = html_print_checkbox_extended('delete_multiple[]', $group['id_sg'], false, false, '', 'class="check_delete"', true);
+
+
     $tabulation = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $group['deep']);
     if (defined('METACONSOLE')) {
         $data[0] = $tabulation.'<a href="index.php?sec=advanced&sec2=godmode/modules/manage_nc_groups&id='.$group['id_sg'].'">'.$group['name'].'</a>';
@@ -246,8 +251,9 @@ foreach ($groups as $group) {
         $data[0] = $tabulation.'<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_nc_groups&id='.$group['id_sg'].'">'.$group['name'].'</a>';
     }
 
+    $table->cellclass[][1] = 'action_buttons';
     $data[1] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-		href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $group['id_sg'], false, false, '', 'class="check_delete"', true);
+        href='index.php?sec=".$sec.'&sec2=godmode/modules/manage_nc_groups&delete=1&id='.$group['id_sg']."&offset=0'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index 6014ef08c5..f9d0c65991 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -635,13 +635,15 @@ unset($table);
 $table->width = '100%';
 $table->head = [];
 $table->class = 'info_table';
+$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
 $table->head[0] = __('Module name');
 $table->head[1] = __('Type');
 $table->head[3] = __('Description');
 $table->head[4] = __('Group');
 $table->head[5] = __('Max/Min');
-$table->head[6] = __('Action').html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[6] = __('Action');
 $table->size = [];
+$table->size['checkbox'] = '20px';
 $table->size[1] = '75px';
 $table->size[6] = '80px';
 $table->align[6] = 'left';
@@ -654,6 +656,8 @@ foreach ($components as $component) {
         $component['max'] = $component['min'] = __('N/A');
     }
 
+    $data['checkbox'] = html_print_checkbox_extended('delete_multiple[]', $component['id_nc'], false, false, '', 'class="check_delete"', true);
+
     $data[0] = '<a href="index.php?sec='.$sec.'&'.'sec2=godmode/modules/manage_network_components&'.'id='.$component['id_nc'].'&pure='.$pure.'">';
     $data[0] .= io_safe_output($component['name']);
     $data[0] .= '</a>';
@@ -688,8 +692,9 @@ foreach ($components as $component) {
     $data[4] = network_components_get_group_name($component['id_group']);
     $data[5] = $component['max'].' / '.$component['min'];
 
+    $table->cellclass[][6] = 'action_buttons';
     $data[6] = '<a style="display: inline; float: left" href="'.$url.'&search_id_group='.$search_id_group.'search_string='.$search_string.'&duplicate_network_component=1&source_id='.$component['id_nc'].'">'.html_print_image('images/copy.png', true, ['alt' => __('Duplicate'), 'title' => __('Duplicate')]).'</a>';
-    $data[6] .= '<a href="'.$url.'&delete_component=1&id='.$component['id_nc'].'&search_id_group='.$search_id_group.'search_string='.$search_string.'" onclick="if (! confirm (\''.__('Are you sure?').'\')) return false" >'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $component['id_nc'], false, false, '', 'class="check_delete"', true);
+    $data[6] .= '<a href="'.$url.'&delete_component=1&id='.$component['id_nc'].'&search_id_group='.$search_id_group.'search_string='.$search_string.'" onclick="if (! confirm (\''.__('Are you sure?').'\')) return false" >'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/modules/manage_network_templates.php b/pandora_console/godmode/modules/manage_network_templates.php
index 10468e75bf..ae1b5b2d07 100644
--- a/pandora_console/godmode/modules/manage_network_templates.php
+++ b/pandora_console/godmode/modules/manage_network_templates.php
@@ -213,23 +213,28 @@ $table->width = '100%';
 $table->class = 'info_table';
 
 $table->head = [];
-$table->head[0] = __('Name');
-$table->head[1] = __('Description');
-$table->head[2] = '<span style="margin-right:7%;">'.__('Action').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[0] = html_print_checkbox('all_delete', 0, false, true, false);
+;
+$table->head[1] = __('Name');
+$table->head[2] = __('Description');
+$table->head[3] = '<span style="margin-right:7%;">'.__('Action').'</span>';
 $table->size = [];
-$table->size[1] = '65%';
-$table->size[2] = '15%';
+$table->size[0] = '20px';
+$table->size[2] = '65%';
+$table->size[3] = '15%';
 
 $table->align = [];
-$table->align[2] = 'left';
+$table->align[3] = 'left';
 
 $table->data = [];
 
 foreach ($result as $row) {
     $data = [];
-    $data[0] = '<a href="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates_form&amp;id_np='.$row['id_np'].'">'.io_safe_output($row['name']).'</a>';
-    $data[1] = ui_print_truncate_text(io_safe_output($row['description']), 'description', true, true, true, '[&hellip;]');
-    $data[2] = html_print_input_image(
+    $data[0] = html_print_checkbox_extended('delete_multiple[]', $row['id_np'], false, false, '', 'class="check_delete"', true);
+    $data[1] = '<a href="index.php?sec=gmodules&amp;sec2=godmode/modules/manage_network_templates_form&amp;id_np='.$row['id_np'].'">'.io_safe_output($row['name']).'</a>';
+    $data[2] = ui_print_truncate_text(io_safe_output($row['description']), 'description', true, true, true, '[&hellip;]');
+    $table->cellclass[][3] = 'action_buttons';
+    $data[3] = html_print_input_image(
         'delete_profile',
         'images/cross.png',
         $row['id_np'],
@@ -237,7 +242,7 @@ foreach ($result as $row) {
         true,
         ['onclick' => 'if (!confirm(\''.__('Are you sure?').'\')) return false;']
     );
-    $data[2] .= html_print_input_image(
+    $data[3] .= html_print_input_image(
         'export_profile',
         'images/csv.png',
         $row['id_np'],
@@ -245,8 +250,8 @@ foreach ($result as $row) {
         true,
         ['title' => 'Export to CSV']
     );
-    $data[2] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
-    $data[2] .= '&nbsp;&nbsp;<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&export_profile='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $row['id_np'], false, false, '', 'class="check_delete"', true);
+    $data[3] = '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&delete_profile=1&delete_profile='.$row['id_np'].'" '.'onclick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
+    $data[3] .= '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_templates'.'&export_profile='.$row['id_np'].'">'.html_print_image('images/csv.png', true, ['title' => __('Export to CSV')]).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/modules/module_list.php b/pandora_console/godmode/modules/module_list.php
index cb87ae624e..a033a58b22 100644
--- a/pandora_console/godmode/modules/module_list.php
+++ b/pandora_console/godmode/modules/module_list.php
@@ -52,11 +52,13 @@ if ($update_module) {
 }
 
 
-echo "<table cellpadding='4' cellspacing='4' width='100%' class='databox data'>";
+echo "<table cellpadding='0' cellspacing='0' width='100%' class='info_table'>";
+echo '<thead>';
 echo '<th>'.__('Icon').'</th>';
 echo '<th>'.__('ID').'</th>';
 echo '<th>'.__('Name').'</th>';
 echo '<th>'.__('Description').'</th>';
+echo '</thead';
 
 $rows = db_get_all_rows_sql('SELECT * FROM ttipo_modulo ORDER BY nombre');
 if ($rows === false) {
diff --git a/pandora_console/godmode/netflow/nf_edit.php b/pandora_console/godmode/netflow/nf_edit.php
index 59f1ed96e8..10bcf1ce89 100644
--- a/pandora_console/godmode/netflow/nf_edit.php
+++ b/pandora_console/godmode/netflow/nf_edit.php
@@ -133,20 +133,22 @@ if ($filters === false) {
 
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 
 $table->head = [];
-$table->head[0] = __('Name');
-$table->head[1] = __('Group');
-$table->head[2] = __('Action').html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[0] = html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[1] = __('Name');
+$table->head[2] = __('Group');
+$table->head[3] = __('Action');
 $table->style = [];
-$table->style[0] = 'font-weight: bold';
+$table->style[1] = 'font-weight: bold';
 $table->align = [];
 
 $table->size = [];
-$table->size[0] = '60%';
-$table->size[1] = '30%';
-$table->size[2] = '80px';
+$table->size[0] = '10px';
+$table->size[1] = '60%';
+$table->size[2] = '30%';
+$table->size[3] = '80px';
 $table->data = [];
 
 $total_filters = db_get_all_rows_filter('tnetflow_filter', false, 'COUNT(*) AS total');
@@ -156,10 +158,12 @@ $total_filters = $total_filters[0]['total'];
 foreach ($filters as $filter) {
     $data = [];
 
-    $data[0] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&id='.$filter['id_sg'].'&pure='.$pure.'">'.$filter['id_name'].'</a>';
-    $data[1] = ui_print_group_icon($filter['id_group'], true, 'groups_small', '', !defined('METACONSOLE'));
-    $data[2] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
-		href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $filter['id_sg'], false, false, '', 'class="check_delete"', true);
+    $data[0] = html_print_checkbox_extended('delete_multiple[]', $filter['id_sg'], false, false, '', 'class="check_delete"', true);
+    $data[1] = '<a href="'.$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form&id='.$filter['id_sg'].'&pure='.$pure.'">'.$filter['id_name'].'</a>';
+    $data[2] = ui_print_group_icon($filter['id_group'], true, 'groups_small', '', !defined('METACONSOLE'));
+    $table->cellclass[][3] = 'action_buttons';
+    $data[3] = "<a onclick='if(confirm(\"".__('Are you sure?')."\")) return true; else return false;' 
+        href='".$config['homeurl'].'index.php?sec=netf&sec2=godmode/netflow/nf_edit&delete=1&id='.$filter['id_sg']."&offset=0&pure=$pure'>".html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php
index 0e1a0c3afc..804855c02d 100644
--- a/pandora_console/godmode/reporting/graphs.php
+++ b/pandora_console/godmode/reporting/graphs.php
@@ -164,6 +164,12 @@ if (!empty($graphs)) {
     $table->cellspacing = 0;
     $table->align = [];
     $table->head = [];
+    if ($report_w || $report_m) {
+        $table->align[5] = 'left';
+        $table->head[5] = html_print_checkbox('all_delete', 0, false, true, false);
+        $table->size[5] = '20px';
+    }
+
     $table->head[0] = __('Graph name');
     $table->head[1] = __('Description');
     $table->head[2] = __('Number of Graphs');
@@ -177,7 +183,7 @@ if (!empty($graphs)) {
     if ($report_w || $report_m) {
         $op_column = true;
         $table->align[4] = 'left';
-        $table->head[4] = __('Op.').html_print_checkbox('all_delete', 0, false, true, false);
+        $table->head[4] = __('Op.');
         $table->size[4] = '90px';
     }
 
@@ -188,6 +194,10 @@ if (!empty($graphs)) {
     foreach ($result_graphs as $graph) {
         $data = [];
 
+        if ($report_m) {
+            $data[5] .= html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
+        }
+
         $data[0] = '<a href="index.php?sec=reporting&sec2=operation/reporting/graph_viewer&view_graph=1&id='.$graph['id_graph'].'">'.ui_print_truncate_text($graph['name'], 70).'</a>';
 
         $data[1] = ui_print_truncate_text($graph['description'], 70);
@@ -196,15 +206,14 @@ if (!empty($graphs)) {
         $data[3] = ui_print_group_icon($graph['id_group'], true);
 
         $data[4] = '';
+        $table->cellclass[][4] = 'action_buttons';
         if (($report_w || $report_m)) {
             $data[4] = '<a href="index.php?sec=reporting&sec2=godmode/reporting/graph_builder&edit_graph=1&id='.$graph['id_graph'].'">'.html_print_image('images/config.png', true).'</a>';
         }
 
-        $data[4] .= '&nbsp;';
-
         if ($report_m) {
             $data[4] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/graphs&delete_graph=1&id='.$graph['id_graph'].'" onClick="if (!confirm(\''.__('Are you sure?').'\'))
-					return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple[]', $graph['id_graph'], false, false, '', 'class="check_delete" style="margin-left:2px;"', true);
+                    return false;">'.html_print_image('images/cross.png', true, ['alt' => __('Delete'), 'title' => __('Delete')]).'</a>';
         }
 
         array_push($table->data, $data);
@@ -239,8 +248,6 @@ if (!empty($graphs)) {
 
 <script type="text/javascript">
 
-$("input[name=all_delete]").css("margin-left", "32px");
-
     $( document ).ready(function() {
 
         $('[id^=checkbox-delete_multiple]').change(function(){
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 79130eda11..9b83a15600 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -449,6 +449,10 @@ if (!$maps && !is_metaconsole()) {
         // Fix: IW was the old ACL for report editing, now is RW
         if ($vconsoles_write || $vconsoles_manage) {
             if (!is_metaconsole()) {
+                $table->cellclass[] = [
+                    3 => 'action_buttons',
+                    4 => 'action_buttons',
+                ];
                 $data[3] = '<a class="copy_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;copy_layout=1">'.html_print_image('images/copy.png', true).'</a>';
                 $data[4] = '<a class="delete_visualmap" href="index.php?sec=network&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.html_print_image('images/cross.png', true).'</a>';
             } else {
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 7997322bcd..ed4c3ec3a1 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -824,6 +824,8 @@ switch ($action) {
 
                 if ($edit || $delete) {
                     $columnview = true;
+                    $table->cellclass[][$next] = 'action_buttons';
+
                     if (!isset($table->head[$next])) {
                         $table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
                         $table->size = [];
@@ -833,11 +835,6 @@ switch ($action) {
 
                     if ($edit) {
                         $data[$next] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&pure='.$pure.'" style="display:inline">';
-                        $data[$next] .= html_print_input_hidden(
-                            'id_report',
-                            $report['id_report'],
-                            true
-                        );
                         $data[$next] .= html_print_input_image(
                             'edit',
                             'images/config.png',
@@ -846,13 +843,16 @@ switch ($action) {
                             true,
                             ['title' => __('Edit')]
                         );
+                        $data[$next] .= html_print_input_hidden(
+                            'id_report',
+                            $report['id_report'],
+                            true
+                        );
                         $data[$next] .= '</form>';
                     }
 
                     if ($delete) {
                         $data[$next] .= '<form method="post" style="display:inline;" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
-                        $data[$next] .= html_print_input_hidden('id_report', $report['id_report'], true);
-                        $data[$next] .= html_print_input_hidden('action', 'delete_report', true);
                         $data[$next] .= html_print_input_image(
                             'delete',
                             'images/cross.png',
@@ -861,6 +861,8 @@ switch ($action) {
                             true,
                             ['title' => __('Delete')]
                         );
+                        $data[$next] .= html_print_input_hidden('id_report', $report['id_report'], true);
+                        $data[$next] .= html_print_input_hidden('action', 'delete_report', true);
 
                         $data[$next] .= html_print_checkbox_extended('massive_report_check', $report['id_report'], false, false, '', 'class="check_delete"', true);
 
diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php
index 9520bb6625..2c0e0a0c43 100644
--- a/pandora_console/godmode/servers/plugin.php
+++ b/pandora_console/godmode/servers/plugin.php
@@ -957,6 +957,7 @@ if (($create != '') || ($view != '')) {
             echo '<table width="100%" cellspacing="4" cellpadding="4" class="info_table">';
         }
 
+        echo '<thead><tr>';
         echo '<th>'.__('Name').'</th>';
         echo '<th>'.__('Type').'</th>';
         echo '<th>'.__('Command').'</th>';
@@ -964,6 +965,8 @@ if (($create != '') || ($view != '')) {
             echo "<th style='width: 120px;'>".'<span title="Operations">'.__('Op.').'</span>'.'</th>';
         }
 
+        echo '</tr></thead>';
+
         $color = 0;
 
         foreach ($rows as $row) {
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 65a76690e0..2ab1b8d967 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -82,7 +82,11 @@ $names_servers = [];
 
 foreach ($servers as $server) {
     $data = [];
-    $table->cellclass[][3] = 'progress_bar';
+    // $table->cellclass[][3] = 'progress_bar';
+    $table->cellclass[] = [
+        3 => 'progress_bar',
+        8 => 'action_buttons',
+    ];
     $data[0] = '<span title="'.$server['version'].'">'.strip_tags($server['name']).'</span>';
 
     // Status
@@ -157,7 +161,7 @@ foreach ($servers as $server) {
                     'style' => 'width:21px;height:21px;',
                 ]
             );
-            $data[8] .= '</a>&nbsp;&nbsp;';
+            $data[8] .= '</a>';
         }
 
         if ($server['type'] == 'data') {
@@ -167,7 +171,7 @@ foreach ($servers as $server) {
                 true,
                 ['title' => __('Reset module status and fired alert counts')]
             );
-            $data[8] .= '</a>&nbsp;&nbsp;';
+            $data[8] .= '</a>';
         } else if ($server['type'] == 'enterprise snmp') {
             $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&refr=0&server_reset_snmp_enterprise='.$server['id_server'].'">';
             $data[8] .= html_print_image(
@@ -175,7 +179,7 @@ foreach ($servers as $server) {
                 true,
                 ['title' => __('Claim back SNMP modules')]
             );
-            $data[8] .= '</a>&nbsp;&nbsp;';
+            $data[8] .= '</a>';
         }
 
         $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server['id_server'].'">';
@@ -197,7 +201,7 @@ foreach ($servers as $server) {
             $names_servers[$safe_server_name] = false;
         }
 
-        $data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1">';
+        $data[8] .= '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server['id_server'].'&amp;delete=1">';
         $data[8] .= html_print_image(
             'images/cross.png',
             true,
diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php
index 3acd113014..e6ff8dd3ab 100755
--- a/pandora_console/godmode/setup/gis.php
+++ b/pandora_console/godmode/setup/gis.php
@@ -69,9 +69,9 @@ $table->head[0] = __('Map connection name');
 $table->head[1] = __('Group');
 $table->head[3] = __('Delete');
 
-$table->align[1] = 'center';
-$table->align[2] = 'center';
-$table->align[3] = 'center';
+$table->align[1] = 'left';
+$table->align[2] = 'left';
+$table->align[3] = 'left';
 
 $mapsConnections = db_get_all_rows_in_table('tgis_map_connection', 'conection_name');
 
@@ -85,6 +85,7 @@ if ($mapsConnections !== false) {
             '<a href="index.php?sec=gsetup&sec2=godmode/setup/gis&amp;id_connection_map='.$mapsConnection['id_tmap_connection'].'&amp;action=delete_connection"
 				onClick="javascript: if (!confirm(\''.__('Do you wan delete this connection?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>',
         ];
+        $table->cellclass[][2] = 'action_buttons';
     }
 }
 
diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php
index 450115590a..c15052412b 100644
--- a/pandora_console/godmode/setup/links.php
+++ b/pandora_console/godmode/setup/links.php
@@ -138,8 +138,10 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
         ui_print_info_message(['no_close' => true, 'message' => __("There isn't links") ]);
     } else {
         echo "<table cellpadding='0' cellspacing='0' class='info_table' style='width:100%'>";
+        echo '<thead><tr>';
         echo "<th width='180px'>".__('Link name').'</th>';
         echo "<th width='10px'>".__('Delete').'</th>';
+        echo '</tr></thead>';
 
         $color = 1;
         foreach ($rows as $row) {
@@ -152,7 +154,7 @@ if ((isset($_GET['form_add'])) or (isset($_GET['form_edit']))) {
             }
 
             echo "<tr><td class='$tdcolor'><b><a href='index.php?sec=gsetup&sec2=godmode/setup/links&form_edit=1&id_link=".$row['id_link']."'>".$row['name'].'</a></b></td>';
-            echo '<td class="'.$tdcolor.'"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row['id_link'].'&borrar='.$row['id_link'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a></td></tr>';
+            echo '<td class="'.$tdcolor.' action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/links&id_link='.$row['id_link'].'&borrar='.$row['id_link'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a></td></tr>';
         }
 
         echo '</table>';
diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php
index 3339b8cd88..4e51181b8a 100644
--- a/pandora_console/godmode/setup/news.php
+++ b/pandora_console/godmode/setup/news.php
@@ -232,13 +232,14 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
     } else {
         // Main list view for Links editor
         echo "<table cellpadding='0' cellspacing='0' class='info_table' width=100%>";
+        echo '<thead><tr>';
         echo '<th>'.__('Subject').'</th>';
         echo '<th>'.__('Type').'</th>';
         echo '<th>'.__('Author').'</th>';
         echo '<th>'.__('Timestamp').'</th>';
         echo '<th>'.__('Expiration').'</th>';
         echo '<th>'.__('Delete').'</th>';
-
+        echo '</tr></thead>';
 
 
         $color = 1;
@@ -276,7 +277,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
                 echo "<td class='$tdcolor'>".__('No').'</b></td>';
             }
 
-            echo '<td class="'.$tdcolor.'"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0']).'</a></td></tr>';
+            echo '<td class="'.$tdcolor.' action_buttons"><a href="index.php?sec=gsetup&sec2=godmode/setup/news&id_news='.$row['id_news'].'&borrar='.$row['id_news'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['border' => '0']).'</a></td></tr>';
         }
 
         echo '</table>';
diff --git a/pandora_console/godmode/setup/os.list.php b/pandora_console/godmode/setup/os.list.php
index 5673dd476a..07365edc6c 100644
--- a/pandora_console/godmode/setup/os.list.php
+++ b/pandora_console/godmode/setup/os.list.php
@@ -66,6 +66,8 @@ foreach ($osList as $os) {
     }
 
     $data[] = ui_print_truncate_text(io_safe_output($os['description']), 'description', true, true);
+
+    $table->cellclass[][4] = 'action_buttons';
     if ($os['id_os'] > 16) {
         if (is_metaconsole()) {
             $data[] = '<a href="index.php?sec=advanced&sec2=advanced/component_management&tab=os_manage&action=delete&tab2=list&id_os='.$os['id_os'].'">'.html_print_image('images/cross.png', true).'</a>';
diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php
index e8678bb1ad..9d5040c0de 100644
--- a/pandora_console/godmode/tag/tag.php
+++ b/pandora_console/godmode/tag/tag.php
@@ -278,7 +278,8 @@ if (!empty($result)) {
 
         $data[5] = $output;
 
-        $data[6] = "<a href='index.php?sec=".$sec.'&sec2=godmode/tag/edit_tag&action=update&id_tag='.$tag['id_tag']."'>".html_print_image('images/config.png', true, ['title' => 'Edit']).'</a>&nbsp;&nbsp;';
+        $table->cellclass[][6] = 'action_buttons';
+        $data[6] = "<a href='index.php?sec=".$sec.'&sec2=godmode/tag/edit_tag&action=update&id_tag='.$tag['id_tag']."'>".html_print_image('images/config.png', true, ['title' => 'Edit']).'</a>';
         $data[6] .= '<a  href="index.php?sec='.$sec.'&sec2=godmode/tag/tag&delete_tag='.$tag['id_tag'].'"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">'.html_print_image('images/cross.png', true, ['title' => 'Delete']).'</a>';
         array_push($table->data, $data);
     }
diff --git a/pandora_console/godmode/users/profile_list.php b/pandora_console/godmode/users/profile_list.php
index 8b23527ac8..afc2b9813c 100644
--- a/pandora_console/godmode/users/profile_list.php
+++ b/pandora_console/godmode/users/profile_list.php
@@ -258,7 +258,7 @@ if ($create_profile) {
 $table = new stdClass();
 $table->cellpadding = 0;
 $table->cellspacing = 0;
-$table->class = 'databox profile_list data';
+$table->class = 'info_table profile_list';
 $table->width = '100%';
 
 $table->head = [];
@@ -353,8 +353,9 @@ foreach ($profiles as $profile) {
     $data['VW'] = ($profile['vconsole_edit'] ? $img : '');
     $data['VM'] = ($profile['vconsole_management'] ? $img : '');
     $data['PM'] = ($profile['pandora_management'] ? $img : '');
+    $table->cellclass[]['operations'] = 'action_buttons';
     $data['operations'] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/configure_profile&id='.$profile['id_perfil'].'&pure='.$pure.'">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>';
-    $data['operations'] .= '&nbsp;&nbsp;<a href="index.php?sec='.$sec.'&sec2=godmode/users/profile_list&delete_profile=1&id='.$profile['id_perfil'].'&pure='.$pure.'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>';
+    $data['operations'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/users/profile_list&delete_profile=1&id='.$profile['id_perfil'].'&pure='.$pure.'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>';
     array_push($table->data, $data);
 }
 
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index b5904225a2..c879cbdf09 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -514,6 +514,7 @@ foreach ($info as $user_id => $user_info) {
 
     $data[5] = ui_print_string_substr($user_info['comments'], 24, true);
 
+    $table->cellclass[][6] = 'action_buttons';
     if ($user_info['disabled'] == 0) {
         $data[6] = '<a href="index.php?sec='.$sec.'&amp;sec2=godmode/users/user_list&amp;disable_user=1&pure='.$pure.'&amp;id='.$user_info['id_user'].'">'.html_print_image('images/lightbulb.png', true, ['title' => __('Disable')]).'</a>';
     } else {
diff --git a/pandora_console/images/go_first_g.png b/pandora_console/images/go_first_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcb0fe41b874783e656e36eedd90f3be6f590316
GIT binary patch
literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%P4{$h45_%4lpw*nm_h%9zK#&XBPNwP1_A8{LFZk18XdCi
z1-?7~<aEfg6<~jG>9EI=MmC2z9HR61k8rDf`>r}EM`I^j69c#0PNo%&+zme%1n#px
zVsGJ55m_eO@PkR9`OpQ%S5d4B_@4<IP1%>&bvVIw#cD@3aVFk*4q=m+vi>kEky+T*
qa7aYtSfj(9L=*OYCLacY1cvY}=Aw&u-#!95k-^i|&t;ucLK6UD3{YhN

literal 0
HcmV?d00001

diff --git a/pandora_console/images/go_last_g.png b/pandora_console/images/go_last_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce49963baa22ae418a736bc1a7d8bed32061b788
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%P4;wg45_%4lpw*nn1T6;xR@qGA%oC<h7Q(_i>F)M`BENK
zEpX%vsIwP%uYN4SjcMIn{v{4=YEG>Vf4CjqSZv(?o;k8@QnrDxqI08^W1DS*R2f5u
zIKxIp0r3gK%TDNpHtf2>_$q6HxB3NBpU4jq5e+E{CvJc5G!$6B&|w3k$TSCLGY4Hw
lmR5B|X7__0><o--4BPCivy*Z!*8`o$;OXk;vd$@?2>|)VO)mfd

literal 0
HcmV?d00001

diff --git a/pandora_console/images/go_next_g.png b/pandora_console/images/go_next_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..08601a2a3e380704e23463a59d9f5ebd3beb89a9
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%6??ikhE&{2N|0bx7B>(Mnh+l$l8~5rvhdT9kK#w9PPw$q
zs!_PdZ*r$$R-2ep<|5uS6*s{v8~z5Ydwk^IKJF>IrZ8r4oH)wluxFmsz4o13<U8yc
z3KfptQ@{H9$gUDQO|~WmZow?6#vhCu+4`C$@-Z;+Fii1Qb~iY%Q~+o_gQu&X%Q~lo
FCIH6vNA&;z

literal 0
HcmV?d00001

diff --git a/pandora_console/images/go_previous_g.png b/pandora_console/images/go_previous_g.png
new file mode 100644
index 0000000000000000000000000000000000000000..84bbe0492eaca6d548d7b8df97c13cae105175b4
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw{1|(OCFP#RYBuiW)N`mv#O3D+9QW+dm@{>{(
zJaZG%Q-e|yQz{EjrrH1%WqP_ehE&{2N|0b(+@LWbJ|czT2xH3?!-+`>6K?S*1sx4g
zVRl?FVM3Lg5O2wx8~4i_C&-B@$?THrU~RCND8bzMwN62xp5am5iq(=D-|Q?M9YS0j
tc?(;Lo(JoCDoWn5n3e3#n8zTHz`*`ZK{d8|-(#Sq44$rjF6*2UngEI9KQ;gW

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index adff3c1eec..b621161ecc 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -972,6 +972,23 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
 
     $data = [];
 
+    // Validate checkbox
+    if (!defined('METACONSOLE')) {
+        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(
+                'validate[]',
+                $alert['id'],
+                false,
+                true,
+                false,
+                '',
+                true
+            );
+        }
+    }
+
     if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         if (is_metaconsole()) {
             $node = metaconsole_get_connection_by_id($alert['server_data']['id']);
@@ -1102,22 +1119,6 @@ function ui_format_alert_row($alert, $agent=true, $url='', $agent_style=false)
 
     $data[$index['status']] = ui_print_status_image($status, $title, true);
 
-    if (!defined('METACONSOLE')) {
-        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(
-                'validate[]',
-                $alert['id'],
-                false,
-                true,
-                false,
-                '',
-                true
-            );
-        }
-    }
-
     return $data;
 }
 
@@ -1931,9 +1932,9 @@ function ui_pagination(
             );
 
             $output .= "<a class='pagination-arrows $other_class offset_0'
-				href='javascript: $script_modified;'>".html_print_image('images/go_first.png', true, ['class' => 'bot']).'</a>';
+				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.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>';
         }
     }
 
@@ -1960,9 +1961,9 @@ function ui_pagination(
             );
 
             $output .= "<a class='pagination-arrows $other_class offset_$offset_previous_page'
-				href='javacript: $script_modified;'>".html_print_image('images/go_previous.png', true, ['class' => 'bot']).'</a>';
+				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.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>';
         }
     }
 
@@ -2025,9 +2026,9 @@ function ui_pagination(
             );
 
             $output .= "<a class='pagination-arrows $other_class offset_$offset_next_page'
-				href='javascript: $script_modified;'>".html_print_image('images/go_next.png', true, ['class' => 'bot']).'</a>';
+				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.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>';
         }
     }
 
@@ -2049,9 +2050,9 @@ function ui_pagination(
             );
 
             $output .= "<a class='pagination-arrows $other_class offset_$offset_lastpage'
-				href='javascript: $script_modified;'>".html_print_image('images/go_last.png', true, ['class' => 'bot']).'</a>';
+				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.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>';
         }
     }
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e4b3e86cd2..bb64542112 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -998,22 +998,6 @@ div#cont {
 	background-color: #80BA27 !important;
 }*/
 
-/*tr.datos, tr.datost, tr.datosb , tr.datos_id,
-tr.datosf9 {
-	#background-color: #eaeaea;
-}
-
-tr.datos2, tr.datos2t,
-tr.datos2b, tr.datos2_id , tr.datos2f9 {
-	#background-color: #f2f2f2;
-}
-
-tr.datos:hover, tr.datost:hover, tr.datosb:hover, tr.datos_id:hover,
-tr.datosf9:hover, tr.datos2:hover, tr.datos2t:hover,
-tr.datos2b:hover, tr.datos2_id:hover, tr.datos2f9:hover {
-	#background-color: #efefef;
-}*/
-
 /*
  * ---------------------------------------------------------------------
  * - REPORTS 														-
@@ -3312,8 +3296,7 @@ div.div_groups_status {
 }
 
 .databox.filters,
-.databox.data,
-.databox.profile_list {
+.databox.data {
   margin-bottom: 20px;
 }
 
@@ -3321,14 +3304,6 @@ div.div_groups_status {
   padding: 10px;
   padding-left: 20px;
 }
-.databox.profile_list > tbody > tr > td {
-  padding: 4px 1px;
-  padding-left: 5px;
-  border-bottom: 1px solid #e2e2e2;
-}
-.databox.profile_list > tbody > tr > a.tip > img {
-  margin: 0px;
-}
 
 .databox.filters > tbody > tr > td > img,
 .databox.filters > tbody > tr > td > div > a > img,
@@ -5044,7 +5019,7 @@ table.info_table {
   border-spacing: 0;
 }
 
-table.info_table tbody tr:nth-child(even) {
+table.info_table tbody > tr:nth-child(even) {
   background-color: #f5f5f5;
 }
 
@@ -5055,7 +5030,7 @@ table.info_table tr:first-child > th {
   background-color: #fff;
   border-top: 1px solid #e2e2e2;
   color: #000;
-  text-align: left !important;
+  text-align: left;
 }
 
 table.info_table tr:first-child > th span {
@@ -5098,7 +5073,11 @@ table.info_table > thead > tr:first-child > th:first-child {
 table.info_table > thead > tr > th,
 table.info_table > tbody > tr > th,
 table.info_table > thead > tr > th a {
-  padding: 9px 7px;
+  /*padding: 9px 7px;*/
+  padding-left: 9px;
+  padding-right: 9px;
+  padding-top: 7px;
+  padding-bottom: 7px;
   font-weight: bold;
   color: #000;
 }
@@ -5147,14 +5126,48 @@ table.info_table > tbody > tr:hover {
 }
 
 table.info_table td:last-child img {
+  border: 1px solid red;
+  background-color: pink;
+  background-color: #ffedf0;
+}
+
+.info_table.profile_list > thead > tr > th > a.tip {
+  padding: 0px;
+}
+
+/* no confundir con action-buttons */
+/* esta se pa los botones de las tablas de delete etc*/
+.action_buttons a[href] img,
+.action_buttons input[type="image"] {
   border-radius: 4px;
-  /* border: 2px solid #dcdcdc !important;*/
-  /* padding: 2px;*/
   border: 1px solid #dcdcdc !important;
   padding: 1px;
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
+  max-width: 21px;
+  background-color: transparent !important; /*BORRAR*/
 }
 
+.action_buttons a,
+.action_buttons input[type="image"] {
+  margin-right: 5px;
+}
+
+.action_buttons a:last-child,
+.action_buttons input[type="image"]:last-child {
+  margin-right: 0px;
+}
+
+.action_buttons a:hover {
+  background-color: #fff;
+  display: inline-block;
+  border-radius: 4px;
+}
+
+.action_buttons input[type="image"]:hover {
+  background-color: #fff !important;
+}
+
+/* PAGINACION */
 .pagination {
   display: flex;
   justify-content: space-between;
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 706a1a8552..d63d9b8e7d 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -451,6 +451,15 @@ $table->align = [];
 
 if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
     if ($print_agent) {
+        if (!is_metaconsole()) {
+            $table->size[8] = '4%';
+            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+                $table->head[9] = html_print_checkbox('all_validate', 0, false, true, false);
+                $table->align[9] = 'left';
+                $table->size[9] = '5%';
+            }
+        }
+
         $table->head[0] = "<span title='".__('Policy')."'>".__('P.').'</span>';
 
         $table->head[1] = "<span title='".__('Standby')."'>".__('S.').'</span>';
@@ -467,14 +476,6 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         $table->head[6] = __('Action');
         $table->head[7] = __('Last fired');
         $table->head[8] = __('Status');
-        if (!is_metaconsole()) {
-            $table->size[8] = '4%';
-            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
-                $table->head[9] = __('Validate').html_print_checkbox('all_validate', 0, false, true, false);
-                $table->align[9] = 'center';
-                $table->size[9] = '5%';
-            }
-        }
 
         $table->align[8] = 'center';
 
@@ -485,6 +486,14 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
             $table->head[5] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
         }
     } else {
+        if (!is_metaconsole()) {
+            $table->size[7] = '5%';
+            if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW') || check_acl_one_of_groups($config['id_user'], $all_groups, 'LM')) {
+                $table->align[8] = 'left';
+                $table->size[8] = '5%';
+            }
+        }
+
         $table->head[0] = "<span title='".__('Policy')."'>".__('P.').'</span>';
 
         $table->head[1] = "<span title='".__('Standby')."'>".__('S.').'</span>';
@@ -500,14 +509,7 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         $table->head[5] = __('Action');
         $table->head[6] = __('Last fired');
         $table->head[7] = __('Status');
-        if (!is_metaconsole()) {
-            $table->size[7] = '5%';
-            if (check_acl_one_of_groups($config['id_user'], $all_groups, 'LW') || check_acl_one_of_groups($config['id_user'], $all_groups, 'LM')) {
-                $table->head[8] = __('Validate');
-                $table->align[8] = 'center';
-                $table->size[8] = '5%';
-            }
-        }
+
 
         $table->align[7] = 'center';
 
@@ -519,6 +521,14 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
     }
 } else {
     if ($print_agent) {
+        if (!is_metaconsole()) {
+            $table->size[7] = '5%';
+            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+                $table->align[8] = 'left';
+                $table->size[8] = '5%';
+            }
+        }
+
         $table->head[0] = "<span title='".__('Standby')."'>".__('S.').'</span>';
         if (!is_metaconsole()) {
             if (check_acl($config['id_user'], $id_group, 'AW') || check_acl($config['id_user'], $id_group, 'LM')) {
@@ -532,14 +542,6 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         $table->head[5] = __('Action');
         $table->head[6] = __('Last fired');
         $table->head[7] = __('Status');
-        if (!is_metaconsole()) {
-            $table->size[7] = '5%';
-            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
-                $table->head[8] = __('Validate');
-                $table->align[8] = 'center';
-                $table->size[8] = '5%';
-            }
-        }
 
         $table->align[7] = 'center';
 
@@ -550,6 +552,14 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
             $table->head[4] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
         }
     } else {
+        if (!is_metaconsole()) {
+            $table->size[6] = '5%';
+            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
+                $table->align[7] = 'left';
+                $table->size[7] = '5%';
+            }
+        }
+
         $table->head[0] = "<span title='".__('Standby')."'>".__('S.').'</span>';
         if (!is_metaconsole()) {
             if (check_acl($config['id_user'], $id_group, 'AW') || check_acl($config['id_user'], $id_group, 'LM')) {
@@ -562,14 +572,6 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
         $table->head[4] = __('Action');
         $table->head[5] = __('Last fired');
         $table->head[6] = __('Status');
-        if (!is_metaconsole()) {
-            $table->size[6] = '5%';
-            if (check_acl($config['id_user'], $id_group, 'LW') || check_acl($config['id_user'], $id_group, 'LM')) {
-                $table->head[7] = __('Validate');
-                $table->align[7] = 'center';
-                $table->size[7] = '5%';
-            }
-        }
 
         $table->align[6] = 'center';
 
diff --git a/pandora_console/operation/agentes/pandora_networkmap.php b/pandora_console/operation/agentes/pandora_networkmap.php
index 7279e2eea5..dbf7a80692 100644
--- a/pandora_console/operation/agentes/pandora_networkmap.php
+++ b/pandora_console/operation/agentes/pandora_networkmap.php
@@ -771,6 +771,11 @@ switch ($tab) {
                 $data['groups'] = ui_print_group_icon($network_map['id_group'], true);
 
                 if ($networkmap_write || $networkmap_manage) {
+                    $table->cellclass[] = [
+                        'copy'   => 'action_buttons',
+                        'edit'   => 'action_buttons',
+                        'delete' => 'action_buttons',
+                    ];
                     $data['copy'] = '<a href="index.php?'.'sec=network&'.'sec2=operation/agentes/pandora_networkmap&amp;'.'copy_networkmap=1&'.'id_networkmap='.$network_map['id'].'" alt="'.__('Copy').'">'.html_print_image('images/copy.png', true).'</a>';
                     $data['edit'] = '<a href="index.php?'.'sec=network&'.'sec2=operation/agentes/pandora_networkmap&'.'tab=edit&'.'edit_networkmap=1&'.'id_networkmap='.$network_map['id'].'" alt="'.__('Config').'">'.html_print_image('images/config.png', true).'</a>';
                     $data['delete'] = '<a href="index.php?'.'sec=network&'.'sec2=operation/agentes/pandora_networkmap&'.'delete=1&'.'id_networkmap='.$network_map['id'].'" alt="'.__('Delete').'" onclick="javascript: if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true).'</a>';
diff --git a/pandora_console/operation/gis_maps/gis_map.php b/pandora_console/operation/gis_maps/gis_map.php
index 6b6f5fad25..3d5b2d4396 100644
--- a/pandora_console/operation/gis_maps/gis_map.php
+++ b/pandora_console/operation/gis_maps/gis_map.php
@@ -181,7 +181,8 @@ if ($maps !== false) {
                 $data['default'] = html_print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, 'setDefault('.$map['id_tgis_map'].');', '', true);
             }
 
-            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>&nbsp;&nbsp;'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
+            $table->cellclass[]['op'] = 'action_buttons';
+            $data['op'] = '<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/configure_gis_map&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">'.html_print_image('images/config.png', true, ['title' => __('Edit')]).'</a>'.'<a href="index.php?sec=godgismaps&amp;sec2=operation/gis_maps/gis_map&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map" onclick="return confirmDelete();">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/operation/incidents/incident.php b/pandora_console/operation/incidents/incident.php
index 9a7d8271fa..5057b4d281 100755
--- a/pandora_console/operation/incidents/incident.php
+++ b/pandora_console/operation/incidents/incident.php
@@ -407,31 +407,30 @@ if ($count_total < 1) {
 
     // Show headers
     $table->width = '100%';
-    $table->class = 'databox data';
-    $table->cellpadding = 4;
-    $table->cellspacing = 4;
+    $table->class = 'info_table';
+    $table->cellpadding = 0;
+    $table->cellspacing = 0;
     $table->head = [];
     $table->data = [];
     $table->size = [];
     $table->align = [];
 
-    $table->head[0] = __('ID');
-    $table->head[1] = __('Status');
-    $table->head[2] = __('Incident');
-    $table->head[3] = __('Priority');
-    $table->head[4] = __('Group');
-    $table->head[5] = __('Updated');
-    $table->head[6] = __('Source');
-    $table->head[7] = __('Owner');
-    $table->head[8] = __('Action').html_print_checkbox('all_action', 0, false, true, false);
+    $table->head[0] = html_print_checkbox('all_action', 0, false, true, false);
+    $table->head[1] = __('ID');
+    $table->head[2] = __('Status');
+    $table->head[3] = __('Incident');
+    $table->head[4] = __('Priority');
+    $table->head[5] = __('Group');
+    $table->head[6] = __('Updated');
+    $table->head[7] = __('Source');
+    $table->head[8] = __('Owner');
 
-    $table->size[0] = 43;
-    $table->size[7] = 50;
+    $table->size[0] = '20px';
 
-    $table->align[1] = 'left';
-    $table->align[3] = 'left';
+    $table->align[0] = 'left';
+    $table->align[2] = 'left';
     $table->align[4] = 'left';
-    $table->align[8] = 'left';
+    $table->align[5] = 'left';
 
     $rowPair = true;
     $iterator = 0;
@@ -447,29 +446,29 @@ if ($count_total < 1) {
 
         $data = [];
 
-        $data[0] = '<a href="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;id='.$row['id_incidencia'].'">'.$row['id_incidencia'].'</a>';
+        if (check_acl($config['id_user'], $row['id_grupo'], 'IM') || $config['id_user'] == $row['id_usuario'] || $config['id_user'] == $row['id_creator']) {
+            $data[0] = html_print_checkbox('id_inc[]', $row['id_incidencia'], false, true);
+        } else {
+            $data[0] = '';
+        }
+
+        $data[1] = '<a href="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;id='.$row['id_incidencia'].'">'.$row['id_incidencia'].'</a>';
         $attach = incidents_get_attach($row['id_incidencia']);
 
         if (!empty($attach)) {
-            $data[0] .= '&nbsp;&nbsp;'.html_print_image('images/attachment.png', true, ['style' => 'align:middle;']);
+            $data[1] .= '&nbsp;&nbsp;'.html_print_image('images/attachment.png', true, ['style' => 'align:middle;']);
         }
 
-        $data[1] = incidents_print_status_img($row['estado'], true);
-        $data[2] = '<a href="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;id='.$row['id_incidencia'].'">'.ui_print_truncate_text(io_safe_output($row['titulo']), 'item_title').'</a>';
-        $data[3] = incidents_print_priority_img($row['prioridad'], true);
-        $data[4] = ui_print_group_icon($row['id_grupo'], true);
-        $data[5] = ui_print_timestamp($row['actualizacion'], true);
-        $data[6] = $row['origen'];
+        $data[2] = incidents_print_status_img($row['estado'], true);
+        $data[3] = '<a href="index.php?sec=workspace&amp;sec2=operation/incidents/incident_detail&amp;id='.$row['id_incidencia'].'">'.ui_print_truncate_text(io_safe_output($row['titulo']), 'item_title').'</a>';
+        $data[4] = incidents_print_priority_img($row['prioridad'], true);
+        $data[5] = ui_print_group_icon($row['id_grupo'], true);
+        $data[6] = ui_print_timestamp($row['actualizacion'], true);
+        $data[7] = $row['origen'];
         if (empty($row['id_usuario'])) {
-            $data[7] = 'SYSTEM';
+            $data[8] = 'SYSTEM';
         } else {
-            $data[7] = ui_print_username($row['id_usuario'], true);
-        }
-
-        if (check_acl($config['id_user'], $row['id_grupo'], 'IM') || $config['id_user'] == $row['id_usuario'] || $config['id_user'] == $row['id_creator']) {
-            $data[8] = html_print_checkbox('id_inc[]', $row['id_incidencia'], false, true);
-        } else {
-            $data[8] = '';
+            $data[8] = ui_print_username($row['id_usuario'], true);
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/operation/messages/message_list.php b/pandora_console/operation/messages/message_list.php
index 88153b8fc9..23f9f09fa9 100644
--- a/pandora_console/operation/messages/message_list.php
+++ b/pandora_console/operation/messages/message_list.php
@@ -143,17 +143,20 @@ if (empty($messages)) {
     $table->align = [];
     $table->size = [];
 
+    $table->align[5] = 'left';
     $table->align[0] = 'left';
     $table->align[1] = 'left';
     $table->align[2] = 'left';
     $table->align[3] = 'left';
     $table->align[4] = 'right';
 
+    $table->size[5] = '20px';
     $table->size[0] = '20px';
     $table->size[1] = '100px';
     $table->size[3] = '80px';
     $table->size[4] = '60px';
 
+    $table->head[5] = html_print_checkbox('all_delete_messages', 0, false, true, false);
     $table->head[0] = __('Status');
     if ($show_sent) {
         $table->head[1] = __('Destination');
@@ -163,12 +166,15 @@ if (empty($messages)) {
 
     $table->head[2] = __('Subject');
     $table->head[3] = __('Timestamp');
-    $table->head[4] = __('Delete').html_print_checkbox('all_delete_messages', 0, false, true, false);
+    $table->head[4] = __('Delete');
 
 
     foreach ($messages as $message) {
         $message_id = $message['id_mensaje'];
         $data = [];
+
+        $data[5] = html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
+
         $data[0] = '';
         if ($message['read'] == 1) {
             if ($show_sent) {
@@ -228,12 +234,13 @@ if (empty($messages)) {
             ['prominent' => 'timestamp']
         );
 
+        $table->cellclass[][4] = 'action_buttons';
         if ($show_sent) {
             $data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&show_sent=1&delete_message=1&id='.$message_id.'"
-                onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
+                onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
         } else {
             $data[4] = '<a href="index.php?sec=message_list&amp;sec2=operation/messages/message_list&delete_message=1&id='.$message_id.'"
-                onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>'.html_print_checkbox_extended('delete_multiple_messages[]', $message_id, false, false, '', 'class="check_delete_messages"', true);
+                onClick="javascript:if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
         }
 
         array_push($table->data, $data);
diff --git a/pandora_console/operation/servers/recon_view.php b/pandora_console/operation/servers/recon_view.php
index b647d0ef20..5401f6e307 100644
--- a/pandora_console/operation/servers/recon_view.php
+++ b/pandora_console/operation/servers/recon_view.php
@@ -161,6 +161,7 @@ if ($servers === false) {
                 $data[7] = ui_print_timestamp($task['utimestamp'], true);
 
                 if (check_acl($config['id_user'], $task['id_group'], 'PM')) {
+                    $table->cellclass[][8] = 'action_buttons';
                     $data[8] = '<a href="index.php?sec=gservers&amp;sec2=godmode/servers/manage_recontask_form&amp;update='.$task['id_rt'].'">'.html_print_image('images/wrench_orange.png', true).'</a>';
                 } else {
                     $data[8] = '';

From d91631e0e1458d7ff65888c07b91205a13af8f1f Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 5 Apr 2019 13:18:38 +0200
Subject: [PATCH 08/32] New design for the tables - #3707

Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
---
 pandora_console/extensions/agents_alerts.php  |   4 +-
 .../godmode/agentes/agent_template.php        |   8 +-
 .../godmode/agentes/modificar_agente.php      |  37 ++++----
 .../godmode/agentes/module_manager.php        |  80 ++++++++++-------
 .../godmode/alerts/alert_list.list.php        |  55 +++++++-----
 pandora_console/godmode/users/user_list.php   |  40 +++++----
 .../wizards/DiscoveryTaskList.class.php       |   8 +-
 pandora_console/images/sort_down_black.png    | Bin 0 -> 228 bytes
 pandora_console/images/sort_down_green.png    | Bin 0 -> 207 bytes
 pandora_console/images/sort_up_black.png      | Bin 0 -> 224 bytes
 pandora_console/images/sort_up_green.png      | Bin 0 -> 209 bytes
 pandora_console/include/ajax/module.php       |  63 ++++++++------
 .../class/ManageNetScanScripts.class.php      |   4 +-
 pandora_console/include/functions_ui.php      |  31 +++++++
 pandora_console/include/styles/pandora.css    |  59 ++++++++++---
 .../operation/agentes/alerts_status.php       |  62 ++++++++------
 .../operation/agentes/custom_fields.php       |   2 +-
 .../operation/agentes/estado_agente.php       |  81 +++++++++++-------
 .../agentes/estado_generalagente.php          |  14 +--
 .../operation/agentes/status_monitor.php      |   1 +
 20 files changed, 354 insertions(+), 195 deletions(-)
 create mode 100644 pandora_console/images/sort_down_black.png
 create mode 100644 pandora_console/images/sort_down_green.png
 create mode 100644 pandora_console/images/sort_up_black.png
 create mode 100644 pandora_console/images/sort_up_green.png

diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php
index 373ff97819..72b90eeafa 100755
--- a/pandora_console/extensions/agents_alerts.php
+++ b/pandora_console/extensions/agents_alerts.php
@@ -422,7 +422,7 @@ function mainAgentsAlerts()
                 continue;
             }
 
-            echo '<th width="20px" >'.io_safe_output($tname).html_print_image('images/information_alerts.png', true, ['title' => io_safe_output($tname), 'style' => 'margin-left:5px' ]).'</th>';
+            echo '<th width="20px" >'.io_safe_output($tname).'</th>';
         }
 
         echo '</tr></thead>';
@@ -506,7 +506,7 @@ function mainAgentsAlerts()
 function print_alerts_summary_modal_window($id, $alerts)
 {
     $table->width = '98%';
-    $table->class = 'databox';
+    $table->class = 'info_table';
     $table->data = [];
 
     $table->head[0] = __('Module');
diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php
index 64e78320f5..ef771ebe77 100644
--- a/pandora_console/godmode/agentes/agent_template.php
+++ b/pandora_console/godmode/agentes/agent_template.php
@@ -224,7 +224,7 @@ if ($result === false) {
 $table->width = '100%';
 $table->cellpadding = 0;
 $table->cellspacing = 0;
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->head = [];
 $table->data = [];
 $table->align = [];
@@ -252,9 +252,9 @@ foreach ($result as $row) {
 
     $data[2] = mb_substr($row['descripcion'], 0, 60);
 
-    $data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row['id_agente_modulo'].'">'.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'onclick' => "if (!confirm('".__('Are you sure?')."')) return false;"]).'</a>&nbsp;&nbsp;';
-
-    $data[3] .= '&nbsp;&nbsp;<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row['id_agente_modulo'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update')]).'</a>';
+    $table->cellclass[][3] = 'action_buttons';
+    $data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row['id_agente_modulo'].'">'.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'onclick' => "if (!confirm('".__('Are you sure?')."')) return false;"]).'</a>';
+    $data[3] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row['id_agente_modulo'].'">'.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update')]).'</a>';
 
     array_push($table->data, $data);
 }
diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php
index b8d551091e..902d074f21 100644
--- a/pandora_console/godmode/agentes/modificar_agente.php
+++ b/pandora_console/godmode/agentes/modificar_agente.php
@@ -224,13 +224,13 @@ switch ($config['dbtype']) {
     break;
 }
 
-$selected = 'border: 1px solid black;';
-$selectNameUp = '';
-$selectNameDown = '';
-$selectOsUp = '';
-$selectOsDown = '';
-$selectGroupUp = '';
-$selectGroupDown = '';
+$selected = true;
+$selectNameUp = false;
+$selectNameDown = false;
+$selectOsUp = false;
+$selectOsDown = false;
+$selectGroupUp = false;
+$selectGroupDown = false;
 switch ($sortField) {
     case 'remote':
         switch ($sort) {
@@ -441,17 +441,24 @@ if (($config['dbtype'] == 'oracle') && ($agents !== false)) {
 ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled&os=$os", $offset);
 
 if ($agents !== false) {
+    // Urls to sort the table.
+    $url_up_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled';
+    $url_down_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled';
+    $url_up_remote = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled';
+    $url_down_remote = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=down&disabled=$disabled';
+    $url_up_os = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=up&disabled=$disabled';
+    $url_down_os = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=down&disabled=$disabled';
+    $url_up_group = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=up&disabled=$disabled';
+    $url_down_group = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=down&disabled=$disabled';
+
+
     echo "<table cellpadding='0' id='agent_list' cellspacing='0' width='100%' class='info_table'>";
     echo '<thead><tr>';
-    echo '<th>'.__('Agent name').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).'</a>';
-    echo '</th>';
-    echo "<th title='".__('Remote agent configuration')."'>".__('R').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown]).'</a>';
-    echo '</th>';
-    echo '<th>'.__('OS').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectOsUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectOsDown]).'</a>';
-    echo '</th>';
+    echo '<th>'.__('Agent name').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown).'</th>';
+    echo "<th title='".__('Remote agent configuration')."'>".__('R').ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown).'</th>';
+    echo '<th>'.__('OS').ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown).'</th>';
     echo '<th>'.__('Type').'</th>';
-    echo '<th>'.__('Group').' '.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=up&disabled=$disabled">'.html_print_image('images/sort_up.png', true, ['style' => $selectGroupUp]).'</a>'.'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=down&disabled=$disabled">'.html_print_image('images/sort_down.png', true, ['style' => $selectGroupDown]).'</a>';
-        echo '</th>';
+    echo '<th>'.__('Group').ui_get_sorting_arrows($url_up_group, $url_down_group, $selectGroupUp, $selectGroupDown).'</th>';
     echo '<th>'.__('Description').'</th>';
     echo "<th style='text-align:left'>".__('Actions').'</th>';
     echo '</tr></thead>';
diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php
index 9df6860591..6ad5267c0e 100644
--- a/pandora_console/godmode/agentes/module_manager.php
+++ b/pandora_console/godmode/agentes/module_manager.php
@@ -358,17 +358,17 @@ if ($multiple_delete) {
 // TABLE LIST MODULES
 // ==================
 $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente;
-$selectNameUp = '';
-$selectNameDown = '';
-$selectServerUp = '';
-$selectServerDown = '';
-$selectTypeUp = '';
-$selectTypeDown = '';
-$selectIntervalUp = '';
-$selectIntervalDown = '';
+$selectNameUp = false;
+$selectNameDown = false;
+$selectServerUp = false;
+$selectServerDown = false;
+$selectTypeUp = false;
+$selectTypeDown = false;
+$selectIntervalUp = false;
+$selectIntervalDown = false;
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
-$selected = '';
+$selected = true;
 
 $order[] = [
     'field' => 'tmodule_group.name',
@@ -482,13 +482,13 @@ switch ($sortField) {
 
     default:
         $selectNameUp = $selected;
-        $selectNameDown = '';
-        $selectServerUp = '';
-        $selectServerDown = '';
-        $selectTypeUp = '';
-        $selectTypeDown = '';
-        $selectIntervalUp = '';
-        $selectIntervalDown = '';
+        $selectNameDown = false;
+        $selectServerUp = false;
+        $selectServerDown = false;
+        $selectTypeUp = false;
+        $selectTypeDown = false;
+        $selectIntervalUp = false;
+        $selectIntervalDown = false;
         switch ($config['dbtype']) {
             case 'mysql':
             case 'postgresql':
@@ -626,32 +626,39 @@ if ($paginate_module) {
     ui_pagination($total_modules, $url);
 }
 
+$url_name = $url.'&sort_field=name&sort=';
+$url_server = $url.'&sort_field=server&sort=';
+$url_type = $url.'&sort_field=type&sort=';
+$url_interval = $url.'&sort_field=interval&sort=';
+
 $table = new stdClass();
 $table->width = '100%';
-$table->class = 'databox data';
+$table->class = 'info_table';
 $table->head = [];
-$table->head[0] = __('Name').' '.'<a href="'.$url.'&sort_field=name&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).'</a>'.'<a href="'.$url.'&sort_field=name&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).'</a>';
+$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[0] = __('Name').ui_get_sorting_arrows($url_name.'up', $url_name.'down', $selectNameUp, $selectNameDown);
 
 // The access to the policy is granted only with AW permission
 if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK && check_acl($config['id_user'], $agent['id_grupo'], 'AW')) {
     $table->head[1] = "<span title='".__('Policy')."'>".__('P.').'</span>';
 }
 
-$table->head[2] = "<span title='".__('Server')."'>".__('S.').'</span>'.' '.'<a href="'.$url.'&sort_field=server&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectServerUp]).'</a>'.'<a href="'.$url.'&sort_field=server&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectServerDown]).'</a>';
-$table->head[3] = __('Type').' '.'<a href="'.$url.'&sort_field=type&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp]).'</a>'.'<a href="'.$url.'&sort_field=type&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown]).'</a>';
-$table->head[4] = __('Interval').' '.'<a href="'.$url.'&sort_field=interval&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp]).'</a>'.'<a href="'.$url.'&sort_field=interval&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown]).'</a>';
+$table->head[2] = "<span title='".__('Server')."'>".__('S.').'</span>'.ui_get_sorting_arrows($url_server.'up', $url_server.'down', $selectServerUp, $selectServerDown);
+$table->head[3] = __('Type').ui_get_sorting_arrows($url_type.'up', $url_type.'down', $selectTypeUp, $selectTypeDown);
+$table->head[4] = __('Interval').ui_get_sorting_arrows($url_interval.'up', $url_interval.'down', $selectIntervalUp, $selectIntervalDown);
 $table->head[5] = __('Description');
 $table->head[6] = __('Status');
 $table->head[7] = __('Warn');
 
 
 $table->head[8] = __('Action');
-$table->head[9] = '<span title="'.__('Delete').'">'.__('Del.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
+$table->head[9] = '<span title="'.__('Delete').'">'.__('Del.').'</span>';
 
 $table->rowstyle = [];
 $table->style = [];
 $table->style[0] = 'font-weight: bold';
 $table->size = [];
+$table->size['checkbox'] = '20px';
 $table->size[2] = '70px';
 $table->align = [];
 $table->align[2] = 'left';
@@ -706,15 +713,19 @@ foreach ($modules as $module) {
             $table->rowstyle[($i - 1)] = 'text-align: center';
             $table->rowclass[($i - 1)] = 'datos3';
             if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
-                    $table->colspan[($i - 1)][0] = 10;
+                    $table->colspan[($i - 1)][0] = 11;
             } else {
-                $table->colspan[($i - 1)][0] = 9;
+                $table->colspan[($i - 1)][0] = 10;
             }
 
             $data = [];
         }
     }
 
+    if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
+        $data['checkbox'] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
+    }
+
     $data[0] = '';
 
     if (isset($module['deep']) && ($module['deep'] != 0)) {
@@ -858,7 +869,7 @@ foreach ($modules as $module) {
     }
 
     if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') && $module['id_tipo_modulo'] != 25) {
-        $data[8] .= '&nbsp;<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
+        $data[8] .= '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
 			onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
         $data[8] .= html_print_image(
             'images/copy.png',
@@ -870,7 +881,7 @@ foreach ($modules as $module) {
         // Make a data normalization
         if (isset($numericModules[$type])) {
             if ($numericModules[$type] === true) {
-                $data[8] .= '&nbsp;<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
+                $data[8] .= '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
                 $data[8] .= html_print_image(
                     'images/chart_curve.png',
                     true,
@@ -879,18 +890,19 @@ foreach ($modules as $module) {
                 $data[8] .= '</a>';
             }
         } else {
-            $data[8] .= '&nbsp;'.html_print_image(
+            $data[8] .= html_print_image(
                 'images/chart_curve.disabled.png',
                 true,
                 ['title' => __('Normalize (Disabled)')]
             );
+            $data[8] .= '&nbsp;&nbsp;';
         }
 
         // create network component action
         if ((is_user_admin($config['id_user']))
             && ($module['id_modulo'] == MODULE_NETWORK)
         ) {
-            $data[8] .= '&nbsp;<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_components&create_network_from_module=1&id_agente='.$id_agente.'&create_module_from='.$module['id_agente_modulo'].'"
+            $data[8] .= '<a href="index.php?sec=gmodules&sec2=godmode/modules/manage_network_components&create_network_from_module=1&id_agente='.$id_agente.'&create_module_from='.$module['id_agente_modulo'].'"
 				onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
             $data[8] .= html_print_image(
                 'images/network.png',
@@ -899,11 +911,12 @@ foreach ($modules as $module) {
             );
             $data[8] .= '</a> ';
         } else {
-            $data[8] .= '&nbsp;'.html_print_image(
+            $data[8] .= html_print_image(
                 'images/network.disabled.png',
                 true,
                 ['title' => __('Create network component (Disabled)')]
             );
+            $data[8] .= '&nbsp;&nbsp;';
         }
     }
 
@@ -917,10 +930,17 @@ foreach ($modules as $module) {
             ['title' => __('Delete')]
         );
         $data[9] .= '</a> ';
-        $data[9] .= html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
     }
 
+    $table->cellclass[] = [
+        8 => 'action_buttons',
+        9 => 'action_buttons',
+    ];
     array_push($table->data, $data);
+    $table->cellclass[] = [
+        8 => 'action_buttons',
+        9 => 'action_buttons',
+    ];
 }
 
 if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) {
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index dd4d0e0763..e7a013d971 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -226,17 +226,18 @@ $order = null;
 
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
-$selected = 'border: 1px solid black;';
+$selected = true;
+// 'border: 1px solid black;';
 $selectDisabledUp = '';
 $selectDisabledDown = '';
 $selectStandbyUp = '';
 $selectStandbyDown = '';
-$selectAgentUp = '';
-$selectAgentDown = '';
-$selectModuleUp = '';
-$selectModuleDown = '';
-$selectTemplateUp = '';
-$selectTemplateDown = '';
+$selectAgentUp = false;
+$selectAgentDown = false;
+$selectModuleUp = false;
+$selectModuleDown = false;
+$selectTemplateUp = false;
+$selectTemplateDown = false;
 
 switch ($sortField) {
     case 'disabled':
@@ -346,11 +347,11 @@ switch ($sortField) {
             $selectStandbyUp = '';
             $selectStandbyDown = '';
             $selectAgentUp = $selected;
-            $selectAgentDown = '';
-            $selectModuleUp = '';
-            $selectModuleDown = '';
-            $selectTemplateUp = '';
-            $selectTemplateDown = '';
+            $selectAgentDown = false;
+            $selectModuleUp = false;
+            $selectModuleDown = false;
+            $selectTemplateUp = false;
+            $selectTemplateDown = false;
             $order = [
                 'field' => 'agent_name',
                 'order' => 'ASC',
@@ -360,12 +361,12 @@ switch ($sortField) {
             $selectDisabledDown = '';
             $selectStandbyUp = '';
             $selectStandbyDown = '';
-            $selectAgentUp = '';
-            $selectAgentDown = '';
+            $selectAgentUp = false;
+            $selectAgentDown = false;
             $selectModuleUp = $selected;
-            $selectModuleDown = '';
-            $selectTemplateUp = '';
-            $selectTemplateDown = '';
+            $selectModuleDown = false;
+            $selectTemplateUp = false;
+            $selectTemplateDown = false;
             $order = [
                 'field' => 'agent_module_name',
                 'order' => 'ASC',
@@ -402,6 +403,15 @@ if (!$id_agente) {
     $url = 'index.php?sec='.$sec.'&sec2=godmode/agentes/configurar_agente&pure='.$pure.'&tab=alert&id_agente='.$id_agente.'&offset='.$offset.$form_params;
 }
 
+// Urls to sort the table.
+$url_up_agente = $url.'&sort_field=agent&sort=up&pure='.$pure;
+$url_down_agente = $url.'&sort_field=agent&sort=down&pure='.$pure;
+$url_up_module = $url.'&sort_field=module&sort=up&pure='.$pure;
+$url_down_module = $url.'&sort_field=module&sort=down&pure='.$pure;
+$url_up_template = $url.'&sort_field=template&sort=up&pure='.$pure;
+$url_down_template = $url.'&sort_field=template&sort=down&pure='.$pure;
+
+
 $table = new stdClass();
 
 if (is_metaconsole()) {
@@ -427,7 +437,7 @@ $table->head = [];
 if (! $id_agente) {
     $table->style = [];
     $table->style[0] = 'font-weight: bold;';
-    $table->head[0] = __('Agent').'&nbsp;'.'<a href="'.$url.'&sort_field=agent&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).'</a>'.'<a href="'.$url.'&sort_field=agent&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).'</a>';
+    $table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
     $table->size[0] = '4%';
     $table->size[1] = '8%';
     $table->size[2] = '8%';
@@ -439,7 +449,7 @@ if (! $id_agente) {
         $table->size[4] = '8%';
     }*/
 } else {
-    $table->head[0] = __('Module').'&nbsp;'.'<a href="'.$url.'&sort_field=module&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).'</a>'.'<a href="'.$url.'&sort_field=module&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).'</a>';
+    $table->head[0] = __('Module').ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
     // Different sizes or the layout screws up
     $table->size[0] = '0%';
     $table->size[1] = '10%';
@@ -452,7 +462,7 @@ if (! $id_agente) {
     $table->size[4] = '1%';
 }
 
-$table->head[1] = __('Template').'&nbsp;'.'<a href="'.$url.'&sort_field=template&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
+$table->head[1] = __('Template').ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
 $table->head[2] = __('Actions');
 $table->head[3] = __('Status');
 $table->head[4] = "<span title='".__('Operations')."'>".__('Op.').'</span>';
@@ -728,7 +738,10 @@ foreach ($simple_alerts as $alert) {
 
     $data[3] = ui_print_status_image($status, $title, true);
 
-    $table->cellclass[][4] = 'action_buttons';
+    $table->cellclass[] = [
+        3 => 'action_buttons',
+        4 => 'action_buttons',
+    ];
     $data[4] = '<form class="disable_alert_form" action="'.$url.'" method="post" style="display: inline;">';
     if ($alert['disabled']) {
         $data[4] .= html_print_input_image('enable', 'images/lightbulb_off.png', 1, 'padding:0px', true);
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index c879cbdf09..63caad6d3f 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -38,13 +38,13 @@ $sort = get_parameter('sort', 'none');
 $tab = get_parameter('tab', 'user');
 $pure = get_parameter('pure', 0);
 
-$selected = 'border: 1px solid black;';
-$selectUserIDUp = '';
-$selectUserIDDown = '';
-$selectFullnameUp = '';
-$selectFullnameDown = '';
-$selectLastConnectUp = '';
-$selectLastConnectDown = '';
+$selected = true;
+$selectUserIDUp = false;
+$selectUserIDDown = false;
+$selectFullnameUp = false;
+$selectFullnameDown = false;
+$selectLastConnectUp = false;
+$selectLastConnectDown = false;
 $order = null;
 
 switch ($sortField) {
@@ -110,11 +110,11 @@ switch ($sortField) {
 
     default:
         $selectUserIDUp = $selected;
-        $selectUserIDDown = '';
-        $selectFullnameUp = '';
-        $selectFullnameDown = '';
-        $selectLastConnectUp = '';
-        $selectLastConnectDown = '';
+        $selectUserIDDown = false;
+        $selectFullnameUp = false;
+        $selectFullnameDown = false;
+        $selectLastConnectUp = false;
+        $selectLastConnectDown = false;
         $order = [
             'field' => 'id_user',
             'order' => 'ASC',
@@ -300,6 +300,15 @@ if (defined('METACONSOLE')) {
     ui_toggle($form_filter, __('Users control filter'), __('Toggle filter(s)'), !$search);
 }
 
+// Urls to sort the table.
+$url_up_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=up&pure='.$pure;
+$url_down_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=down&pure='.$pure;
+$url_up_name = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=up&pure='.$pure;
+$url_down_name = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=down&pure='.$pure;
+$url_up_last = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=up&pure='.$pure;
+$url_down_last = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=down&pure='.$pure;
+
+
 $table = new stdClass();
 $table->cellpadding = 0;
 $table->cellspacing = 0;
@@ -312,9 +321,10 @@ $table->align = [];
 $table->size = [];
 $table->valign = [];
 
-$table->head[0] = __('User ID').' '.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectUserIDUp]).'</a>'.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectUserIDDown]).'</a>';
-$table->head[1] = __('Name').' '.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectFullnameUp ]).'</a>'.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectFullnameDown]).'</a>';
-$table->head[2] = __('Last contact').' '.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=up&pure='.$pure.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectLastConnectUp ]).'</a>'.'<a href="?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=down&pure='.$pure.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectLastConnectDown]).'</a>';
+$table->head[0] = __('User ID').ui_get_sorting_arrows($url_up_id, $url_down_id, $selectUserIDUp, $selectUserIDDown);
+$table->head[1] = __('Name').ui_get_sorting_arrows($url_up_name, $url_down_name, $selectFullnameUp, $selectFullnameDown);
+$table->head[2] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastConnectUp, $selectLastConnectDown);
+
 $table->head[3] = __('Admin');
 $table->head[4] = __('Profile / Group');
 $table->head[5] = __('Description');
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 610353ebb7..c90a799ec6 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -352,10 +352,10 @@ class DiscoveryTaskList extends Wizard
                 $url_ajax = $config['homeurl'].'ajax.php';
 
                 $table = new StdClass();
-                $table->cellpadding = 4;
-                $table->cellspacing = 4;
+                $table->cellpadding = 0;
+                $table->cellspacing = 0;
                 $table->width = '100%';
-                $table->class = 'databox data';
+                $table->class = 'info_table';
                 $table->head = [];
                 $table->data = [];
                 $table->align = [];
@@ -566,6 +566,8 @@ class DiscoveryTaskList extends Wizard
                     $data[9] = '';
                 }
 
+                $table->cellclass[][9] = 'action_buttons';
+
                 // Div neccesary for modal progress task.
                 echo '<div id="progress_task_'.$task['id_rt'].'" style="display:none"></div>';
 
diff --git a/pandora_console/images/sort_down_black.png b/pandora_console/images/sort_down_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..13ade460fc8898ca5df254d94fa1d515cce217bb
GIT binary patch
literal 228
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JirPF~978H@B_${b8qAt8LxbTZOOnWZ%i?8?tR6NDS)bTH
z@p7z)XHc54V2%q@mpntEV#h%qrFpj1-<-U>x&%*@99XC*@M4m5g1tgF)7)+H-OD%~
zj<y=`3C~hFktsjnhj_yd!AM49BlZ_t_#Kx2Wihf{;52W6gQ7%@!}7K4kJ#9<7#bLu
Z89r31+F#zXJr?L922WQ%mvv4FO#pb;N?-s0

literal 0
HcmV?d00001

diff --git a/pandora_console/images/sort_down_green.png b/pandora_console/images/sort_down_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc6086912d520f23194e5c18667acc33c35211a5
GIT binary patch
literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JiV8hl978H@B_${b8koJk63lRk^N7Z};{8_+FsaBfnEqt`
z$;NUepFz+kz)y+sD1SoMj0It_3_-mWCMrx<YZ!hrMvA=H^4H-MqwhzS1&^F0+Bxs4
zDEw<Ua(u%~PF)eX1)2@ktojUAxwZo41_8_rED{WA8<d3Ko?Y4vw4A}y)z4*}Q$iB}
D<G4ZY

literal 0
HcmV?d00001

diff --git a/pandora_console/images/sort_up_black.png b/pandora_console/images/sort_up_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..238d89520fb09083d9bb112dbdae6cc0d8b747c4
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JikduK978H@B_${b8YByw7#ea;m^A58#kV&%xl1hFbh>yO
zuGA^~V>r^5es0ds2A%UQN1J{+=rA1Na){}_?&)w@x*>#R(gfBEnc|IpyBi;>tO!1r
zyixFpitCKaGZu6?`bG3BC$KCy=kn3n_R85E4h$DAuxwyk5zN)m(NxD)#Ng1t$l!Wj
WE`W9a*?ypF7(8A5T-G@yGywoYQ&DID

literal 0
HcmV?d00001

diff --git a/pandora_console/images/sort_up_green.png b/pandora_console/images/sort_up_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c57937f400e4ee42c87c492c296272ae4e1bfbe
GIT binary patch
literal 209
zcmeAS@N?(olHy`uVBq!ia0vp^JV4CF!3HE7boT!OQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jii$m5978H@B_%9i%eb{toZ$%DjVBTtHP|%o@E?(HxUu2f
z-%IQ%m1;U|XV{Y%6~Y)ERh4+EnOv4`5ZM&W<#6usE0q<&=aM%HK2dR<ae2mqE=RwJ
zeq|n(1?OA}gKV#y-NB%7Md*Ok0zXX!r7gctb}2V7Ff&*t$cjm%{SgLQ&*16m=d#Wz
Gp$Py4z(@lC

literal 0
HcmV?d00001

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index fb62ff8339..7ce37005ea 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -527,19 +527,19 @@ if (check_login()) {
         $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;
-        $selectTypeUp = '';
-        $selectTypeDown = '';
-        $selectNameUp = '';
-        $selectNameDown = '';
-        $selectStatusUp = '';
-        $selectStatusDown = '';
-        $selectDataUp = '';
-        $selectDataDown = '';
-        $selectLastContactUp = '';
-        $selectLastContactDown = '';
+        $selectTypeUp = false;
+        $selectTypeDown = false;
+        $selectNameUp = false;
+        $selectNameDown = false;
+        $selectStatusUp = false;
+        $selectStatusDown = false;
+        $selectDataUp = false;
+        $selectDataDown = false;
+        $selectLastContactUp = false;
+        $selectLastContactDown = false;
         $sortField = get_parameter('sort_field');
         $sort = get_parameter('sort', 'none');
-        $selected = 'border: 1px solid black;';
+        $selected = true;
 
         $order[] = [
             'field' => 'tmodule_group.name',
@@ -627,16 +627,16 @@ if (check_login()) {
             break;
 
             default:
-                $selectTypeUp = '';
-                $selectTypeDown = '';
+                $selectTypeUp = false;
+                $selectTypeDown = false;
                 $selectNameUp = $selected;
-                $selectNameDown = '';
-                $selectStatusUp = '';
-                $selectStatusDown = '';
-                $selectDataUp = '';
-                $selectDataDown = '';
-                $selectLastContactUp = '';
-                $selectLastContactDown = '';
+                $selectNameDown = false;
+                $selectStatusUp = false;
+                $selectStatusDown = false;
+                $selectDataUp = false;
+                $selectDataDown = false;
+                $selectLastContactUp = false;
+                $selectLastContactDown = false;
 
                 $order[] = [
                     'field' => 'tagente_modulo.nombre',
@@ -756,6 +756,17 @@ if (check_login()) {
             $modules = [];
         }
 
+        // Urls to sort the table.
+        $url_up_type = $url.'&sort_field=type&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_down_type = $url.'&sort_field=type&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_up_name = $url.'&sort_field=name&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_down_name = $url.'&sort_field=name&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_up_status = $url.'&sort_field=status&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_down_status = $url.'&sort_field=status&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_up_last = $url.'&sort_field=last_contact&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+        $url_down_last = $url.'&sort_field=last_contact&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group;
+
+
         $table = new stdClass();
         $table->width = '100%';
         $table->cellpadding = 0;
@@ -773,17 +784,15 @@ if (check_login()) {
             $table->head[1] = "<span title='".__('Policy')."'>".__('P.').'</span>';
         }
 
-        $table->head[2] = __('Type').' '.'<a href="'.$url.'&sort_field=type&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).'</a>'.'<a href="'.$url.'&sort_field=type&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).'</a>';
-        $table->head[3] = __('Module name').' '.'<a href="'.$url.'&sort_field=name&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).'</a>'.'<a href="'.$url.'&sort_field=name&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).'</a>';
+        $table->head[2] = __('Type').ui_get_sorting_arrows($url_up_type, $url_down_type, $selectTypeUp, $selectTypeDown);
+        $table->head[3] = __('Module name').ui_get_sorting_arrows($url_up_name, $url_down_name, $selectNameUp, $selectNameDown);
         $table->head[4] = __('Description');
-        $table->head[5] = __('Status').' '.'<a href="'.$url.'&sort_field=status&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).'</a>'.'<a href="'.$url.'&sort_field=status&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'</a>';
+        $table->head[5] = __('Status').ui_get_sorting_arrows($url_up_status, $url_down_status, $selectStatusUp, $selectStatusDown);
         $table->head[6] = __('Thresholds');
         $table->head[7] = __('Data');
         $table->head[8] = __('Graph');
         $table->headstyle[8] = 'min-width: 60px';
-        $table->head[9] = __('Last contact').' '.'<a href="'.$url.'&sort_field=last_contact&amp;sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_up.png', true, ['style' => $selectLastContactUp, 'alt' => 'up']).'</a>'.'<a href="'.$url.'&sort_field=last_contact&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group.'">'.html_print_image('images/sort_down.png', true, ['style' => $selectLastContactDown, 'alt' => 'down']).'</a>';
-
-
+        $table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
         $table->align = [
             'left',
             'left',
@@ -896,7 +905,7 @@ if (check_login()) {
             $data[2] = servers_show_type($module['id_modulo']).'&nbsp;';
 
             if (check_acl($config['id_user'], $id_grupo, 'AW')) {
-                $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'">'.html_print_image('images/config.png', true, ['alt' => '0', 'border' => '', 'title' => __('Edit')]).'</a>';
+                $data[2] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$id_agente.'&amp;tab=module&amp;id_agent_module='.$module['id_agente_modulo'].'&amp;edit_module='.$module['id_modulo'].'">'.html_print_image('images/config.png', true, ['alt' => '0', 'border' => '', 'title' => __('Edit'), 'class' => 'action_button_img']).'</a>';
             }
 
 
diff --git a/pandora_console/include/class/ManageNetScanScripts.class.php b/pandora_console/include/class/ManageNetScanScripts.class.php
index f3ca4c92b5..efc94cc8b6 100644
--- a/pandora_console/include/class/ManageNetScanScripts.class.php
+++ b/pandora_console/include/class/ManageNetScanScripts.class.php
@@ -389,10 +389,12 @@ class ManageNetScanScripts extends Wizard
         $rows = db_get_all_rows_in_table('trecon_script');
 
         if ($rows !== false) {
-            echo '<table width="100%" cellspacing="4" cellpadding="4" class="databox data">';
+            echo '<table width="100%" cellspacing="0" cellpadding="0" class="info_table">';
+            echo '<thead>';
             echo '<th>'.__('Name').'</th>';
             echo '<th>'.__('Description').'</th>';
             echo '<th>'.__('Delete').'</th>';
+            echo '</thead>';
             $color = 0;
             foreach ($rows as $row) {
                 if ($color == 1) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index b621161ecc..413bebef35 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4429,3 +4429,34 @@ function ui_get_favicon()
 
     return 'images/custom_favicon/'.$config['custom_favicon'];
 }
+
+
+/**
+ * Show sorting arrows for tables
+ *
+ * @return string  HTML anchor link with the arrow icon.
+ */
+function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
+{
+    $arrow_up = 'images/sort_up_black.png';
+    $arrow_down = 'images/sort_down_black.png';
+
+    // en el hover usar flechas verdes en el nodo
+    if ($selectUp === true) {
+        $arrow_up = 'images/sort_up_green.png';
+    }
+
+    if ($selectDown === true) {
+        $arrow_down = 'images/sort_down_green.png';
+    }
+
+    if (is_metaconsole()) {
+        $arrow_up = 'images/sort_up.png';
+        $arrow_down = 'images/sort_down.png';
+    }
+
+    return '<span class="sort_arrow">
+                <a href="'.$url_up.'">'.html_print_image($arrow_up, true, ['alt' => 'up']).'</a>
+                <a href="'.$url_down.'">'.html_print_image($arrow_down, true, ['alt' => 'down']).'</a>
+            </span>';
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index bb64542112..940b22f237 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1014,17 +1014,30 @@ div#cont {
 }
 
 td.datos3,
-td.datos3 * {
-  background-color: #666;
-  color: white !important;
+/*td.datos3 **/
+td.datos4 {
+  background-color: #fff;
+  color: #000 !important;
+  border-bottom: 2px solid #82b92e !important;
+  border-left: none !important;
+  border-right: none !important;
+  height: 30px;
+  font-size: 8.6pt;
+  font-weight: normal;
 }
 
-td.datos4,
-td.datos4 * {
+td.datos4 /*,
+td.datos4 */ {
   /*Add !important because in php the function html_print_table write style in cell and this is style head.*/
   text-align: center !important;
-  background-color: #666;
-  color: white !important;
+  /* background-color: #666;
+  color: white !important;*/
+}
+
+td.datos3 *,
+td.datos4 * {
+  font-size: 8.6pt;
+  font-weight: normal;
 }
 
 /*td.datos_id {
@@ -5031,6 +5044,9 @@ table.info_table tr:first-child > th {
   border-top: 1px solid #e2e2e2;
   color: #000;
   text-align: left;
+  vertical-align: middle;
+
+  /*background-color: pink;*/
 }
 
 table.info_table tr:first-child > th span {
@@ -5076,10 +5092,11 @@ table.info_table > thead > tr > th a {
   /*padding: 9px 7px;*/
   padding-left: 9px;
   padding-right: 9px;
-  padding-top: 7px;
-  padding-bottom: 7px;
-  font-weight: bold;
+  padding-top: 9px;
+  padding-bottom: 9px;
+  font-weight: normal;
   color: #000;
+  font-size: 8.6pt;
 }
 
 table.info_table > tbody > tr > td {
@@ -5137,8 +5154,14 @@ table.info_table td:last-child img {
 
 /* no confundir con action-buttons */
 /* esta se pa los botones de las tablas de delete etc*/
+/*para cuando solo hay un boton y puede haber iconos que no son botones al lado*/
+.action_button_img {
+  cursor: pointer;
+}
+
 .action_buttons a[href] img,
-.action_buttons input[type="image"] {
+.action_buttons input[type="image"],
+.action_button_img {
   border-radius: 4px;
   border: 1px solid #dcdcdc !important;
   padding: 1px;
@@ -5187,6 +5210,11 @@ table.info_table td:last-child img {
   display: block;
 }
 
+.pagination .page_number:hover,
+.pagination .pagination-arrows:hover {
+  background-color: #e2e2e2;
+}
+
 .pagination .total_number > *:first-child {
   border-top-left-radius: 2px;
   border-bottom-left-radius: 2px;
@@ -5231,3 +5259,12 @@ table.info_table td:last-child img {
   margin-top: 0px;
   align-items: flex-start;
 }
+
+/* FELCHAS ORDENACION */
+.sort_arrow {
+  display: inline-grid;
+  vertical-align: middle;
+}
+.sort_arrow a {
+  padding: 0 0 0 5px !important;
+}
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index d63d9b8e7d..8aaa9b11eb 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -220,13 +220,13 @@ if ($free_search != '') {
 
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
-$selected = 'border: 1px solid black;';
-$selectAgentUp = '';
-$selectAgentDown = '';
-$selectModuleUp = '';
-$selectModuleDown = '';
-$selectTemplateUp = '';
-$selectTemplateDown = '';
+$selected = true;
+$selectAgentUp = false;
+$selectAgentDown = false;
+$selectModuleUp = false;
+$selectModuleDown = false;
+$selectTemplateUp = false;
+$selectTemplateDown = false;
 switch ($sortField) {
     case 'agent':
         switch ($sort) {
@@ -292,12 +292,12 @@ switch ($sortField) {
         if ($print_agent) {
             $selectDisabledUp = '';
             $selectDisabledDown = '';
-            $selectAgentUp = '';
-            $selectAgentDown = '';
+            $selectAgentUp = false;
+            $selectAgentDown = false;
             $selectModuleUp = $selected;
-            $selectModuleDown = '';
-            $selectTemplateUp = '';
-            $selectTemplateDown = '';
+            $selectModuleDown = false;
+            $selectTemplateUp = false;
+            $selectTemplateDown = false;
             $order = [
                 'field' => 'agent_module_name',
                 'order' => 'ASC',
@@ -305,12 +305,12 @@ switch ($sortField) {
         } else {
             $selectDisabledUp = '';
             $selectDisabledDown = '';
-            $selectAgentUp = '';
-            $selectAgentDown = '';
+            $selectAgentUp = false;
+            $selectAgentDown = false;
             $selectModuleUp = $selected;
-            $selectModuleDown = '';
-            $selectTemplateUp = '';
-            $selectTemplateDown = '';
+            $selectModuleDown = false;
+            $selectTemplateUp = false;
+            $selectTemplateDown = false;
             $order = [
                 'field' => 'agent_module_name',
                 'order' => 'ASC',
@@ -440,6 +440,14 @@ if ($print_agent) {
     }
 }
 
+// Urls to sort the table.
+$url_up_agente = $url.'&sort_field=agent&sort=up';
+$url_down_agente = $url.'&sort_field=agent&sort=down';
+$url_up_module = $url.'&sort_field=module&sort=up';
+$url_down_module = $url.'&sort_field=module&sort=down';
+$url_up_template = $url.'&sort_field=template&sort=up';
+$url_down_template = $url.'&sort_field=template&sort=down';
+
 $table = new stdClass();
 $table->width = '100%';
 $table->class = 'info_table';
@@ -481,9 +489,9 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 
         // Sort buttons are only for normal console
         if (!is_metaconsole()) {
-            $table->head[3] .= ' '.'<a href="'.$url.'&sort_field=agent&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).'</a>'.'<a href="'.$url.'&sort_field=agent&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).'</a>';
-            $table->head[4] .= ' '.'<a href="'.$url.'&sort_field=module&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).'</a>'.'<a href="'.$url.'&sort_field=module&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).'</a>';
-            $table->head[5] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
+            $table->head[3] .= ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
+            $table->head[4] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
+            $table->head[5] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
         }
     } else {
         if (!is_metaconsole()) {
@@ -515,8 +523,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 
         // Sort buttons are only for normal console
         if (!is_metaconsole()) {
-            $table->head[3] .= ' '.'<a href="'.$url.'&sort_field=module&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).'</a>'.'<a href="'.$url.'&sort_field=module&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).'</a>';
-            $table->head[4] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
+            $table->head[3] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
+            $table->head[4] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
         }
     }
 } else {
@@ -547,9 +555,9 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 
         // Sort buttons are only for normal console
         if (!is_metaconsole()) {
-            $table->head[2] .= ' '.'<a href="'.$url.'&sort_field=agent&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).'</a>'.'<a href="'.$url.'&sort_field=agent&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).'</a>';
-            $table->head[3] .= ' '.'<a href="'.$url.'&sort_field=module&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).'</a>'.'<a href="'.$url.'&sort_field=module&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).'</a>';
-            $table->head[4] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
+            $table->head[3] .= ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown);
+            $table->head[4] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
+            $table->head[5] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
         }
     } else {
         if (!is_metaconsole()) {
@@ -577,8 +585,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) {
 
         // Sort buttons are only for normal console
         if (!is_metaconsole()) {
-            $table->head[2] .= ' '.'<a href="'.$url.'&sort_field=module&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).'</a>'.'<a href="'.$url.'&sort_field=module&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).'</a>';
-            $table->head[3] .= ' '.'<a href="'.$url.'&sort_field=template&sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).'</a>'.'<a href="'.$url.'&sort_field=template&sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).'</a>';
+            $table->head[2] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown);
+            $table->head[3] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown);
         }
     }
 }
diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php
index a0c123ea5e..a98f92d4ee 100644
--- a/pandora_console/operation/agentes/custom_fields.php
+++ b/pandora_console/operation/agentes/custom_fields.php
@@ -60,7 +60,7 @@ if ($fields === false) {
 } else {
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->head = [];
     $table->head[0] = __('Field');
     $table->size[0] = '20%';
diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php
index 16c080edd3..bb9dc7cef7 100644
--- a/pandora_console/operation/agentes/estado_agente.php
+++ b/pandora_console/operation/agentes/estado_agente.php
@@ -264,17 +264,19 @@ if ($search != '') {
 $sortField = get_parameter('sort_field');
 $sort = get_parameter('sort', 'none');
 
-$selected = 'border: 1px solid black;';
-$selectNameUp = '';
-$selectNameDown = '';
-$selectOsUp = '';
-$selectOsDown = '';
-$selectIntervalUp = '';
-$selectIntervalDown = '';
-$selectGroupUp = '';
-$selectGroupDown = '';
-$selectLastContactUp = '';
-$selectLastContactDown = '';
+$selected = true;
+$selectNameUp = false;
+$selectNameDown = false;
+$selectOsUp = false;
+$selectOsDown = false;
+$selectIntervalUp = false;
+$selectIntervalDown = false;
+$selectGroupUp = false;
+$selectGroupDown = false;
+$selectDescriptionUp = false;
+$selectDescriptionDown = false;
+$selectLastContactUp = false;
+$selectLastContactDown = false;
 $order = null;
 
 
@@ -428,7 +430,7 @@ switch ($sortField) {
     case 'description':
         switch ($sort) {
             case 'up':
-                $selectLastContactUp = $selected;
+                $selectDescriptionUp = $selected;
                 $order = [
                     'field'  => 'comentarios',
                     'field2' => 'alias'.$order_collation,
@@ -437,7 +439,7 @@ switch ($sortField) {
             break;
 
             case 'down':
-                $selectLastContactDown = $selected;
+                $selectDescriptionDown = $selected;
                 $order = [
                     'field'  => 'comentarios',
                     'field2' => 'alias'.$order_collation,
@@ -449,15 +451,17 @@ switch ($sortField) {
 
     default:
         $selectNameUp = $selected;
-        $selectNameDown = '';
-        $selectOsUp = '';
-        $selectOsDown = '';
-        $selectIntervalUp = '';
-        $selectIntervalDown = '';
-        $selectGroupUp = '';
-        $selectGroupDown = '';
-        $selectLastContactUp = '';
-        $selectLastContactDown = '';
+        $selectNameDown = false;
+        $selectOsUp = false;
+        $selectOsDown = false;
+        $selectIntervalUp = false;
+        $selectIntervalDown = false;
+        $selectGroupUp = false;
+        $selectGroupDown = false;
+        $selectDescriptionUp = false;
+        $selectDescriptionDown = false;
+        $selectLastContactUp = false;
+        $selectLastContactDown = false;
         $order = [
             'field'  => 'alias'.$order_collation,
             'field2' => 'alias'.$order_collation,
@@ -620,6 +624,23 @@ if (empty($agents)) {
     $agents = [];
 }
 
+// Urls to sort the table.
+$url_up_agente = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=up';
+$url_down_agente = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=down';
+$url_up_description = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=description&amp;sort=up';
+$url_down_description = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=description&amp;sort=down';
+$url_up_remote = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=remote&amp;sort=up';
+$url_down_remote = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=remote&amp;sort=down';
+$url_up_os = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=os&amp;sort=up';
+$url_down_os = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=os&amp;sort=down';
+$url_up_interval = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=interval&amp;sort=up';
+$url_down_interval = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=interval&amp;sort=down';
+$url_up_group = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=group&amp;sort=up';
+$url_down_group = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=group&amp;sort=down';
+$url_up_last = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=last_contact&amp;sort=up';
+$url_down_last = 'index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=last_contact&amp;sort=down';
+
+
 // Prepare pagination
 ui_pagination(
     $total_agents,
@@ -634,24 +655,22 @@ $table->width = '100%';
 $table->class = 'info_table';
 
 $table->head = [];
-$table->head[0] = __('Agent').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=name&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).'</a>';
+$table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown);
 $table->size[0] = '10%';
 
-$table->head[1] = __('Description').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=description&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=description&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).'</a>';
-
+$table->head[1] = __('Description').ui_get_sorting_arrows($url_up_description, $url_down_description, $selectDescriptionUp, $selectDescriptionDown);
 $table->size[1] = '16%';
 
-$table->head[10] = __('Remote').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=remote&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=remote&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown, 'alt' => 'down']).'</a>';
-
+$table->head[10] = __('Remote').ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown);
 $table->size[10] = '9%';
 
-$table->head[2] = __('OS').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=os&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectOsUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=os&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectOsDown, 'alt' => 'down']).'</a>';
+$table->head[2] = __('OS').ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown);
 $table->size[2] = '8%';
 
-$table->head[3] = __('Interval').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=interval&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=interval&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).'</a>';
+$table->head[3] = __('Interval').ui_get_sorting_arrows($url_up_interval, $url_down_interval, $selectIntervalUp, $selectIntervalDown);
 $table->size[3] = '10%';
 
-$table->head[4] = __('Group').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=group&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectGroupUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=group&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectGroupDown, 'alt' => 'down']).'</a>';
+$table->head[4] = __('Group').ui_get_sorting_arrows($url_up_group, $url_down_group, $selectGroupUp, $selectGroupDown);
 $table->size[4] = '8%';
 
 $table->head[5] = __('Type');
@@ -666,7 +685,7 @@ $table->size[7] = '4%';
 $table->head[8] = __('Alerts');
 $table->size[8] = '4%';
 
-$table->head[9] = __('Last contact').' '.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=last_contact&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectLastContactUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/estado_agente&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;group_id='.$group_id.'&amp;recursion='.$recursion.'&amp;search='.$search.'&amp;status='.$status.'&amp;sort_field=last_contact&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectLastContactDown, 'alt' => 'down']).'</a>';
+$table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown);
 $table->size[9] = '15%';
 
 $table->align = [];
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 18cb29027a..8774f94402 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -211,7 +211,7 @@ $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->class = 'info_table';
 $table_contact->style[0] = 'width: 30%;height:30px;';
 $table_contact->style[1] = 'width: 70%;';
 
@@ -254,7 +254,7 @@ $table_data->width = '100%';
 $table_data->styleTable = 'height:180px';
 $table_data->cellspacing = 0;
 $table_data->cellpadding = 0;
-$table_data->class = 'databox data';
+$table_data->class = 'info_table';
 $table_data->style[0] = 'width: 30%;';
 $table_data->style[1] = 'width: 40%;';
 
@@ -416,7 +416,7 @@ if ($last_incident != false) {
     $table_incident->width = '100%';
     $table_incident->cellspacing = 0;
     $table_incident->cellpadding = 0;
-    $table_incident->class = 'databox';
+    $table_incident->class = 'info_table';
     $table_incident->style[0] = 'width: 30%;';
     $table_incident->style[1] = 'width: 70%;';
 
@@ -456,7 +456,7 @@ 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->class = 'info_table';
     $table_interface->width = '98%';
     $table_interface->style = [];
     $table_interface->style['interface_status'] = 'width: 30px;padding-top:0px;padding-bottom:0px;';
@@ -478,7 +478,7 @@ if (!empty($network_interfaces)) {
         'class' => 'closed',
         'style' => 'vertical-align:righ; cursor:pointer;',
     ];
-    $table_interface->head[0] = html_print_image('images/graphmenu_arrow.png', true, $options).'&nbsp;&nbsp;';
+    $table_interface->head[0] = html_print_image('images/go.png', true, $options).'&nbsp;&nbsp;';
     $table_interface->head[0] .= '<span style="vertical-align: middle;">'.__('Interface information').' (SNMP)</span>';
     $table_interface->head_colspan = [];
     $table_interface->head_colspan[0] = 8;
@@ -610,11 +610,11 @@ if (!empty($network_interfaces)) {
                     var arrow = $("#agent_interface_info").find("thead").find("img");
                     if (arrow.hasClass("closed")) {
                         arrow.removeClass("closed");
-                        arrow.prop("src", "images/arrow-down-white.png");
+                        arrow.prop("src", "images/down.png");
                         $("#agent_interface_info").find("tbody").show();
                     } else {
                         arrow.addClass("closed");
-                        arrow.prop("src", "images/graphmenu_arrow.png");
+                        arrow.prop("src", "images/go.png");
                         $("#agent_interface_info").find("tbody").hide();
                     }
                 })
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 9a51210216..38f6b059d3 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1284,6 +1284,7 @@ if (!empty($result)) {
                 }
 
                 if ($show_edit_icon) {
+                    $table->cellclass[][2] = 'action_buttons';
                     $data[2] .= '<a href="'.$url_edit_module.'">'.html_print_image(
                         'images/config.png',
                         true,

From 3da2f267a22e32f1bb52d6a54ce167b86c3aa661 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 5 Apr 2019 13:51:35 +0200
Subject: [PATCH 09/32] New design for the tables - #3707

Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
---
 pandora_console/general/header.php         |  2 +-
 pandora_console/include/functions_ui.php   |  2 +-
 pandora_console/include/styles/pandora.css | 67 +++++++---------------
 3 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/pandora_console/general/header.php b/pandora_console/general/header.php
index d3bf94ddc1..3117ddb490 100644
--- a/pandora_console/general/header.php
+++ b/pandora_console/general/header.php
@@ -284,7 +284,7 @@ if ($config['menu_type'] == 'classic') {
         $header_support .= '</a></div>';
 
         // Documentation.
-        $header_docu = '<div id="header_support">';
+        $header_docu = '<div id="header_docu">';
         $header_docu .= '<a href="https://wiki.pandorafms.com/index.php?title=Main_Page" target="_blank">';
         $header_docu .= html_print_image('/images/header_docu.png', true, ['title' => __('Go to documentation'), 'class' => 'bot', 'alt' => 'user']);
         $header_docu .= '</a></div>';
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 34104a2592..d6e017a9c0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4437,7 +4437,7 @@ function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown)
     $arrow_up = 'images/sort_up_black.png';
     $arrow_down = 'images/sort_down_black.png';
 
-    // en el hover usar flechas verdes en el nodo
+    // Green arrows for the selected.
     if ($selectUp === true) {
         $arrow_up = 'images/sort_up_green.png';
     }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 940b22f237..e64e94329c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2108,7 +2108,7 @@ a.autorefresh_txt,
   font-size: 8.5pt;
 }
 
-@media screen and (min-width: 1024px) and (max-width: 1200px) {
+@media screen and (max-width: 1200px) {
   #header_searchbar input.search_input {
     width: 135px;
   }
@@ -2168,10 +2168,6 @@ div#logo_text3 {
 	margin-left: 4px;
 	padding-top: 0px;
 }*/
-.pagination {
-  margin-top: 15px;
-  margin-bottom: 5px;
-}
 .pagination * {
   margin-left: 0px !important;
   margin-right: 0px !important;
@@ -5037,25 +5033,14 @@ table.info_table tbody > tr:nth-child(even) {
 }
 
 table.info_table tr:first-child > th {
-  /*background-color: #373737;*/
-  /*color: #fff;*/
-  /*font-size: 9pt;*/
   background-color: #fff;
   border-top: 1px solid #e2e2e2;
   color: #000;
   text-align: left;
   vertical-align: middle;
-
-  /*background-color: pink;*/
-}
-
-table.info_table tr:first-child > th span {
-  /*font-size: 9pt;*/
 }
 
 table.info_table th {
-  /*color: #fff;*/
-  /*background-color: #666;*/
   font-size: 7.5pt;
   letter-spacing: 0.3pt;
   color: #000;
@@ -5075,21 +5060,16 @@ table.info_table tr th {
 }
 
 table.info_table > thead > tr:first-child > th:last-child {
-  /*border-right: 1px solid #373737;*/
-  /*border-right: 1px solid #e2e2e2;*/
   border-top-right-radius: 4px;
 }
 
 table.info_table > thead > tr:first-child > th:first-child {
-  /*border-left: 1px solid #373737;*/
-  /* border-left: 1px solid #e2e2e2;*/
   border-top-left-radius: 4px;
 }
 
 table.info_table > thead > tr > th,
 table.info_table > tbody > tr > th,
 table.info_table > thead > tr > th a {
-  /*padding: 9px 7px;*/
   padding-left: 9px;
   padding-right: 9px;
   padding-top: 9px;
@@ -5104,7 +5084,6 @@ table.info_table > tbody > tr > td {
   -webkit-border-radius: 0px;
   border-radius: 0px;
   border: none;
-  /*padding: 9px 7px;*/
   padding-left: 9px;
   padding-right: 9px;
   padding-top: 7px;
@@ -5142,23 +5121,11 @@ table.info_table > tbody > tr:hover {
   background-color: #eee;
 }
 
-table.info_table td:last-child img {
-  border: 1px solid red;
-  background-color: pink;
-  background-color: #ffedf0;
-}
-
 .info_table.profile_list > thead > tr > th > a.tip {
   padding: 0px;
 }
 
-/* no confundir con action-buttons */
-/* esta se pa los botones de las tablas de delete etc*/
-/*para cuando solo hay un boton y puede haber iconos que no son botones al lado*/
-.action_button_img {
-  cursor: pointer;
-}
-
+/* This class is for the icons of actions and operations in the tables. */
 .action_buttons a[href] img,
 .action_buttons input[type="image"],
 .action_button_img {
@@ -5170,6 +5137,11 @@ table.info_table td:last-child img {
   background-color: transparent !important; /*BORRAR*/
 }
 
+/* This class is for only one icon to be a button type. */
+.action_button_img {
+  cursor: pointer;
+}
+
 .action_buttons a,
 .action_buttons input[type="image"] {
   margin-right: 5px;
@@ -5190,12 +5162,26 @@ table.info_table td:last-child img {
   background-color: #fff !important;
 }
 
-/* PAGINACION */
+/* Arrows to sort the tables. */
+.sort_arrow {
+  display: inline-grid;
+  vertical-align: middle;
+}
+.sort_arrow a {
+  padding: 0 0 0 5px !important;
+}
+
+/*
+ * ---------------------------------------------------------------------
+ * - PAGINATION
+ * ---------------------------------------------------------------------
+ */
 .pagination {
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
   margin-bottom: 10px;
+  margin-top: 15px;
 }
 
 .pagination .page_number {
@@ -5259,12 +5245,3 @@ table.info_table td:last-child img {
   margin-top: 0px;
   align-items: flex-start;
 }
-
-/* FELCHAS ORDENACION */
-.sort_arrow {
-  display: inline-grid;
-  vertical-align: middle;
-}
-.sort_arrow a {
-  padding: 0 0 0 5px !important;
-}

From 41ea1a4c6606ca9b1efd1c00cb938ae1416a3e51 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Mon, 8 Apr 2019 11:31:27 +0200
Subject: [PATCH 10/32] Fixed minor visual bug - #3707

Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
---
 pandora_console/godmode/alerts/alert_templates.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index f346673f46..4542169cf3 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -350,7 +350,7 @@ $table->head[4] = __('Op.');
 $table->style = [];
 $table->style[0] = 'font-weight: bold';
 $table->size = [];
-$table->size[4] = '60px';
+$table->size[4] = '85px';
 $table->align = [];
 $table->align[1] = 'left';
 $table->align[4] = 'left';

From 2a37224653b5371003bafafba3a21e3749362c65 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 10 Apr 2019 10:06:27 +0200
Subject: [PATCH 11/32] New design for the tables - #3707

Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
---
 .../extensions/files_repo/files_repo_list.php |   7 +-
 .../godmode/snmpconsole/snmp_filters.php      |   5 +-
 .../include/functions_filemanager.php         | 230 +++++++++---------
 pandora_console/include/styles/menu.css       |   5 -
 pandora_console/include/styles/pandora.css    | 186 +++++++++++++-
 pandora_console/index.php                     |   5 +
 .../agentes/estado_generalagente.php          |  14 +-
 .../operation/agentes/status_monitor.php      |  99 ++++----
 8 files changed, 368 insertions(+), 183 deletions(-)

diff --git a/pandora_console/extensions/files_repo/files_repo_list.php b/pandora_console/extensions/files_repo/files_repo_list.php
index 1d01cd1418..80de4563ae 100644
--- a/pandora_console/extensions/files_repo/files_repo_list.php
+++ b/pandora_console/extensions/files_repo/files_repo_list.php
@@ -45,11 +45,9 @@ if (!empty($files)) {
 
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->style = [];
     $table->style[1] = 'max-width: 200px;';
-    $table->style[2] = 'text-align: center;';
-    $table->style[3] = 'text-align: center;';
     $table->style[4] = 'text-align: center;';
     $table->head = [];
     $table->head[0] = __('Name');
@@ -81,6 +79,7 @@ if (!empty($files)) {
         // Last modification
         // Public URL
         $data[4] = '';
+        $table->cellclass[][4] = 'action_buttons';
         if (!empty($file['hash'])) {
             $public_url = ui_get_full_url(EXTENSIONS_DIR.'/files_repo/files_repo_get_file.php?file='.$file['hash']);
             $message = __('Copy to clipboard').': Ctrl+C -> Enter';
@@ -92,7 +91,7 @@ if (!empty($files)) {
         }
 
         $data[4] .= "<a href=\"$url\" target=\"_blank\">";
-        $data[4] .= html_print_image('images/download.png', true, ['title' => __('Download')]);
+        $data[4] .= html_print_image('images/download.png', true, ['title' => __('Download'), 'style' => 'padding:3px' ]);
         // Download image
         $data[4] .= '</a>';
 
diff --git a/pandora_console/godmode/snmpconsole/snmp_filters.php b/pandora_console/godmode/snmpconsole/snmp_filters.php
index b87fb4c3dd..0d8e1e9480 100644
--- a/pandora_console/godmode/snmpconsole/snmp_filters.php
+++ b/pandora_console/godmode/snmpconsole/snmp_filters.php
@@ -226,13 +226,13 @@ if ($edit_filter > -2) {
     $table->cellpadding = 4;
     $table->cellspacing = 4;
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->align = [];
 
     $table->head[0] = __('Description');
     $table->head[1] = __('Filter');
     $table->head[2] = __('Action');
-    $table->size[2] = '50px';
+    $table->size[2] = '65px';
     $table->align[2] = 'center';
 
     foreach ($aglomerate_result as $ind => $row) {
@@ -263,6 +263,7 @@ if ($edit_filter > -2) {
             $data[0] = $compose_id;
             $data[1] = implode(' AND ', $compose_filter);
             $data[2] = $compose_action;
+            $table->cellclass[][2] = 'action_buttons';
             array_push($table->data, $data);
         }
     }
diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php
index 0cf2991630..12a890f4d8 100644
--- a/pandora_console/include/functions_filemanager.php
+++ b/pandora_console/include/functions_filemanager.php
@@ -513,34 +513,81 @@ function filemanager_file_explorer(
     ?>
     <script type="text/javascript">
         function show_form_create_folder() {
-            show_main_buttons_folder()
-            $("#table_filemanager-1").css('display', '');
-            
-            $("#main_buttons").css("display", "none");
-            $("#create_folder").css("display", "");
-        }
-        
-        function show_upload_file() {
-            show_main_buttons_folder()
-            $("#table_filemanager-1").css('display', '');
-            
-            $("#main_buttons").css("display", "none");
-            $("#upload_file").css("display", "");
-        }
-    
+            actions_dialog('create_folder');
+            $("#create_folder").css("display", "block");
+            check_opened_dialog('create_folder');
+        }      
+
         function show_create_text_file() {
-            show_main_buttons_folder()
-            $("#table_filemanager-1").css('display', '');
-        
-            $("#main_buttons").css("display", "none");
-            $("#create_text_file").css("display", "");
+            actions_dialog('create_text_file');
+            $("#create_text_file").css("display", "block");
+            check_opened_dialog('create_text_file');
         }
-    
-        function show_main_buttons_folder() {
-            $("#table_filemanager-1").css('display', 'none');
-            $("#create_folder").css("display", "none");
-            $("#upload_file").css("display", "none");
-            $("#create_text_file").css("display", "none");
+
+        function show_upload_file() {
+            actions_dialog('upload_file');
+            $("#upload_file").css("display", "block");
+            check_opened_dialog('upload_file');
+        }   
+
+        function check_opened_dialog(check_opened){
+            if(check_opened !== 'create_folder'){
+                if (($("#create_folder").hasClass("ui-dialog-content") && $('#create_folder').dialog('isOpen') === true)) {
+                    $('#create_folder').dialog('close');
+                }
+            }
+
+            if(check_opened !== 'create_text_file'){
+                if (($("#create_text_file").hasClass("ui-dialog-content") && $('#create_text_file').dialog('isOpen') === true)) {
+                    $('#create_text_file').dialog('close');
+                }
+            }
+            if(check_opened !== 'upload_file'){
+                if (($("#upload_file").hasClass("ui-dialog-content") && $('#upload_file').dialog('isOpen')) === true) {
+                    $('#upload_file').dialog('close');
+                }
+            }
+        }
+
+        function actions_dialog(action){
+            $('.'+action).addClass('file_table_modal_active');
+            var title_action ='';
+            switch (action) {
+                case 'create_folder':
+                title_action = "<?php echo __('Create a Directory'); ?>";
+                    break;
+
+                case 'create_text_file':
+                title_action = "<?php echo __('Create a Text'); ?>";
+                    break;
+
+                case 'upload_file':
+                title_action = "<?php echo __('Upload Files'); ?>";
+                    break;
+                                    
+                default:
+                    break;
+            }
+         
+            $('#'+action)
+            .dialog({
+                title: title_action,
+                resizable: true,
+                draggable: true,
+                modal: true,
+                overlay: {
+                    opacity: 0.5,
+                    background: "black"
+                },
+                width: 500,
+                minWidth: 500,
+                minHeight: 210,
+                maxWidth: 800,
+                maxHeight: 300,
+                close: function () {
+                    $('.'+action).removeClass('file_table_modal_active');
+                }
+            }).show();
         }
     </script>
     <?php
@@ -556,7 +603,7 @@ function filemanager_file_explorer(
     $table->width = '100%';
     $table->id = 'table_filemanager';
     if (!defined('METACONSOLE')) {
-        $table->class = 'databox data';
+        $table->class = 'info_table';
         $table->title = '<span>'.__('Index of %s', $relative_directory).'</span>';
     }
 
@@ -582,13 +629,6 @@ function filemanager_file_explorer(
     $table->head[2] = __('Last modification');
     $table->head[3] = __('Size');
     $table->head[4] = __('Actions');
-    if (!defined('METACONSOLE')) {
-        $table->headstyle[0] = 'background-color:#82B92E';
-        $table->headstyle[1] = 'background-color:#82B92E';
-        $table->headstyle[2] = 'background-color:#82B92E';
-        $table->headstyle[3] = 'background-color:#82B92E';
-        $table->headstyle[4] = 'background-color:#82B92E';
-    }
 
     $prev_dir = explode('/', $relative_directory);
     $prev_dir_str = '';
@@ -608,85 +648,6 @@ function filemanager_file_explorer(
         $table->colspan[0][1] = 5;
     }
 
-    if (is_writable($real_directory)) {
-        $table->rowstyle[1] = 'display: none;';
-        $table->data[1][0] = '';
-        $table->data[1][1] = '';
-
-        $table->data[1][1] .= '<div id="create_folder" style="display: none;">';
-        $table->data[1][1] .= '<form method="post" action="'.$url.'">';
-        $table->data[1][1] .= html_print_input_text('dirname', '', '', 30, 255, true);
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"', true);
-
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_button(
-            __('Close'),
-            'close',
-            false,
-            'show_main_buttons_folder();',
-            "class='sub cancel'",
-            true
-        );
-
-        $table->data[1][1] .= html_print_input_hidden('directory', $relative_directory, true);
-        $table->data[1][1] .= html_print_input_hidden('create_dir', 1, true);
-        $table->data[1][1] .= html_print_input_hidden('hash', md5($relative_directory.$config['dbpass']), true);
-        $table->data[1][1] .= html_print_input_hidden('hash2', md5($relative_directory.$config['dbpass']), true);
-        $table->data[1][1] .= '</form>';
-        $table->data[1][1] .= '</div>';
-
-        $table->data[1][1] .= '<div id="upload_file" style="display: none;">';
-
-        $table->data[1][1] .= '<form method="post" action="'.$url.'" enctype="multipart/form-data">';
-        $table->data[1][1] .= ui_print_help_tip(__('The zip upload in this dir, easy to upload multiple files.'), true);
-        $table->data[1][1] .= html_print_input_file('file', true, false);
-        $table->data[1][1] .= html_print_input_hidden('umask', $umask, true);
-        $table->data[1][1] .= html_print_checkbox('decompress', 1, false, true);
-        $table->data[1][1] .= __('Decompress');
-        $table->data[1][1] .= '&nbsp;&nbsp;&nbsp;';
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_submit_button(__('Go'), 'go', false, 'class="sub next"', true);
-
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_button(
-            __('Close'),
-            'close',
-            false,
-            'show_main_buttons_folder();',
-            "class='sub cancel'",
-            true
-        );
-
-        $table->data[1][1] .= html_print_input_hidden('real_directory', $real_directory, true);
-        $table->data[1][1] .= html_print_input_hidden('directory', $relative_directory, true);
-        $table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['dbpass']), true);
-        $table->data[1][1] .= html_print_input_hidden('hash2', md5($relative_directory.$config['dbpass']), true);
-        $table->data[1][1] .= html_print_input_hidden('upload_file_or_zip', 1, true);
-        $table->data[1][1] .= '</form>';
-        $table->data[1][1] .= '</div>';
-
-        $table->data[1][1] .= '<div id="create_text_file" style="display: none;">';
-        $table->data[1][1] .= '<form method="post" action="'.$url.'">';
-        $table->data[1][1] .= html_print_input_text('name_file', '', '', 30, 50, true);
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_submit_button(__('Create'), 'create', false, 'class="sub next"', true);
-
-        $table->data[1][1] .= '&nbsp;&nbsp;'.html_print_button(
-            __('Close'),
-            'close',
-            false,
-            'show_main_buttons_folder();',
-            "class='sub cancel'",
-            true
-        );
-
-        $table->data[1][1] .= html_print_input_hidden('real_directory', $real_directory, true);
-        $table->data[1][1] .= html_print_input_hidden('directory', $relative_directory, true);
-        $table->data[1][1] .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['dbpass']), true);
-        $table->data[1][1] .= html_print_input_hidden('umask', $umask, true);
-        $table->data[1][1] .= html_print_input_hidden('create_text_file', 1, true);
-        $table->data[1][1] .= '</form>';
-        $table->data[1][1] .= '</div>';
-
-        $table->colspan[1][1] = 5;
-    }
-
     foreach ($files as $fileinfo) {
         $fileinfo['realpath'] = str_replace('\\', '/', $fileinfo['realpath']);
         $relative_path = str_replace($_SERVER['DOCUMENT_ROOT'], '', $fileinfo['realpath']);
@@ -815,10 +776,45 @@ function filemanager_file_explorer(
             if (defined('METACONSOLE')) {
                 echo "<div style='text-align: left; width: ".$table->width.";'>";
             } else {
-                echo "<div style='text-align: right; width: ".$table->width."; margin-bottom:5px;'>";
+                $tabs_dialog = '<ul id="file_table_modal">
+                <li class="create_folder">
+                    <a href="javascript: show_form_create_folder();">'.html_print_image(
+                    'images/create_directory.png',
+                    true,
+                    ['title' => __('Create directory')]
+                ).'<span>'.__('Create a Directory').'</span>
+                    </a>
+                </li>
+                <li class="create_text_file">
+                    <a href="javascript: show_create_text_file();">'.html_print_image(
+                    'images/create_file.png',
+                    true,
+                    ['title' => __('Create a Text')]
+                ).'<span>'.__('Create a Text').'</span>
+                    </a>
+                </li>
+                <li class="upload_file">
+                    <a href="javascript: show_upload_file();">'.html_print_image(
+                    'images/upload_file.png',
+                    true,
+                    ['title' => __('Upload Files')]
+                ).'<span>'.__('Upload Files').'</span>
+                    </a>
+                </li></ul>';
+
+                echo '<div id="create_folder" style="display: none;">'.$tabs_dialog.'
+                <form method="post" action="'.$url.'">'.html_print_input_text('dirname', '', '', 30, 255, true).html_print_submit_button(__('Create'), 'crt', false, 'class="sub next"', true).html_print_input_hidden('directory', $relative_directory, true).html_print_input_hidden('create_dir', 1, true).html_print_input_hidden('hash', md5($relative_directory.$config['dbpass']), true).html_print_input_hidden('hash2', md5($relative_directory.$config['dbpass']), true).'</form></div>';
+
+                echo '<div id="upload_file" style="display: none;"> '.$tabs_dialog.'
+                <form method="post" action="'.$url.'" enctype="multipart/form-data">'.ui_print_help_tip(__('The zip upload in this dir, easy to upload multiple files.'), true).html_print_input_file('file', true, false).html_print_input_hidden('umask', $umask, true).html_print_checkbox('decompress', 1, false, true).__('Decompress').html_print_submit_button(__('Go'), 'go', false, 'class="sub next"', true).html_print_input_hidden('real_directory', $real_directory, true).html_print_input_hidden('directory', $relative_directory, true).html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['dbpass']), true).html_print_input_hidden('hash2', md5($relative_directory.$config['dbpass']), true).html_print_input_hidden('upload_file_or_zip', 1, true).'</form></div>';
+
+                echo ' <div id="create_text_file" style="display: none;">'.$tabs_dialog.'
+                <form method="post" action="'.$url.'">'.html_print_input_text('name_file', '', '', 30, 50, true).html_print_submit_button(__('Create'), 'create', false, 'class="sub next"', true).html_print_input_hidden('real_directory', $real_directory, true).html_print_input_hidden('directory', $relative_directory, true).html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['dbpass']), true).html_print_input_hidden('umask', $umask, true).html_print_input_hidden('create_text_file', 1, true).'</form></div>';
+
+                echo "<div style='width: ".$table->width.";' class='file_table_buttons'>";
             }
 
-            echo "<a href='javascript: show_form_create_folder();' style='margin-right: 3px; margin-bottom: 5px;'>";
+            echo "<a href='javascript: show_form_create_folder();'>";
             echo html_print_image(
                 'images/create_directory.png',
                 true,
@@ -826,7 +822,7 @@ function filemanager_file_explorer(
             );
             echo '</a>';
 
-            echo "<a href='javascript: show_create_text_file();' style='margin-right: 3px; margin-bottom: 5px;'>";
+            echo "<a href='javascript: show_create_text_file();'>";
             echo html_print_image(
                 'images/create_file.png',
                 true,
@@ -844,7 +840,7 @@ function filemanager_file_explorer(
 
             echo '</div>';
         } else {
-            echo "<div style='text-align: right; width: ".$table->width."; color:#AC4444;'>";
+            echo "<div style='text-align: right; width: ".$table->width."; color:#AC4444; margin-bottom:10px;'>";
             echo "<image src='images/info.png' />".__('The directory is read-only');
             echo '</div>';
         }
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index dcb9db06cb..7846a3f9a6 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -260,11 +260,6 @@ ul li {
 }
 /* End */
 
-ul li a:hover {
-  color: #e2144a;
-} /* Hover Styles */
-/*li ul li a { padding: 2px 5px; }  Sub Menu Styles */
-
 /*
  * ---------------------------------------------------------------------
  * - MAIN LEFT MENU and SUBMENU 									-
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e64e94329c..48a66017ed 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1014,7 +1014,6 @@ div#cont {
 }
 
 td.datos3,
-/*td.datos3 **/
 td.datos4 {
   background-color: #fff;
   color: #000 !important;
@@ -1026,12 +1025,9 @@ td.datos4 {
   font-weight: normal;
 }
 
-td.datos4 /*,
-td.datos4 */ {
+td.datos4 {
   /*Add !important because in php the function html_print_table write style in cell and this is style head.*/
   text-align: center !important;
-  /* background-color: #666;
-  color: white !important;*/
 }
 
 td.datos3 *,
@@ -5162,6 +5158,186 @@ table.info_table > tbody > tr:hover {
   background-color: #fff !important;
 }
 
+/* Tables to upload files */
+#table_filemanager tr:first-child th span {
+  font-weight: bold;
+}
+
+.file_table_buttons {
+  text-align: right;
+  margin-bottom: 10px;
+}
+
+.file_table_buttons a img {
+  border: 1px solid #e2e2e2;
+  padding: 5px;
+  border-radius: 4px;
+  margin-right: 10px;
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+#file_table_modal {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 40px;
+}
+
+#file_table_modal .create_folder,
+#file_table_modal .create_text_file,
+#file_table_modal .upload_file {
+  width: 33%;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  margin-right: 2px;
+  background-color: #e6e6e6;
+}
+
+.file_table_buttons a:last-child img,
+#file_table_modal .upload_file {
+  margin-right: 0px !important;
+}
+
+#file_table_modal li a {
+  display: block;
+  padding: 5px;
+}
+
+#file_table_modal li img,
+#file_table_modal li span {
+  vertical-align: middle;
+}
+
+#file_table_modal li img {
+  margin-right: 10px;
+}
+
+#create_folder,
+#create_text_file,
+#upload_file {
+  margin-bottom: 30px;
+}
+
+#create_folder input#text-dirname,
+#create_text_file input#text-name_file {
+  width: 100%;
+  margin-right: 5px;
+  box-sizing: border-box;
+  margin-bottom: 10px;
+}
+
+#upload_file input#file-file {
+  width: 70%;
+}
+
+#create_folder input#submit-crt,
+#create_text_file input#submit-create,
+#upload_file input#submit-go {
+  float: right;
+}
+
+#upload_file input#submit-go {
+  margin-top: 10px;
+}
+
+.file_table_modal_active {
+  background-color: #fff !important;
+  border: 1px solid #e6e6e6;
+  border-bottom: none;
+}
+
+/* Inventory table */
+.inventory_table_buttons {
+  text-align: right;
+  margin-bottom: 10px;
+}
+
+.inventory_table_buttons a {
+  font-weight: bolder;
+  display: inline-block;
+  border: 1px solid #e2e2e2;
+  padding: 8px;
+  border-radius: 4px;
+  box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.1);
+}
+
+.inventory_table_buttons a img,
+.inventory_table_buttons a span {
+  vertical-align: middle;
+}
+
+.inventory_table_buttons a img {
+  padding-left: 10px;
+}
+
+.inventory_tables thead th span:first-child {
+  float: left;
+  font-weight: bold;
+}
+
+.inventory_tables thead th span {
+  font-size: 8.6pt;
+}
+
+.inventory_tables tbody > tr:first-child {
+  font-weight: bold;
+}
+
+/* Tag view */
+table.info_table.agent_info_table {
+  margin-bottom: 20px;
+}
+table.agent_info_table tr {
+  background-color: #fff !important;
+}
+
+table.agent_info_table > tbody > tr > td {
+  border-bottom: none;
+}
+
+table.agent_info_table > tbody > tr:last-child > td {
+  border-bottom: 1px solid #e2e2e2;
+}
+
+table.agent_info_table thead > tr:first-child th {
+  background-color: #f5f5f5;
+}
+
+table.agent_info_table thead > tr:first-child th span,
+table.agent_info_table thead > tr:first-child th {
+  font-weight: bold;
+  font-size: 8.6pt;
+}
+
+table.info_table.agent_info_table td {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+table.info_table.agent_info_table table#agent_table {
+  padding-top: 15px;
+}
+
+table.info_table.agent_info_table table#module_table {
+  padding-top: 10px;
+  padding-bottom: 15px;
+}
+
+table.info_table.agent_info_table table.info_table {
+  margin-bottom: 0;
+}
+
+.agent_info_table_opened {
+  background-color: #82b92e !important;
+  color: #fff !important;
+  border-color: #82b92e !important;
+}
+
+.agent_info_table_closed {
+  background-color: #fff !important;
+  color: #000 !important;
+  border-radius: 4px;
+}
+
 /* Arrows to sort the tables. */
 .sort_arrow {
   display: inline-grid;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 78f4c76571..7fb469f2da 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1254,6 +1254,11 @@ require 'include/php_to_js_values.php';
 
 <script type="text/javascript" language="javascript">
 
+    // When there are less than 5 rows, all rows must be white
+    if($('table.info_table tbody > tr').length <= 5){
+        $('table.info_table tbody > tr').css('background-color', '#fff');
+    }
+
     // When the user scrolls down 400px from the top of the document, show the button.
     window.onscroll = function() {scrollFunction()};
 
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 6353aab5a9..30705e7267 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -211,7 +211,7 @@ $table_contact->id = 'agent_contact_main';
 $table_contact->width = '100%';
 $table_contact->cellspacing = 0;
 $table_contact->cellpadding = 0;
-$table_contact->class = 'info_table';
+$table_contact->class = 'databox data';
 $table_contact->style[0] = 'width: 30%;height:30px;';
 $table_contact->style[1] = 'width: 70%;';
 
@@ -254,7 +254,7 @@ $table_data->width = '100%';
 $table_data->styleTable = 'height:180px';
 $table_data->cellspacing = 0;
 $table_data->cellpadding = 0;
-$table_data->class = 'info_table';
+$table_data->class = 'databox data';
 $table_data->style[0] = 'width: 30%;';
 $table_data->style[1] = 'width: 40%;';
 
@@ -416,7 +416,7 @@ if ($last_incident != false) {
     $table_incident->width = '100%';
     $table_incident->cellspacing = 0;
     $table_incident->cellpadding = 0;
-    $table_incident->class = 'info_table';
+    $table_incident->class = 'databox';
     $table_incident->style[0] = 'width: 30%;';
     $table_incident->style[1] = 'width: 70%;';
 
@@ -456,7 +456,7 @@ 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 = 'info_table';
+    $table_interface->class = 'databox data';
     $table_interface->width = '98%';
     $table_interface->style = [];
     $table_interface->style['interface_status'] = 'width: 30px;padding-top:0px;padding-bottom:0px;';
@@ -478,7 +478,7 @@ if (!empty($network_interfaces)) {
         'class' => 'closed',
         'style' => 'vertical-align:righ; cursor:pointer;',
     ];
-    $table_interface->head[0] = html_print_image('images/go.png', true, $options).'&nbsp;&nbsp;';
+    $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_colspan = [];
     $table_interface->head_colspan[0] = 8;
@@ -610,11 +610,11 @@ if (!empty($network_interfaces)) {
                     var arrow = $("#agent_interface_info").find("thead").find("img");
                     if (arrow.hasClass("closed")) {
                         arrow.removeClass("closed");
-                        arrow.prop("src", "images/down.png");
+                        arrow.prop("src", "images/arrow-down-white.png");
                         $("#agent_interface_info").find("tbody").show();
                     } else {
                         arrow.addClass("closed");
-                        arrow.prop("src", "images/go.png");
+                        arrow.prop("src", "images/graphmenu_arrow.png");
                         $("#agent_interface_info").find("tbody").hide();
                     }
                 })
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 38f6b059d3..02a3887f39 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -735,21 +735,23 @@ unset($table);
 // End Build Search Form
 //
 // Sort functionality
-$selected = 'border: 1px solid black;';
-$selectAgentNameUp = '';
-$selectAgentNameDown = '';
-$selectTypeUp = '';
-$selectTypeDown = '';
-$selectModuleNameUp = '';
-$selectModuleNameDown = '';
-$selectIntervalUp = '';
-$selectIntervalDown = '';
-$selectStatusUp = '';
-$selectStatusDown = '';
-$selectDataUp = '';
-$selectDataDown = '';
-$selectTimestampUp = '';
-$selectTimestampDown = '';
+$selected = true;
+$selectAgentNameUp = false;
+$selectAgentNameDown = false;
+$selectDataTypeUp = false;
+$selectDataTypeDown = false;
+$selectTypeUp = false;
+$selectTypeDown = false;
+$selectModuleNameUp = false;
+$selectModuleNameDown = false;
+$selectIntervalUp = false;
+$selectIntervalDown = false;
+$selectStatusUp = false;
+$selectStatusDown = false;
+$selectDataUp = false;
+$selectDataDown = false;
+$selectTimestampUp = false;
+$selectTimestampDown = false;
 $order = null;
 
 switch ($sortField) {
@@ -776,7 +778,7 @@ switch ($sortField) {
     case 'type':
         switch ($sort) {
             case 'up':
-                $selectTypeUp = $selected;
+                $selectDataTypeUp = $selected;
                 $order = [
                     'field' => 'tagente_modulo.id_tipo_modulo',
                     'order' => 'ASC',
@@ -784,7 +786,7 @@ switch ($sortField) {
             break;
 
             case 'down':
-                $selectTypeDown = $selected;
+                $selectDataTypeDown = $selected;
                 $order = [
                     'field' => 'tagente_modulo.id_tipo_modulo',
                     'order' => 'DESC',
@@ -896,7 +898,7 @@ switch ($sortField) {
     case 'data':
         switch ($sort) {
             case 'up':
-                $selectTimestampUp = $selected;
+                $selectDataUp = $selected;
                 $order = [
                     'field' => 'tagente_estado.datos',
                     'order' => 'ASC',
@@ -904,7 +906,7 @@ switch ($sortField) {
             break;
 
             case 'down':
-                $selectTimestampDown = $selected;
+                $selectDataDown = $selected;
                 $order = [
                     'field' => 'tagente_estado.datos',
                     'order' => 'DESC',
@@ -915,19 +917,21 @@ switch ($sortField) {
 
     default:
         $selectAgentNameUp = $selected;
-        $selectAgentNameDown = '';
-        $selectTypeUp = '';
-        $selectTypeDown = '';
-        $selectModuleNameUp = '';
-        $selectModuleNameDown = '';
-        $selectIntervalUp = '';
-        $selectIntervalDown = '';
-        $selectStatusUp = '';
-        $selectStatusDown = '';
-        $selectDataUp = '';
-        $selectDataDown = '';
-        $selectTimestampUp = '';
-        $selectTimestampDown = '';
+        $selectAgentNameDown = false;
+        $selectDataTypeUp = false;
+        $selectDataTypeDown = false;
+        $selectTypeUp = false;
+        $selectTypeDown = false;
+        $selectModuleNameUp = false;
+        $selectModuleNameDown = false;
+        $selectIntervalUp = false;
+        $selectIntervalDown = false;
+        $selectStatusUp = false;
+        $selectStatusDown = false;
+        $selectDataUp = false;
+        $selectDataDown = false;
+        $selectTimestampUp = false;
+        $selectTimestampDown = false;
         $order = [
             'field' => 'tagente.alias',
             'order' => 'ASC',
@@ -1066,8 +1070,19 @@ if (($config['dbtype'] == 'oracle') && ($result !== false)) {
 }
 
 
+// Urls to sort the table.
+$url_agent_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=';
+$url_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=';
+$url_module_name = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=';
+$url_server_type = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=';
+$url_interval = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=';
+$url_status = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=';
+$url_data = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=';
+$url_timestamp_up = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=up';
+$url_timestamp_down = 'index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=down';
+
+
 // Start Build List Result
-//
 if (!empty($result)) {
     $table = new StdClass();
     $table->cellpadding = 0;
@@ -1090,36 +1105,34 @@ if (!empty($result)) {
 
     if (in_array('agent', $show_fields) || is_metaconsole()) {
         $table->head[1] = __('Agent');
-        $table->head[1] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectAgentNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;refr='.$refr.'&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=agent_alias&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectAgentNameDown, 'alt' => 'down']).'</a>';
+        $table->head[1] .= ui_get_sorting_arrows($url_agent_name.'up', $url_agent_name.'down', $selectAgentNameUp, $selectAgentNameDown);
     }
 
     if (in_array('data_type', $show_fields) || is_metaconsole()) {
         $table->head[2] = __('Data Type');
-        $table->head[2] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=type&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).'</a>';
-
+        $table->head[2] .= ui_get_sorting_arrows($url_type.'up', $url_type.'down', $selectDataTypeUp, $selectDataTypeDown);
         $table->align[2] = 'left';
     }
 
     if (in_array('module_name', $show_fields) || is_metaconsole()) {
         $table->head[3] = __('Module name');
-        $table->head[3] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=module_name&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'</a>';
+        $table->head[3] .= ui_get_sorting_arrows($url_module_name.'up', $url_module_name.'down', $selectModuleNameUp, $selectModuleNameDown);
     }
 
     if (in_array('server_type', $show_fields) || is_metaconsole()) {
         $table->head[4] = __('Server type');
-        $table->head[4] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectModuleNameUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=moduletype&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectModuleNameDown, 'alt' => 'down']).'</a>';
+        $table->head[4] .= ui_get_sorting_arrows($url_server_type.'up', $url_server_type.'down', $selectTypeUp, $selectTypeDown);
     }
 
     if (in_array('interval', $show_fields) || is_metaconsole()) {
         $table->head[5] = __('Interval');
-        $table->head[5] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=interval&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).'</a>';
+        $table->head[5] .= ui_get_sorting_arrows($url_interval.'up', $url_interval.'down', $selectIntervalUp, $selectIntervalDown);
         $table->align[5] = 'left';
     }
 
     if (in_array('status', $show_fields) || is_metaconsole()) {
         $table->head[6] = __('Status');
-        $table->head[6] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=status&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'</a>';
-
+        $table->head[6] .= ui_get_sorting_arrows($url_status.'up', $url_status.'down', $selectStatusUp, $selectStatusDown);
         $table->align[6] = 'left';
     }
 
@@ -1137,13 +1150,13 @@ if (!empty($result)) {
         $table->head[9] = __('Data');
         $table->align[9] = 'left';
         if (is_metaconsole()) {
-            $table->head[9] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=data&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).'</a>';
+            $table->head[9] .= ui_get_sorting_arrows($url_data.'up', $url_data.'down', $selectDataUp, $selectDataDown);
         }
     }
 
     if (in_array('timestamp', $show_fields) || is_metaconsole()) {
         $table->head[10] = __('Timestamp');
-        $table->head[10] .= ' <a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=up">'.html_print_image('images/sort_up.png', true, ['style' => $selectTimestampUp, 'alt' => 'up']).'</a>'.'<a href="index.php?sec=view&amp;sec2=operation/agentes/status_monitor&amp;datatype='.$datatype.'&amp;moduletype='.$moduletype.'&amp;refr='.$refr.'&amp;modulegroup='.$modulegroup.'&amp;offset='.$offset.'&amp;ag_group='.$ag_group.'&amp;ag_freestring='.$ag_freestring.'&amp;ag_modulename='.$ag_modulename.'&amp;status='.$status.$ag_custom_fields_params.'&amp;sort_field=timestamp&amp;sort=down">'.html_print_image('images/sort_down.png', true, ['style' => $selectTimestampDown, 'alt' => 'down']).'</a>';
+        $table->head[10] .= ui_get_sorting_arrows($url_timestamp_up, $url_timestamp_down, $selectTimestampUp, $selectTimestampDown);
         $table->align[10] = 'left';
     }
 

From 187bdb17013f98188afa8589b8128e795f458f02 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Thu, 11 Apr 2019 09:57:07 +0200
Subject: [PATCH 12/32] New design for the tables - #3707

Former-commit-id: 7781a8b392919f38259aed142f01e786fc82698a
---
 .../reporting/reporting_builder.list_items.php   |  3 +++
 pandora_console/include/styles/pandora.css       | 16 +++++++++++++++-
 pandora_console/index.php                        |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 07d4a083fa..0c5910a677 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -330,6 +330,8 @@ if ($items) {
     if (defined('METACONSOLE')) {
         $table->width = '100%';
         $table->class = 'databox data';
+    } else {
+        $table->class = 'info_table';
     }
 
     $table->size = [];
@@ -493,6 +495,7 @@ foreach ($items as $item) {
     $row[6] = '';
 
     if (check_acl($config['id_user'], $item['id_group'], 'RM')) {
+        $table->cellclass[][6] = 'action_buttons';
         $row[6] .= '<a href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=edit&id_report='.$idReport.'&id_item='.$item['id_rc'].'">'.html_print_image('images/wrench_orange.png', true, ['title' => __('Edit')]).'</a>';
         $row[6] .= '&nbsp;';
         $row[6] .= '<a  onClick="if (!confirm (\'Are you sure?\')) return false;" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=delete&id_report='.$idReport.'&id_item='.$item['id_rc'].$urlFilter.'">'.html_print_image('images/cross.png', true, ['title' => __('Delete')]).'</a>';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 48a66017ed..81976ccd50 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5114,7 +5114,7 @@ table.info_table > tbody > tr > td > form > a > img {
 }
 
 table.info_table > tbody > tr:hover {
-  background-color: #eee;
+  background-color: #eee !important;
 }
 
 .info_table.profile_list > thead > tr > th > a.tip {
@@ -5338,6 +5338,20 @@ table.info_table.agent_info_table table.info_table {
   border-radius: 4px;
 }
 
+/* Tag view */
+table.info_table.policy_table tr {
+  background-color: #fff !important;
+}
+
+table.info_table.policy_sub_table thead > tr:first-child th {
+  background-color: #f5f5f5;
+}
+
+table.info_table.policy_sub_table {
+  padding: 20px 15px;
+  margin-bottom: 0;
+}
+
 /* Arrows to sort the tables. */
 .sort_arrow {
   display: inline-grid;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 7fb469f2da..3c33a1a1e0 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1255,7 +1255,7 @@ require 'include/php_to_js_values.php';
 <script type="text/javascript" language="javascript">
 
     // When there are less than 5 rows, all rows must be white
-    if($('table.info_table tbody > tr').length <= 5){
+    if($('table.info_table tr').length < 5){
         $('table.info_table tbody > tr').css('background-color', '#fff');
     }
 

From c33a2cfaf6f03200c5ac017a2f0cef76c8098c50 Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Thu, 11 Apr 2019 10:26:26 +0200
Subject: [PATCH 13/32] Change arrow images to sort the table in custom reports
 - #3707

Former-commit-id: 62613d1c4e41fff93217ddb111c3b8c7ddc08ff4
---
 .../godmode/reporting/reporting_builder.list_items.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php
index 0c5910a677..9addb32f26 100755
--- a/pandora_console/godmode/reporting/reporting_builder.list_items.php
+++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php
@@ -330,8 +330,12 @@ if ($items) {
     if (defined('METACONSOLE')) {
         $table->width = '100%';
         $table->class = 'databox data';
+        $arrow_up = 'images/sort_up.png';
+        $arrow_down = 'images/sort_down.png';
     } else {
         $table->class = 'info_table';
+        $arrow_up = 'images/sort_up_black.png';
+        $arrow_down = 'images/sort_down_black.png';
     }
 
     $table->size = [];
@@ -344,18 +348,18 @@ if ($items) {
     $table->head[0] = '<span title="'.__('Position').'">'.__('P.').'</span>';
     $table->head[1] = __('Type');
     if (!$filterEnable) {
-        $table->head[1] .= ' <a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=type&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_up.png', true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=type&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_down.png', true, ['title' => __('Descent')]).'</a>';
+        $table->head[1] .= ' <span class="sort_arrow"><a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=type&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_up, true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=type&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_down, true, ['title' => __('Descent')]).'</a></span>';
     }
 
     $table->head[2] = __('Agent');
     if (!$filterEnable) {
-        $table->head[2] .= ' <a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=agent&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_up.png', true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=agent&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_down.png', true, ['title' => __('Descent')]).'</a>';
+        $table->head[2] .= ' <span class="sort_arrow"><a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=agent&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_up, true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=agent&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_down, true, ['title' => __('Descent')]).'</a></span>';
     }
 
     $table->head[3] = __('Module');
 
     if (!$filterEnable) {
-        $table->head[3] .= ' <a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=module&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_up.png', true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=module&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image('images/sort_down.png', true, ['title' => __('Descent')]).'</a>';
+        $table->head[3] .= ' <span class="sort_arrow"><a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=up&field=module&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_up, true, ['title' => __('Ascendent')]).'</a>'.'<a onclick="return message_check_sort_items();" href="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=order&dir=down&field=module&id_report='.$idReport.$urlFilter.'&pure='.$config['pure'].'">'.html_print_image($arrow_down, true, ['title' => __('Descent')]).'</a></span>';
     }
 
     $table->head[4] = __('Time lapse');

From c91893c948824417cdd7824870b575682538fc97 Mon Sep 17 00:00:00 2001
From: Rafael Ameijeiras <rafael.ameijeiras@artica.es>
Date: Thu, 11 Apr 2019 13:45:57 +0200
Subject: [PATCH 14/32] spec console open and build_rpm for rhel7

Former-commit-id: 324d90d95ea5757285e64ba3e28346ef007a815f
---
 extras/build_rpm_rhel7.sh                    | 6 +++---
 pandora_console/pandora_console.rhel7.spec   | 4 ++--
 pandora_server/bin/PandoraFMS                | 0
 pandora_server/util/PandoraFMS               | 0
 pandora_server/util/recon_scripts/PandoraFMS | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 mode change 120000 => 100644 pandora_server/bin/PandoraFMS
 mode change 120000 => 100644 pandora_server/util/PandoraFMS
 mode change 120000 => 100644 pandora_server/util/recon_scripts/PandoraFMS

diff --git a/extras/build_rpm_rhel7.sh b/extras/build_rpm_rhel7.sh
index 6bb65d816d..3684bd42e5 100755
--- a/extras/build_rpm_rhel7.sh
+++ b/extras/build_rpm_rhel7.sh
@@ -11,16 +11,16 @@ echo "Creating RPM packages in $RPMHOME/RPMS"
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.rhel7.spec || exit 1
 
 # Server
-rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1
+#rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1
 
 # Unix agent
-rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.rhel7.spec || exit 1
+#rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.rhel7.spec || exit 1
 
 # Enterprise console
 rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec || exit 1
 
 # Enterprise server
-rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.rhel7.spec || exit 1
+#rpmbuild -ba $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.rhel7.spec || exit 1
 
 exit 0
 
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index f4ff7c349d..29b446ae07 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -21,11 +21,11 @@ Source0:            %{name}-%{version}.tar.gz
 URL:                http://www.pandorafms.com
 Group:              Productivity/Networking/Web/Utilities
 Packager:           Sancho Lerena <slerena@artica.es>
-Prefix:              /var/www/html
+Prefix:             /opt/rh/httpd24/root/var/www/html/
 BuildRoot:          %{_tmppath}/%{name}
 BuildArch:          noarch
 AutoReq:            0
-Requires:           %{httpd_name} >= 2.0.0
+Requires:           httpd24-httpd
 Requires:           httpd24-mod_php >= 7.2
 Requires:           rh-php72-php-gd, rh-php72-php-ldap, rh-php72-php-snmp, rh-php72-php-session, rh-php72-php-gettext
 Requires:           rh-php72-php-mysqlnd, rh-php72-php-mbstring, rh-php72-php-zip, rh-php72-php-zlib, rh-php72-php-curl
diff --git a/pandora_server/bin/PandoraFMS b/pandora_server/bin/PandoraFMS
deleted file mode 120000
index 404b77b915..0000000000
--- a/pandora_server/bin/PandoraFMS
+++ /dev/null
@@ -1 +0,0 @@
-../lib/PandoraFMS
\ No newline at end of file
diff --git a/pandora_server/bin/PandoraFMS b/pandora_server/bin/PandoraFMS
new file mode 100644
index 0000000000..404b77b915
--- /dev/null
+++ b/pandora_server/bin/PandoraFMS
@@ -0,0 +1 @@
+../lib/PandoraFMS
\ No newline at end of file
diff --git a/pandora_server/util/PandoraFMS b/pandora_server/util/PandoraFMS
deleted file mode 120000
index fde1b9ac41..0000000000
--- a/pandora_server/util/PandoraFMS
+++ /dev/null
@@ -1 +0,0 @@
-../bin/PandoraFMS/
\ No newline at end of file
diff --git a/pandora_server/util/PandoraFMS b/pandora_server/util/PandoraFMS
new file mode 100644
index 0000000000..fde1b9ac41
--- /dev/null
+++ b/pandora_server/util/PandoraFMS
@@ -0,0 +1 @@
+../bin/PandoraFMS/
\ No newline at end of file
diff --git a/pandora_server/util/recon_scripts/PandoraFMS b/pandora_server/util/recon_scripts/PandoraFMS
deleted file mode 120000
index d77e8a956e..0000000000
--- a/pandora_server/util/recon_scripts/PandoraFMS
+++ /dev/null
@@ -1 +0,0 @@
-../../bin/PandoraFMS/
\ No newline at end of file
diff --git a/pandora_server/util/recon_scripts/PandoraFMS b/pandora_server/util/recon_scripts/PandoraFMS
new file mode 100644
index 0000000000..d77e8a956e
--- /dev/null
+++ b/pandora_server/util/recon_scripts/PandoraFMS
@@ -0,0 +1 @@
+../../bin/PandoraFMS/
\ No newline at end of file

From b50ed1c8102801ae11b7de7ed6dd07f2b1507ddb Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 12 Apr 2019 10:41:55 +0200
Subject: [PATCH 15/32] New arrow and timestamp images - #3707

Former-commit-id: 908928e47d7e635eee1e18925b176835f8e9c928
---
 pandora_console/images/arrow_down_green.png | Bin 0 -> 252 bytes
 pandora_console/images/arrow_down_white.png | Bin 0 -> 193 bytes
 pandora_console/images/arrow_up_green.png   | Bin 0 -> 230 bytes
 pandora_console/images/arrow_up_white.png   | Bin 0 -> 195 bytes
 pandora_console/images/timestamp.png        | Bin 0 -> 396 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pandora_console/images/arrow_down_green.png
 create mode 100644 pandora_console/images/arrow_down_white.png
 create mode 100644 pandora_console/images/arrow_up_green.png
 create mode 100644 pandora_console/images/arrow_up_white.png
 create mode 100644 pandora_console/images/timestamp.png

diff --git a/pandora_console/images/arrow_down_green.png b/pandora_console/images/arrow_down_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..edc1cff1b82c92c0a7292915e402d39eadd09274
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv@!3HGlXG}j1q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c70vT>aSW-rm6RZ1xu9_QIwp?EE3Y$jusY<Ztx){#C~?A1
z;o^dy4zFwk-m^=y9bxkL^tsbiAWOhU_eQwS*LTzP8D6>s@wgbjU>2}$lIZc^a+vga
z;ujSr-6)41#{hOk9_3>WHEf9zZRZ`F*b+^7+8fy$ZZOVwwBS9Qs1VouL8|Sj!ydLq
x24lO!d^(k-2MxpiD4OWHJu=Q<VQgSvW?*rQ5S{z#Tq)3{44$rjF6*2UngHsIQ$YX#

literal 0
HcmV?d00001

diff --git a/pandora_console/images/arrow_down_white.png b/pandora_console/images/arrow_down_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b28df71f915cb0c7e1c12ab7589a2f55d5e79d5
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv@!3HGlXG}j1q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6(xJRIEGZ*N=lHheDMGOe=Y@|WpT_3Vh&~;Y(gF;8FnG}
zD^n)_pPZ#I$x-2hT%=N?2=hf=CQFW3#y~b9la2`HPP2{)jVjVD#}E8Xk!(5c@QLS8
nqQXzMg_1kwCpEY6GjJF%Sg4r&Igr5uvW~&i)z4*}Q$iB}=+ZoL

literal 0
HcmV?d00001

diff --git a/pandora_console/images/arrow_up_green.png b/pandora_console/images/arrow_up_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..c197c2333cc955686fd0950f9b66545b7b6382a8
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv@!3HGlXG}j1q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6?J&JIEGZ*N=lGmRk*MtIGmwFwj=Pg%LxUAt@166Z+^D$
zB&!@!U{-m^`t{v(VNWBTc1IT86s1E8xE<bb9Fbq}hb1O1P3f4z0&hNnWCdkGwpxdv
zWQI`XhO?)8j!3!mH1;f!a5>?iwnEWGnuW=svd4qbox!9)+`-VXd4mMUrFe@bF4hJH
aW`^vqq5a80PTPQPV(@hJb6Mw<&;$VgWJrMk

literal 0
HcmV?d00001

diff --git a/pandora_console/images/arrow_up_white.png b/pandora_console/images/arrow_up_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fbd55b69a3b9a123211cc9c6b00b951005496f0
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv@!3HGlXG}j1q$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6{UK*IEGZ*N=lGmRrv7#e?6l@*@9_~&;L6gsL7K2GCzm8
zP{L(bV+0S=M%jiRww`Q{3_KXL(jB%m{@`&6a=zh^#G`b|A&5sQL&2n=(~M(!;|Zb9
q3nLnisIV9n*b9jFEO25}IKbd8@5UOa^J5{<LIzJ)KbLh*2~7ZD#Xl1O

literal 0
HcmV?d00001

diff --git a/pandora_console/images/timestamp.png b/pandora_console/images/timestamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1750c4acbd1afdbe7cd367bc4e3fec17bfd26880
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq000pH000mO1^@s6@G+EM0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzE=fc|RCwBqQ^5_wFbpge19XHk00JhU
zy!gTdZ6^RG044w?pd-MO7agI90q6)FfwQ<&CQa2^I$24aJKJ#vp2LohaR8S96CeaC
z;00v+<-4@w2M&S*+}>-q8<2vmYLHO<2~4?_0e5C076BU|;NAj6g&g=w;Y0#Cm?0pA
zFG*ZsEg6oOi4a{W{3F34Vh==NZ4?+>dno}}Q%D52I+K`w=W3k8cKV*L>NQR4GzjI)
zCPWqCko)qCrS7<8F-!JXa;8eEN!rYiCf0u5m=macn9ZnXPyX)s7IV^*AW|(T4at#y
zgMeuVLBN@+@A>SulyK%eJXI5If>2F$fqPlw?;z-^O3FF*1yi4^vw~w^wSB;Z=>{#Y
qb&;%{AJ9RzQlHVN=dM}$3NQd^1a&4=LIV~60000<MNUMnLSTa0Or5L%

literal 0
HcmV?d00001


From 6a9c972ed630c72085faf464f87b92567ff0172c Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 12 Apr 2019 13:54:48 +0200
Subject: [PATCH 16/32] Changed popup no access - #3625

Former-commit-id: c58c9f47bab666985ed4cfe0c9c5edf1ed057e76
---
 pandora_console/general/noaccess.php | 152 +++++++++++++++------------
 1 file changed, 82 insertions(+), 70 deletions(-)

diff --git a/pandora_console/general/noaccess.php b/pandora_console/general/noaccess.php
index 6f6fb7a6a8..27fc4fec72 100644
--- a/pandora_console/general/noaccess.php
+++ b/pandora_console/general/noaccess.php
@@ -4,29 +4,34 @@
 <style>
 
 #alert_messages_na{
-    -moz-border-bottom-right-radius: 5px;
-    -webkit-border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
-    border-bottom-left-radius: 5px;
     z-index:2;
-    position:fixed;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);   
     width:650px;
+    height: 350px;
     background:white;
+    background-image:url('images/image_problem_area.png');
+    justify-content: center;
+    display: flex;
+    flex-direction: column;
+    box-shadow:4px 5px 10px 3px rgba(0, 0, 0, 0.4);
 }
 
 .modalheade{
     text-align:center;
     width:100%;
-    height:37px;
-    left:0px;
-    background-color:#82b92e;
+    position:absolute;
+    top:0;
 }
 .modalheadertex{
-    color:white;
-    position:relative;
+    color:#000;
     font-family:Nunito;
-    font-size:13pt;
-    top:8px;
+    line-height: 40px;
+    font-size: 25pt;
+    margin-bottom:30px;
 }
 .modalclose{
     cursor:pointer;
@@ -38,49 +43,59 @@
 .modalconten{
     color:black;
     background:white;
-}
-.modalcontentim{
-    float:left;
-    margin-left:30px;
-    margin-top:30px;
-    margin-bottom:30px;
+    width:350px;
+    margin-left: 30px;
 }
 .modalcontenttex{
-    float:left;
     text-align:justify;
     color:black;
-    font-size: 9.5pt;
+    font-size: 11pt;
     line-height:13pt;
-    margin-top:30px;
-    width:430px;
-    margin-left:30px;
+    margin-bottom:30px;
 }
 .modalokbutto{
     cursor:pointer;
     text-align:center;
-    margin-right:45px;
-    float:right;
+    display: inline-block;
+    padding: 6px 45px;
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
-    margin-bottom:30px;
-    border-radius: 3px;width:90px;height:30px;background-color:white;border: 1px solid #82b92e;
+    border-radius: 3px;
+    background-color:white;
+    border: 1px solid #82b92e;
 }
 .modalokbuttontex{
-    color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
+    color:#82b92e;
+    font-family:Nunito;
+    font-size:13pt;
 }
 .modalgobutto{
-    cursor:pointer;text-align:center;margin-right:15px;margin-bottom:30px;float:right;-moz-border-radius: 3px;
-    -webkit-border-radius: 3px;border-radius: 3px;width:240px;height:30px;background-color:white;border: 1px solid #82b92e;
+    cursor:pointer;
+    text-align:center;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    background-color:white;
+    border: 1px solid #82b92e;
 }
 .modalgobuttontex{
-color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;    
+color:#82b92e;
+font-family:Nunito;
+font-size:10pt;
 }
 
 
-#opacida{
-position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width:100%;height:100%;
+#opacidad{
+    position:fixed;
+    background:black;
+    opacity:0.6;
+    z-index:-1;
+    left:0px;
+    top:0px;
+    width:100%;
+    height:100%;
 }
-
+/*
 .textodialog{
     margin-left: 0px;
     color:#333;
@@ -100,53 +115,50 @@ position:absolute;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width
 }
 
 .cargatextodialog p, .cargatextodialog b, .cargatextodialog a{
-    font-size:18pt;
-    
-    
+    font-size:18pt; 
 }
+*/
 </style>
 </head>
 <body>
     
-<div id="alert_messages_na">
-    
-    <div class='modalheade'>
-    <span class='modalheadertex'>
-        <?php echo __("You don't have access to this page"); ?>
-    </span>
-    <img class='modalclose cerrar' src='<?php echo $config['homeurl']; ?>images/icono_cerrar.png'>
-    
+    <div id="alert_messages_na">
+        
+        <div class='modalheade'>
+            <img class='modalclose cerrar' src='<?php echo $config['homeurl']; ?>images/input_cross.png'>  
+        </div>
+
+        <div class='modalconten'>
+            <div class='modalheadertex'>
+                <?php echo __("You don't have access to this page"); ?>
+            </div>
+
+            <div class='modalcontenttex'>
+                <?php
+                echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.');
+                    echo '<br/> <br/>';
+                    echo __('Please know that all attempts to access this page are recorded in security logs of %s System Database', get_product_name());
+                ?>
+                      
+            </div>
+
+            <div class='modalokbutto cerrar'>
+                <span class='modalokbuttontex'>OK</span>
+            </div>
+        </div>
     </div>
-
-    <div class='modalconten'>
-    <img class='modalcontentim' src='<?php echo $config['homeurl']; ?>images/access_denied.png'>
-    <div class='modalcontenttex'>
-        <?php
-        echo __('Access to this page is restricted to authorized users only, please contact system administrator if you need assistance.');
-            echo '<br/> <br/>';
-            echo __('Please know that all attempts to access this page are recorded in security logs of %s System Database', get_product_name());
-        ?>
-    
-    </div>
-
-
-</div>
-
-<div class='modalokbutto cerrar'>
-<span class='modalokbuttontex'>OK</span>
-</div>
-
-</div>
-    
-    <div id="opacida" style="position:fixed;background:black;opacity:0.6;z-index:-1;left:0px;top:0px;width:100%;height:100%;"></div>
+        
+    <div id="opacidad"></div>
     
 </body>
 </html>
 
 <script>
 
-$(".cerrar").click(function(){
-  window.location=".";
-});
+    $(".cerrar").click(function(){
+    window.location=".";
+    });
+
+    $('div#page').css('background-color','#a5a5a5');
 
 </script>
\ No newline at end of file

From ef0f7cded872a7e9f578bc1f83e70451463e21a0 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 13 Apr 2019 00:01:31 +0200
Subject: [PATCH 17/32] Auto-updated build strings.

Former-commit-id: c9f4339d4c39a14d446e1a3ea42c28d68398670d
---
 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 ae32bb637c..bf32135d47 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190412
+Version: 7.0NG.733-190413
 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 dfaee640cd..32a2345ad2 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.733-190412"
+pandora_version="7.0NG.733-190413"
 
 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 8574e5992c..ab473b2156 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.733';
-use constant AGENT_BUILD => '190412';
+use constant AGENT_BUILD => '190413';
 
 # 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 f422cf9440..dc4f5ee3ec 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.733
-%define release     190412
+%define release     190413
 
 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 aa20c8959d..af67411052 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.733
-%define release     190412
+%define release     190413
 
 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 5a37ec8afb..c18ecc854f 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190412"
+PI_BUILD="190413"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ab6dbf55cf..6e4c3c5490 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190412}
+{190413}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 29e3fa7c6c..2487b74435 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.733(Build 190412)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190413)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index f100c45e66..031a3c1826 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.733(Build 190412))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190413))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 9a2377396a..1ca1ddd698 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190412
+Version: 7.0NG.733-190413
 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 8ede0c1194..7634224065 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.733-190412"
+pandora_version="7.0NG.733-190413"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8c2bb2d844..b39c440545 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 = 'PC190412';
+$build_version = 'PC190413';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 3d0b96a7fc..d0f65b0098 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190412';
+            $build = '190413';
             $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 aee7b1a74a..50fd6ba5a4 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.733
-%define release     190412
+%define release     190413
 
 # 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 433ad42c36..2e00a47802 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.733
-%define release     190412
+%define release     190413
 
 # 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 512935c2ed..e629190c2b 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.733
-%define release     190412
+%define release     190413
 %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 c5a3c61d66..82e6f5957f 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190412
+Version: 7.0NG.733-190413
 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 04f9e767b0..7e19c135f6 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.733-190412"
+pandora_version="7.0NG.733-190413"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 04b23b49b0..05e7d90a24 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.733";
-my $pandora_build = "190412";
+my $pandora_build = "190413";
 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 7c40d10f22..ccd6eb879b 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.733";
-my $pandora_build = "190412";
+my $pandora_build = "190413";
 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 567f5b5c31..e5802dfeb3 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.733
-%define release     190412
+%define release     190413
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 21ccfc3b6a..2713196643 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.733
-%define release     190412
+%define release     190413
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 229d90d637..1332c441cb 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190412"
+PI_BUILD="190413"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7ecf3e1d85..ff87840e15 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.733 PS190412";
+my $version = "7.0NG.733 PS190413";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 05c7a879ac..1210f6b1af 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.733 PS190412";
+my $version = "7.0NG.733 PS190413";
 
 # save program name for logging
 my $progname = basename($0);

From d0f6726d00c6fdcd368467d1b93a80d996a6ea0a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 14 Apr 2019 00:01:23 +0200
Subject: [PATCH 18/32] Auto-updated build strings.

Former-commit-id: b06d9487fb226c80a72020082f0b33ee2af854f7
---
 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 bf32135d47..b1e64770e3 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190413
+Version: 7.0NG.733-190414
 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 32a2345ad2..e6b95a24ce 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.733-190413"
+pandora_version="7.0NG.733-190414"
 
 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 ab473b2156..9e9a74a6aa 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.733';
-use constant AGENT_BUILD => '190413';
+use constant AGENT_BUILD => '190414';
 
 # 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 dc4f5ee3ec..b38004128e 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.733
-%define release     190413
+%define release     190414
 
 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 af67411052..f8d2d8fe6f 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.733
-%define release     190413
+%define release     190414
 
 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 c18ecc854f..628a953fdb 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190413"
+PI_BUILD="190414"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6e4c3c5490..1c7aaee0b8 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190413}
+{190414}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 2487b74435..21ce524282 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.733(Build 190413)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190414)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 031a3c1826..e6a8afbae9 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.733(Build 190413))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190414))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 1ca1ddd698..c37bb4627b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190413
+Version: 7.0NG.733-190414
 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 7634224065..a942aca6bc 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.733-190413"
+pandora_version="7.0NG.733-190414"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index b39c440545..71dd735d54 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 = 'PC190413';
+$build_version = 'PC190414';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index d0f65b0098..74b1fb2c50 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190413';
+            $build = '190414';
             $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 50fd6ba5a4..f4380a03fc 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.733
-%define release     190413
+%define release     190414
 
 # 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 2e00a47802..091b71ddeb 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.733
-%define release     190413
+%define release     190414
 
 # 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 e629190c2b..2443ec7570 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.733
-%define release     190413
+%define release     190414
 %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 82e6f5957f..94cd7cdee5 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190413
+Version: 7.0NG.733-190414
 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 7e19c135f6..97599c3854 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.733-190413"
+pandora_version="7.0NG.733-190414"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 05e7d90a24..4742eeb481 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.733";
-my $pandora_build = "190413";
+my $pandora_build = "190414";
 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 ccd6eb879b..a7a518bfac 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.733";
-my $pandora_build = "190413";
+my $pandora_build = "190414";
 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 e5802dfeb3..f0ea59d3c2 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.733
-%define release     190413
+%define release     190414
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 2713196643..9fef53ea0f 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.733
-%define release     190413
+%define release     190414
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 1332c441cb..3057a5417c 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190413"
+PI_BUILD="190414"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index ff87840e15..123dc3f1a0 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.733 PS190413";
+my $version = "7.0NG.733 PS190414";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1210f6b1af..166b4f1b7b 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.733 PS190413";
+my $version = "7.0NG.733 PS190414";
 
 # save program name for logging
 my $progname = basename($0);

From 68258661b1369af36f9cc503ee5d9544c7ed431d Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 15 Apr 2019 00:01:24 +0200
Subject: [PATCH 19/32] Auto-updated build strings.

Former-commit-id: a45bf5f65399be38165be423f0b40a40e4468522
---
 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 b1e64770e3..d4ecfdb23a 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190414
+Version: 7.0NG.733-190415
 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 e6b95a24ce..68e93c1a9d 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.733-190414"
+pandora_version="7.0NG.733-190415"
 
 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 9e9a74a6aa..e85d782d8a 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.733';
-use constant AGENT_BUILD => '190414';
+use constant AGENT_BUILD => '190415';
 
 # 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 b38004128e..eae61811b0 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.733
-%define release     190414
+%define release     190415
 
 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 f8d2d8fe6f..35cbf6d9a6 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.733
-%define release     190414
+%define release     190415
 
 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 628a953fdb..edb50b3948 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190414"
+PI_BUILD="190415"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 1c7aaee0b8..0d82aece5e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190414}
+{190415}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 21ce524282..fa52a8997a 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.733(Build 190414)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190415)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index e6a8afbae9..69aa821e1b 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.733(Build 190414))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190415))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index c37bb4627b..811275c5c7 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190414
+Version: 7.0NG.733-190415
 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 a942aca6bc..de9a50678b 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.733-190414"
+pandora_version="7.0NG.733-190415"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 71dd735d54..3178d5cce4 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 = 'PC190414';
+$build_version = 'PC190415';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 74b1fb2c50..7549110130 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190414';
+            $build = '190415';
             $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 f4380a03fc..c55cc95b40 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.733
-%define release     190414
+%define release     190415
 
 # 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 091b71ddeb..e75979fa76 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.733
-%define release     190414
+%define release     190415
 
 # 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 2443ec7570..2c4412c123 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.733
-%define release     190414
+%define release     190415
 %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 94cd7cdee5..e0aa38a1bb 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190414
+Version: 7.0NG.733-190415
 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 97599c3854..15fbc371ef 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.733-190414"
+pandora_version="7.0NG.733-190415"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4742eeb481..1d063f569d 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.733";
-my $pandora_build = "190414";
+my $pandora_build = "190415";
 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 a7a518bfac..9e408ed98e 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.733";
-my $pandora_build = "190414";
+my $pandora_build = "190415";
 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 f0ea59d3c2..c00fdccebd 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.733
-%define release     190414
+%define release     190415
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 9fef53ea0f..cd780204c1 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.733
-%define release     190414
+%define release     190415
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 3057a5417c..5df5a40fe0 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190414"
+PI_BUILD="190415"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 123dc3f1a0..7338eb3c28 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.733 PS190414";
+my $version = "7.0NG.733 PS190415";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 166b4f1b7b..a1b8bc4b38 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.733 PS190414";
+my $version = "7.0NG.733 PS190415";
 
 # save program name for logging
 my $progname = basename($0);

From d3d5312f40202d582a865b099d815274cdbb7e40 Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Mon, 15 Apr 2019 11:14:41 +0200
Subject: [PATCH 20/32] Update 27.sql

Former-commit-id: 4e027274bb9edeb51dc64f935ddd3ee2bfd62d0d
---
 pandora_console/extras/mr/27.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/extras/mr/27.sql b/pandora_console/extras/mr/27.sql
index aff9a5eeb9..d04e8da857 100644
--- a/pandora_console/extras/mr/27.sql
+++ b/pandora_console/extras/mr/27.sql
@@ -2,7 +2,6 @@ START TRANSACTION;
 
 ALTER TABLE `tnetflow_filter` DROP COLUMN `output`;
 
-COMMIT;
 ALTER TABLE `tagente_modulo` ADD COLUMN `ff_type` tinyint(1) unsigned default '0';
 ALTER TABLE `tnetwork_component` ADD COLUMN `ff_type` tinyint(1) unsigned default '0';
 ALTER TABLE `tlocal_component` ADD COLUMN `ff_type` tinyint(1) unsigned default '0';

From eca7f6e53afebdc6e79796d892b52a4707aae4d1 Mon Sep 17 00:00:00 2001
From: Rafael Ameijeiras <rafael.ameijeiras@artica.es>
Date: Mon, 15 Apr 2019 11:20:57 +0200
Subject: [PATCH 21/32] fixed minor bug in the open spec

Former-commit-id: 0d8aacf0d4e7ae6199d103e62b6a6a8891c3a0f2
---
 pandora_console/pandora_console.rhel7.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 29b446ae07..b128c4153a 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -21,7 +21,7 @@ Source0:            %{name}-%{version}.tar.gz
 URL:                http://www.pandorafms.com
 Group:              Productivity/Networking/Web/Utilities
 Packager:           Sancho Lerena <slerena@artica.es>
-Prefix:             /opt/rh/httpd24/root/var/www/html/
+Prefix:             /opt/rh/httpd24/root/var/www/html
 BuildRoot:          %{_tmppath}/%{name}
 BuildArch:          noarch
 AutoReq:            0

From 29c282dc798bae6baf2d783650df5d10ab36357b Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Mon, 15 Apr 2019 14:42:58 +0200
Subject: [PATCH 22/32] Changed popup no access - #3625

Former-commit-id: 0798f53d9074a580309aeb9f9577ec518efd9264
---
 pandora_console/general/noaccess.php        |  14 +++++++-------
 pandora_console/images/imagen-no-acceso.jpg | Bin 0 -> 61471 bytes
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 pandora_console/images/imagen-no-acceso.jpg

diff --git a/pandora_console/general/noaccess.php b/pandora_console/general/noaccess.php
index 27fc4fec72..8f70661296 100644
--- a/pandora_console/general/noaccess.php
+++ b/pandora_console/general/noaccess.php
@@ -11,9 +11,10 @@
     transform: translate(-50%, -50%);
     -webkit-transform: translate(-50%, -50%);   
     width:650px;
-    height: 350px;
+    height: 400px;
     background:white;
-    background-image:url('images/image_problem_area.png');
+    background-image:url('images/imagen-no-acceso.jpg');
+    background-repeat:no-repeat;
     justify-content: center;
     display: flex;
     flex-direction: column;
@@ -30,7 +31,7 @@
     color:#000;
     font-family:Nunito;
     line-height: 40px;
-    font-size: 25pt;
+    font-size: 23pt;
     margin-bottom:30px;
 }
 .modalclose{
@@ -42,12 +43,11 @@
 }
 .modalconten{
     color:black;
-    background:white;
-    width:350px;
+    width:300px;
     margin-left: 30px;
 }
 .modalcontenttex{
-    text-align:justify;
+    text-align:left;
     color:black;
     font-size: 11pt;
     line-height:13pt;
@@ -159,6 +159,6 @@ font-size:10pt;
     window.location=".";
     });
 
-    $('div#page').css('background-color','#a5a5a5');
+    $('div#page').css('background-color','#d3d3d3');
 
 </script>
\ No newline at end of file
diff --git a/pandora_console/images/imagen-no-acceso.jpg b/pandora_console/images/imagen-no-acceso.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..93b9256edb59b290aa3f53a0abd70f7577b63cb0
GIT binary patch
literal 61471
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

literal 0
HcmV?d00001


From c9711914772cff3e398f8062e8e3f3f31df72bd4 Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Mon, 15 Apr 2019 16:21:47 +0200
Subject: [PATCH 23/32] Do not get stuck trying to send buffered XML files to a
 secondary server.

Ref pandora_enterprise#3379


Former-commit-id: 7f7a1ca5958cd8959516de5f46737d7b88074dd0
---
 pandora_agents/unix/pandora_agent | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index e85d782d8a..b37d71f218 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1075,6 +1075,10 @@ sub send_buffered_xml_files ($;$) {
 				unlink ("$temporal_file/$xml_file");	
 			}
 		}
+		# Do not get stuck trying to send buffered XML files to a secondary server.
+		elsif ($flag_always == 2) {
+			last;
+		}
 	}
 	if (defined($flag_always) && ($flag_always == 2)){
 		swap_servers ();

From 8bf92720ee2459d23e31eca97164daf2d6f00da8 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 16 Apr 2019 00:01:30 +0200
Subject: [PATCH 24/32] Auto-updated build strings.

Former-commit-id: 544097161030608395112a142ed341e26700a678
---
 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 d4ecfdb23a..be02b2a72b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190415
+Version: 7.0NG.733-190416
 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 68e93c1a9d..905abba05c 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.733-190415"
+pandora_version="7.0NG.733-190416"
 
 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 e85d782d8a..d1585490b0 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.733';
-use constant AGENT_BUILD => '190415';
+use constant AGENT_BUILD => '190416';
 
 # 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 eae61811b0..95846969ff 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.733
-%define release     190415
+%define release     190416
 
 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 35cbf6d9a6..f589a1cd9d 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.733
-%define release     190415
+%define release     190416
 
 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 edb50b3948..363343c0d7 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190415"
+PI_BUILD="190416"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 0d82aece5e..7745b84475 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190415}
+{190416}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index fa52a8997a..d19411043f 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.733(Build 190415)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190416)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 69aa821e1b..1f62757db3 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.733(Build 190415))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190416))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 811275c5c7..43ca6c5f7a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190415
+Version: 7.0NG.733-190416
 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 de9a50678b..cad9f46ea9 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.733-190415"
+pandora_version="7.0NG.733-190416"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 3178d5cce4..22731f7fca 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 = 'PC190415';
+$build_version = 'PC190416';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 7549110130..e694ba8282 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190415';
+            $build = '190416';
             $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 c55cc95b40..f1c17d844e 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.733
-%define release     190415
+%define release     190416
 
 # 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 b37c54d4f1..36bb7e1706 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.733
-%define release     190415
+%define release     190416
 
 # 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 2c4412c123..828cc84fe0 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.733
-%define release     190415
+%define release     190416
 %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 e0aa38a1bb..0dbd8315a6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190415
+Version: 7.0NG.733-190416
 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 15fbc371ef..0c3b1aef3d 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.733-190415"
+pandora_version="7.0NG.733-190416"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1d063f569d..5abd80aa20 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.733";
-my $pandora_build = "190415";
+my $pandora_build = "190416";
 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 9e408ed98e..9e38ff6f63 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.733";
-my $pandora_build = "190415";
+my $pandora_build = "190416";
 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 c00fdccebd..10202f68d5 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.733
-%define release     190415
+%define release     190416
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index cd780204c1..b6f2657aba 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.733
-%define release     190415
+%define release     190416
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 5df5a40fe0..087faaf4c3 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190415"
+PI_BUILD="190416"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7338eb3c28..4f23ab3449 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.733 PS190415";
+my $version = "7.0NG.733 PS190416";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index a1b8bc4b38..2f09ac7773 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.733 PS190415";
+my $version = "7.0NG.733 PS190416";
 
 # save program name for logging
 my $progname = basename($0);

From ff5a33ba2c3abbe26b2eb64127b95561936f5f87 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 17 Apr 2019 00:01:32 +0200
Subject: [PATCH 25/32] Auto-updated build strings.

Former-commit-id: 20a5c2ce8013b740274a489a7afaa208a23b16e6
---
 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 be02b2a72b..6115fde661 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190416
+Version: 7.0NG.733-190417
 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 905abba05c..61cc1bcb1e 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.733-190416"
+pandora_version="7.0NG.733-190417"
 
 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 d1585490b0..64eea3fcf1 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.733';
-use constant AGENT_BUILD => '190416';
+use constant AGENT_BUILD => '190417';
 
 # 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 95846969ff..692d6d8c60 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.733
-%define release     190416
+%define release     190417
 
 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 f589a1cd9d..b77f090d1d 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.733
-%define release     190416
+%define release     190417
 
 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 363343c0d7..991e76a12f 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190416"
+PI_BUILD="190417"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 7745b84475..c21a29e5b7 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190416}
+{190417}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index d19411043f..fc75976afd 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.733(Build 190416)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190417)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 1f62757db3..4c0762d3a1 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.733(Build 190416))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190417))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 43ca6c5f7a..b09f4d475b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190416
+Version: 7.0NG.733-190417
 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 cad9f46ea9..36d62bedd1 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.733-190416"
+pandora_version="7.0NG.733-190417"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 22731f7fca..ba076857fe 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 = 'PC190416';
+$build_version = 'PC190417';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index e694ba8282..21bd9994c3 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190416';
+            $build = '190417';
             $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 f1c17d844e..bb1712e4f6 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.733
-%define release     190416
+%define release     190417
 
 # 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 36bb7e1706..57f47a8558 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.733
-%define release     190416
+%define release     190417
 
 # 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 828cc84fe0..7234025e42 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.733
-%define release     190416
+%define release     190417
 %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 0dbd8315a6..68041401d6 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190416
+Version: 7.0NG.733-190417
 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 0c3b1aef3d..c2b7cafe72 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.733-190416"
+pandora_version="7.0NG.733-190417"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5abd80aa20..61578042f0 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.733";
-my $pandora_build = "190416";
+my $pandora_build = "190417";
 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 9e38ff6f63..057dbc7bef 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.733";
-my $pandora_build = "190416";
+my $pandora_build = "190417";
 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 10202f68d5..3aa67e3058 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.733
-%define release     190416
+%define release     190417
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index b6f2657aba..ac82abc7d3 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.733
-%define release     190416
+%define release     190417
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 087faaf4c3..ffd57d7ed4 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190416"
+PI_BUILD="190417"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4f23ab3449..7721c3c13b 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.733 PS190416";
+my $version = "7.0NG.733 PS190417";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2f09ac7773..1a7f1f72de 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.733 PS190416";
+my $version = "7.0NG.733 PS190417";
 
 # save program name for logging
 my $progname = basename($0);

From 83cda70e0ac53dae27acb51daa12603019460e9d Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 17 Apr 2019 09:34:24 +0200
Subject: [PATCH 26/32] Fixed styles of tables within tables with new class -
 #3707

Former-commit-id: 6775b6f96669d33fb2130bfca2448d40d2de0964
---
 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 81976ccd50..279ee9fd17 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5024,7 +5024,7 @@ table.info_table {
   border-spacing: 0;
 }
 
-table.info_table tbody > tr:nth-child(even) {
+table.info_table > tbody > tr:nth-child(even) {
   background-color: #f5f5f5;
 }
 

From abcbd92f1fe1ad4b1e8f0a539f269d198b1694bb Mon Sep 17 00:00:00 2001
From: Rafael Ameijeiras <rafael.ameijeiras@artica.es>
Date: Wed, 17 Apr 2019 09:45:08 +0200
Subject: [PATCH 27/32] add line in update version script to include
 pandora_console_enterprise_rhel7.spec

Former-commit-id: d071f1242b3c29b46458690b2f6709ef3546b61b
---
 extras/pandora_update_version.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 33e0c891f7..edab1affeb 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -30,6 +30,7 @@ $CODEHOME/pandora_console/pandora_console.rhel7.spec \
 $CODEHOME/pandora_agents/unix/pandora_agent.redhat.spec \
 $CODEHOME/pandora_server/pandora_server.redhat.spec \
 $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.redhat.spec \
+$PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec \
 $PANDHOME_ENT/pandora_server/PandoraFMS-Enterprise/pandora_server_enterprise.redhat.spec"
 DEBIAN_FILES="$CODEHOME/pandora_console/DEBIAN \
 $CODEHOME/pandora_server/DEBIAN \

From 05261e792433253bc2be38a383a43db701fb881b Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Wed, 17 Apr 2019 11:49:49 +0200
Subject: [PATCH 28/32] Changed styles from table database interface - #3904

Former-commit-id: addb71fdbe4a584047230b4aa61c58e0acf25cd4
---
 pandora_console/extensions/dbmanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/extensions/dbmanager.php b/pandora_console/extensions/dbmanager.php
index 2aface6996..546ee463fa 100644
--- a/pandora_console/extensions/dbmanager.php
+++ b/pandora_console/extensions/dbmanager.php
@@ -148,7 +148,7 @@ function dbmgr_extension_main()
     echo "<div style='overflow: auto;'>";
     $table = new stdClass();
     $table->width = '100%';
-    $table->class = 'databox data';
+    $table->class = 'info_table';
     $table->head = array_keys($result[0]);
 
     $table->data = $result;

From 9d8e2abd989805b90767cd9e53727ad239f592af Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 18 Apr 2019 00:01:27 +0200
Subject: [PATCH 29/32] Auto-updated build strings.

Former-commit-id: 9f2ce52207e981ede2c5be3bd52b7747612091d3
---
 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 6115fde661..860a053d79 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190417
+Version: 7.0NG.733-190418
 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 61cc1bcb1e..bedca6482c 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.733-190417"
+pandora_version="7.0NG.733-190418"
 
 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 5526f6fc08..412f8d0873 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.733';
-use constant AGENT_BUILD => '190417';
+use constant AGENT_BUILD => '190418';
 
 # 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 692d6d8c60..835ba6c1e5 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.733
-%define release     190417
+%define release     190418
 
 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 b77f090d1d..cb7c4fd87e 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.733
-%define release     190417
+%define release     190418
 
 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 991e76a12f..f301b13f86 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190417"
+PI_BUILD="190418"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c21a29e5b7..21fbdb98a6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190417}
+{190418}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index fc75976afd..45925d47f4 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.733(Build 190417)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190418)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 4c0762d3a1..2c77885fa1 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.733(Build 190417))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190418))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index b09f4d475b..aa3cf5103a 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190417
+Version: 7.0NG.733-190418
 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 36d62bedd1..9ff1c4a1df 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.733-190417"
+pandora_version="7.0NG.733-190418"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index ba076857fe..7d67ac33c4 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 = 'PC190417';
+$build_version = 'PC190418';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 21bd9994c3..a571792c93 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190417';
+            $build = '190418';
             $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 bb1712e4f6..f42ebe2ffd 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.733
-%define release     190417
+%define release     190418
 
 # 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 57f47a8558..8c22fb70da 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.733
-%define release     190417
+%define release     190418
 
 # 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 7234025e42..3e41d50062 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.733
-%define release     190417
+%define release     190418
 %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 68041401d6..2eacca07a1 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190417
+Version: 7.0NG.733-190418
 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 c2b7cafe72..9abb29b177 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.733-190417"
+pandora_version="7.0NG.733-190418"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 61578042f0..d9ce80a569 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.733";
-my $pandora_build = "190417";
+my $pandora_build = "190418";
 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 057dbc7bef..8b495fbc13 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.733";
-my $pandora_build = "190417";
+my $pandora_build = "190418";
 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 3aa67e3058..1226d724e9 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.733
-%define release     190417
+%define release     190418
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index ac82abc7d3..36b0a0481e 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.733
-%define release     190417
+%define release     190418
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index ffd57d7ed4..d33882c338 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190417"
+PI_BUILD="190418"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7721c3c13b..4389c2b9d3 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.733 PS190417";
+my $version = "7.0NG.733 PS190418";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 1a7f1f72de..d23bba29b8 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.733 PS190417";
+my $version = "7.0NG.733 PS190418";
 
 # save program name for logging
 my $progname = basename($0);

From 7283d87a178585e9e76c2720fdd759088e0b0d2d Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 19 Apr 2019 00:01:25 +0200
Subject: [PATCH 30/32] Auto-updated build strings.

Former-commit-id: 7661f94b50736f6ebf6b75fc79b2a0570431f424
---
 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 860a053d79..7a12b6cea8 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190418
+Version: 7.0NG.733-190419
 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 bedca6482c..97f248b72c 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.733-190418"
+pandora_version="7.0NG.733-190419"
 
 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 412f8d0873..ec1af96699 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.733';
-use constant AGENT_BUILD => '190418';
+use constant AGENT_BUILD => '190419';
 
 # 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 835ba6c1e5..8bb5f8da73 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.733
-%define release     190418
+%define release     190419
 
 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 cb7c4fd87e..549a957104 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.733
-%define release     190418
+%define release     190419
 
 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 f301b13f86..e4c742be63 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190418"
+PI_BUILD="190419"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 21fbdb98a6..053fd2ee00 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190418}
+{190419}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 45925d47f4..148aecb1e1 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.733(Build 190418)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190419)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 2c77885fa1..dd534a1925 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.733(Build 190418))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190419))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index aa3cf5103a..7cccb60859 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190418
+Version: 7.0NG.733-190419
 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 9ff1c4a1df..1493e9c3c2 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.733-190418"
+pandora_version="7.0NG.733-190419"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 7d67ac33c4..053453f0b8 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 = 'PC190418';
+$build_version = 'PC190419';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a571792c93..cda2b81956 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190418';
+            $build = '190419';
             $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 f42ebe2ffd..23c381afbe 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.733
-%define release     190418
+%define release     190419
 
 # 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 8c22fb70da..6cc992008b 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.733
-%define release     190418
+%define release     190419
 
 # 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 3e41d50062..6005921ab6 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.733
-%define release     190418
+%define release     190419
 %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 2eacca07a1..153da8c1c2 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190418
+Version: 7.0NG.733-190419
 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 9abb29b177..f793830d2d 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.733-190418"
+pandora_version="7.0NG.733-190419"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index d9ce80a569..190e35b7e0 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.733";
-my $pandora_build = "190418";
+my $pandora_build = "190419";
 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 8b495fbc13..45e73d629d 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.733";
-my $pandora_build = "190418";
+my $pandora_build = "190419";
 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 1226d724e9..b633b52f79 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.733
-%define release     190418
+%define release     190419
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 36b0a0481e..d87fd799c9 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.733
-%define release     190418
+%define release     190419
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index d33882c338..000ba7095a 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190418"
+PI_BUILD="190419"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 4389c2b9d3..1cd3c786b2 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.733 PS190418";
+my $version = "7.0NG.733 PS190419";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index d23bba29b8..89e606d814 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.733 PS190418";
+my $version = "7.0NG.733 PS190419";
 
 # save program name for logging
 my $progname = basename($0);

From 1dfda59ce65d6ef922e223091f26a3c754e974d3 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 20 Apr 2019 00:01:24 +0200
Subject: [PATCH 31/32] Auto-updated build strings.

Former-commit-id: cd5e2305d2b22765879068907dd042a36f1d1524
---
 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 7a12b6cea8..980738cfcc 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190419
+Version: 7.0NG.733-190420
 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 97f248b72c..b3984879cc 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.733-190419"
+pandora_version="7.0NG.733-190420"
 
 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 ec1af96699..27a40fe3fa 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.733';
-use constant AGENT_BUILD => '190419';
+use constant AGENT_BUILD => '190420';
 
 # 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 8bb5f8da73..ca04a2b140 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.733
-%define release     190419
+%define release     190420
 
 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 549a957104..28892a4656 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.733
-%define release     190419
+%define release     190420
 
 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 e4c742be63..14197106ff 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190419"
+PI_BUILD="190420"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 053fd2ee00..324c48e300 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190419}
+{190420}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 148aecb1e1..8748c8a917 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.733(Build 190419)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190420)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index dd534a1925..8599b65714 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.733(Build 190419))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190420))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 7cccb60859..d87cab00f3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190419
+Version: 7.0NG.733-190420
 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 1493e9c3c2..675c63a15f 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.733-190419"
+pandora_version="7.0NG.733-190420"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 053453f0b8..9bafee2755 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 = 'PC190419';
+$build_version = 'PC190420';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index cda2b81956..714b78e4bc 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190419';
+            $build = '190420';
             $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 23c381afbe..92294f9616 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.733
-%define release     190419
+%define release     190420
 
 # 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 6cc992008b..c6005d9df3 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.733
-%define release     190419
+%define release     190420
 
 # 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 6005921ab6..82d898cb98 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.733
-%define release     190419
+%define release     190420
 %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 153da8c1c2..84977a49d8 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190419
+Version: 7.0NG.733-190420
 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 f793830d2d..1f77ca9138 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.733-190419"
+pandora_version="7.0NG.733-190420"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 190e35b7e0..dd16700166 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.733";
-my $pandora_build = "190419";
+my $pandora_build = "190420";
 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 45e73d629d..ccc48ef6a6 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.733";
-my $pandora_build = "190419";
+my $pandora_build = "190420";
 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 b633b52f79..22fa554b2a 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.733
-%define release     190419
+%define release     190420
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index d87fd799c9..6cc57b032c 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.733
-%define release     190419
+%define release     190420
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 000ba7095a..2e423ca6b6 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190419"
+PI_BUILD="190420"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 1cd3c786b2..d6474e4a51 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.733 PS190419";
+my $version = "7.0NG.733 PS190420";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 89e606d814..7dc0ff78d2 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.733 PS190419";
+my $version = "7.0NG.733 PS190420";
 
 # save program name for logging
 my $progname = basename($0);

From ea7a8b2b90474e6c9ae80725d4c02e433b1a7611 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 21 Apr 2019 00:01:29 +0200
Subject: [PATCH 32/32] Auto-updated build strings.

Former-commit-id: 5dcf18be78871aec110bc23387eed631fc9b23f4
---
 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 980738cfcc..14c178725b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.733-190420
+Version: 7.0NG.733-190421
 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 b3984879cc..1790da27f2 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.733-190420"
+pandora_version="7.0NG.733-190421"
 
 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 27a40fe3fa..5804ba428e 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.733';
-use constant AGENT_BUILD => '190420';
+use constant AGENT_BUILD => '190421';
 
 # 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 ca04a2b140..385a6f5890 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.733
-%define release     190420
+%define release     190421
 
 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 28892a4656..b6dbe1b74c 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.733
-%define release     190420
+%define release     190421
 
 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 14197106ff..2fc156dba8 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190420"
+PI_BUILD="190421"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 324c48e300..445411e598 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{190420}
+{190421}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 8748c8a917..642a88b173 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.733(Build 190420)")
+#define PANDORA_VERSION ("7.0NG.733(Build 190421)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 8599b65714..7fc6c1141b 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.733(Build 190420))"
+      VALUE "ProductVersion", "(7.0NG.733(Build 190421))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index d87cab00f3..70a862d28c 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.733-190420
+Version: 7.0NG.733-190421
 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 675c63a15f..84b3b0c59d 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.733-190420"
+pandora_version="7.0NG.733-190421"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 9bafee2755..8fe0619282 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 = 'PC190420';
+$build_version = 'PC190421';
 $pandora_version = 'v7.0NG.733';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 714b78e4bc..836e992bff 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.733';
-            $build = '190420';
+            $build = '190421';
             $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 92294f9616..7be55e68f9 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.733
-%define release     190420
+%define release     190421
 
 # 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 c6005d9df3..ea8e580cdd 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.733
-%define release     190420
+%define release     190421
 
 # 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 82d898cb98..80d1d28972 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.733
-%define release     190420
+%define release     190421
 %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 84977a49d8..9d6885f707 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.733-190420
+Version: 7.0NG.733-190421
 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 1f77ca9138..d7e2e1d0fc 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.733-190420"
+pandora_version="7.0NG.733-190421"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index dd16700166..992d9280dd 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.733";
-my $pandora_build = "190420";
+my $pandora_build = "190421";
 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 ccc48ef6a6..ba84efab0a 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.733";
-my $pandora_build = "190420";
+my $pandora_build = "190421";
 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 22fa554b2a..bfd87cf176 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.733
-%define release     190420
+%define release     190421
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 6cc57b032c..5377053358 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.733
-%define release     190420
+%define release     190421
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2e423ca6b6..4e063a93e6 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.733"
-PI_BUILD="190420"
+PI_BUILD="190421"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d6474e4a51..eeb7eb9d7c 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.733 PS190420";
+my $version = "7.0NG.733 PS190421";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 7dc0ff78d2..1401e1ee12 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.733 PS190420";
+my $version = "7.0NG.733 PS190421";
 
 # save program name for logging
 my $progname = basename($0);