From 8fd1f3c99e9d0349aac6254e944095eb6dd5ebdb Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Thu, 29 Aug 2019 10:07:50 +0200
Subject: [PATCH 01/19] Added compact mode to show timestamp - #4233

---
 pandora_console/godmode/setup/setup_visuals.php | 17 ++++++++++++-----
 pandora_console/include/functions_ui.php        |  4 ++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 0e7e41e7d6..e07326fe6e 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1169,16 +1169,23 @@ $row++;
     if ($config['prominent_time'] == 'comparation') {
         $timestamp = false;
         $comparation = true;
+        $compact = false;
     } else if ($config['prominent_time'] == 'timestamp') {
         $timestamp = true;
         $comparation = false;
+        $compact = false;
+    } else if ($config['prominent_time'] == 'compact') {
+        $timestamp = false;
+        $comparation = false;
+        $compact = true;
     }
 
-    $table_other->data[$row][0] = __('Timestamp or time comparation');
-    $table_other->data[$row][1] = __('Comparation in rollover').' ';
-    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', '', $comparation, true);
-    $table_other->data[$row][1] .= '<br />'.__('Timestamp in rollover').' ';
-    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', '', $timestamp, true);
+    $table_other->data[$row][0] = __('Timestamp, time comparation, or Compact mode');
+    $table_other->data[$row][1] = '<div class="switch_radio_button">';
+    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
+    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
+    $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'compact', __('Compact mode'), $compact, true);
+    $table_other->data[$row][1] .= '</div>';
 
     $row++;
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 008c05b8d7..9f897767df 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -535,6 +535,10 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
             date2strftime_format($config['date_format']),
             $unixtime
         );
+    } else if ($prominent == 'compact') {
+        $units = 'tiny';
+        $title = human_time_comparation($unixtime);
+        $data = human_time_comparation($unixtime, $units);
     } else {
         $title = date($config['date_format'], $unixtime);
         $units = 'large';

From bb093482a79adb116ff7d068b749bb4660ea5fc2 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 11 Dec 2019 13:04:45 +0100
Subject: [PATCH 02/19] Fix: ws session extraction

---
 pandora_console/include/lib/WSManager.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/lib/WSManager.php b/pandora_console/include/lib/WSManager.php
index f1e4fc6524..a8144c43c0 100644
--- a/pandora_console/include/lib/WSManager.php
+++ b/pandora_console/include/lib/WSManager.php
@@ -271,12 +271,20 @@ class WSManager extends WebSocketServer
     {
         global $config;
 
-        $php_session_id = \str_replace(
-            'PHPSESSID=',
-            '',
-            $user->headers['cookie']
+        $match;
+        $php_session_id = '';
+        \preg_match(
+            '/PHPSESSID=(.*)/',
+            $user->headers['cookie'],
+            $match
         );
 
+        if (is_array($match) === true) {
+                $php_session_id = $match[1];
+        }
+
+        $php_session_id = \preg_replace('/;.*$/', '', $php_session_id);
+
         // If being redirected from proxy.
         if (isset($user->headers['x-forwarded-for']) === true) {
             $user->address = $user->headers['x-forwarded-for'];

From 3b5ebd0bf7f41cd772cb9e5d355f6a2deded4fc0 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 13 Dec 2019 11:46:44 +0100
Subject: [PATCH 03/19] Better quickshell integration and fixes

---
 pandora_console/extensions/quick_shell.php | 31 ++--------------------
 pandora_console/godmode/menu.php           |  7 +++++
 pandora_console/godmode/setup/setup.php    | 18 +++++++++++++
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index a8cce0b8de..08d002f55e 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -65,17 +65,13 @@ function quickShell()
     ui_require_css_file('discovery');
 
     // Settings.
-    // WebSocket host, where to connect.
-    if (isset($config['ws_host']) === false) {
-        config_update_value('ws_host', $_SERVER['SERVER_ADDR']);
-    }
-
+    // WebSocket host, where client should connect.
     if (isset($config['ws_port']) === false) {
         config_update_value('ws_port', 8080);
     }
 
     if (empty($config['ws_proxy_url']) === true) {
-        $ws_url = 'http://'.$config['ws_host'].':'.$config['ws_port'];
+        $ws_url = 'http://'.$_SERVER['SERVER_ADDR'].':'.$config['ws_port'];
     } else {
         preg_match('/\/\/(.*)/', $config['ws_proxy_url'], $matches);
         if (isset($_SERVER['HTTPS']) === true) {
@@ -381,14 +377,6 @@ function quickShellSettings()
         }
     }
 
-    // Interface.
-    ui_print_page_header(
-        __('QuickShell settings'),
-        '',
-        false,
-        'quickshell_settings'
-    );
-
     if ($changes > 0) {
         $msg = __('%d Updated', $changes);
         if ($critical > 0) {
@@ -523,19 +511,4 @@ if (empty($agent_id) === false
     }
 }
 
-extensions_add_godmode_menu_option(
-    // Name.
-    __('QuickShell settings'),
-    // Acl.
-    'PM',
-    // FatherId.
-    'gextensions',
-    // Icon.
-    'images/ehorus/terminal.png',
-    // Version.
-    'N/A',
-    // SubfatherId.
-    null
-);
-
 extensions_add_godmode_function('quickShellSettings');
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index af09d9ff0d..b1f8685ada 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -316,6 +316,13 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $sub2['godmode/setup/setup&amp;section=notifications']['text'] = __('Notifications');
     $sub2['godmode/setup/setup&amp;section=notifications']['refr'] = 0;
 
+
+    // Enable only if quickshell is enabled.
+    if (function_exists('quickShellSettings') === true) {
+        $sub2['godmode/setup/setup&amp;section=quickshell']['text'] = __('QuickShell');
+        $sub2['godmode/setup/setup&amp;section=quickshell']['refr'] = 0;
+    }
+
     if ($config['activate_gis']) {
         $sub2['godmode/setup/gis']['text'] = __('Map conections GIS');
     }
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index a46d7bc832..d396bbd953 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,6 +133,14 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
+// Enable only if quickshell is enabled.
+if (function_exists('quickShellSettings') === true) {
+    $buttons['quickshell'] = [
+        'active' => false,
+        'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=quickshell').'">'.html_print_image('images/ehorus/terminal.png', true, ['title' => __('Quickshell')]).'</a>',
+    ];
+}
+
 $help_header = '';
 if (enterprise_installed()) {
     $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
@@ -183,6 +191,12 @@ switch ($section) {
         $subpage = ' &raquo '.__('Notifications');
     break;
 
+    case 'quickshell':
+        $buttons['quickshell']['active'] = true;
+        $subpage = ' &raquo '.__('QuickShell');
+        $help_header = 'quickshell_settings';
+    break;
+
     case 'enterprise':
         $buttons['enterprise']['active'] = true;
         $subpage = ' &raquo '.__('Enterprise');
@@ -247,6 +261,10 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
     break;
 
+    case 'quickshell':
+        quickShellSettings();
+    break;
+
     default:
         enterprise_hook('setup_enterprise_select_tab', [$section]);
     break;

From 5f32bfdb64d30bb725ed896a50540cc5a978f913 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 13 Dec 2019 11:58:12 +0100
Subject: [PATCH 04/19] Datatype fix - ws engine

---
 pandora_console/include/lib/WSManager.php | 2 +-
 pandora_console/ws.php                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/lib/WSManager.php b/pandora_console/include/lib/WSManager.php
index a8144c43c0..f7ab3dbddc 100644
--- a/pandora_console/include/lib/WSManager.php
+++ b/pandora_console/include/lib/WSManager.php
@@ -152,7 +152,7 @@ class WSManager extends WebSocketServer
      */
     public function __construct(
         $listen_addr,
-        $listen_port,
+        int $listen_port,
         $connected=[],
         $process=[],
         $processRaw=[],
diff --git a/pandora_console/ws.php b/pandora_console/ws.php
index 5eebe58aad..6c7a513185 100644
--- a/pandora_console/ws.php
+++ b/pandora_console/ws.php
@@ -139,7 +139,7 @@ $ws = new WSManager(
     // Bind address.
     $config['ws_bind_address'],
     // Bind port.
-    $config['ws_port'],
+    (int) $config['ws_port'],
     // Connected handlers.
     ['gotty' => 'proxyConnected'],
     // Process handlers.

From bd1954ce382a9784ff85dc750642109513339321 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 13 Dec 2019 13:11:38 +0100
Subject: [PATCH 05/19] Setup Websocket engine, unified

---
 pandora_console/extensions/quick_shell.php    | 186 +++++++++---------
 pandora_console/godmode/extensions.php        |   1 +
 pandora_console/godmode/setup/setup.php       |  21 +-
 .../godmode/setup/setup_general.php           |  44 -----
 .../godmode/setup/setup_websocket_engine.php  |  89 +++++++++
 pandora_console/images/websocket_big.png      | Bin 0 -> 7441 bytes
 pandora_console/images/websocket_small.png    | Bin 0 -> 3486 bytes
 pandora_console/include/styles/pandora.css    |   4 +
 8 files changed, 198 insertions(+), 147 deletions(-)
 create mode 100644 pandora_console/godmode/setup/setup_websocket_engine.php
 create mode 100644 pandora_console/images/websocket_big.png
 create mode 100644 pandora_console/images/websocket_small.png

diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 08d002f55e..8228c9f59d 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -309,7 +309,7 @@ function quickShellSettings()
     }
 
     // Parser.
-    if (get_parameter('qs_update', false) !== false) {
+    if (get_parameter('update_config', false) !== false) {
         // Gotty settings. Internal communication (WS).
         $gotty = get_parameter(
             'gotty',
@@ -389,100 +389,104 @@ function quickShellSettings()
         ui_print_success_message($msg);
     }
 
-    // Form.
-    $wiz = new Wizard();
+    // Form. Using old style.
+    echo '<fieldset>';
+    echo '<legend>'.__('Quickshell').'</legend>';
 
-    $wiz->printForm(
-        [
-            'form'   => [
-                'action' => '#',
-                'class'  => 'wizard',
-                'method' => 'post',
-            ],
-            'inputs' => [
-                [
-                    'label'     => __('Gotty path').ui_print_help_tip(
-                        __('Leave blank if using an external Gotty service'),
-                        true
-                    ),
-                    'arguments' => [
-                        'type'  => 'text',
-                        'name'  => 'gotty',
-                        'value' => $config['gotty'],
-                    ],
-                ],
-                [
-                    'label'     => __('Gotty host'),
-                    'arguments' => [
-                        'type'  => 'text',
-                        'name'  => 'gotty_host',
-                        'value' => $config['gotty_host'],
-                    ],
-                ],
-                [
-                    'label'     => __('Gotty ssh port'),
-                    'arguments' => [
-                        'type'  => 'text',
-                        'name'  => 'gotty_ssh_port',
-                        'value' => $config['gotty_ssh_port'],
-                    ],
-                ],
-                [
-                    'label'     => __('Gotty telnet port'),
-                    'arguments' => [
-                        'type'  => 'text',
-                        'name'  => 'gotty_telnet_port',
-                        'value' => $config['gotty_telnet_port'],
-                    ],
-                ],
-                [
-                    'toggle'        => true,
-                    'toggle_name'   => 'Advanced',
-                    'block_content' => [
-                        [
-                            'label'     => __('Gotty user').ui_print_help_tip(
-                                __('Optional, set a user to access gotty service'),
-                                true
-                            ),
-                            'arguments' => [
-                                'type'  => 'text',
-                                'name'  => 'gotty_user',
-                                'value' => $config['gotty_user'],
-                            ],
-                        ],
-                        [
-                            'label'     => __('Gotty password').ui_print_help_tip(
-                                __('Optional, set a password to access gotty service'),
-                                true
-                            ),
-                            'arguments' => [
-                                'type'  => 'password',
-                                'name'  => 'gotty_pass',
-                                'value' => io_output_password($config['gotty_pass']),
-                            ],
-                        ],
-                    ],
-                ],
-                [
-                    'arguments' => [
-                        'type'  => 'hidden',
-                        'name'  => 'qs_update',
-                        'value' => 1,
-                    ],
-                ],
-                [
-                    'arguments' => [
-                        'type'       => 'submit',
-                        'label'      => __('Update'),
-                        'attributes' => 'class="sub next"',
-                    ],
-                ],
-            ],
-        ],
-        false,
+    $t = new StdClass();
+    $t->data = [];
+    $t->width = '100%';
+    $t->class = 'databox filters';
+    $t->data = [];
+    $t->style[0] = 'font-weight: bold';
+
+    $t->data[0][0] = __('Gotty path');
+    $t->data[0][1] = html_print_input_text(
+        'gotty',
+        $config['gotty'],
+        '',
+        30,
+        100,
         true
     );
 
+    $t->data[1][0] = __('Gotty host');
+    $t->data[1][1] = html_print_input_text(
+        'gotty_host',
+        $config['gotty_host'],
+        '',
+        30,
+        100,
+        true
+    );
+
+    $t->data[2][0] = __('Gotty ssh port');
+    $t->data[2][1] = html_print_input_text(
+        'gotty_ssh_port',
+        $config['gotty_ssh_port'],
+        '',
+        30,
+        100,
+        true
+    );
+
+    $t->data[3][0] = __('Gotty telnet port');
+    $t->data[3][1] = html_print_input_text(
+        'gotty_telnet_port',
+        $config['gotty_telnet_port'],
+        '',
+        30,
+        100,
+        true
+    );
+
+    $hidden = new StdClass();
+    $hidden->data = [];
+    $hidden->width = '100%';
+    $hidden->class = 'databox filters';
+    $hidden->data = [];
+    $hidden->style[0] = 'font-weight: bold';
+
+    $hidden->data[0][0] = __('Gotty user').ui_print_help_tip(
+        __('Optional, set a user to access gotty service'),
+        true
+    );
+    $hidden->data[0][1] = html_print_input_text(
+        'gotty_user',
+        $config['gotty_user'],
+        '',
+        30,
+        100,
+        true
+    );
+
+    $hidden->data[1][0] = __('Gotty password').ui_print_help_tip(
+        __('Optional, set a password to access gotty service'),
+        true
+    );
+    $hidden->data[1][1] = html_print_input_password(
+        'gotty_pass',
+        io_output_password($config['gotty_pass']),
+        '',
+        30,
+        100,
+        true
+    );
+
+    html_print_table($t);
+
+    ui_print_toggle(
+        [
+            'content'         => html_print_table($hidden, true),
+            'name'            => __('Advanced options'),
+            'clean'           => false,
+            'main_class'      => 'no-border-imp',
+            'container_class' => 'no-border-imp',
+        ]
+    );
+
+    echo '</fieldset>';
+
 }
 
 
diff --git a/pandora_console/godmode/extensions.php b/pandora_console/godmode/extensions.php
index abb41cd60e..9a86444910 100644
--- a/pandora_console/godmode/extensions.php
+++ b/pandora_console/godmode/extensions.php
@@ -129,6 +129,7 @@ if ($disabled != '') {
 
 $extensions = extensions_get_extension_info();
 
+$table = new StdClass;
 $table->width = '98%';
 
 $table->head = [];
diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php
index d396bbd953..e9b8160fdd 100644
--- a/pandora_console/godmode/setup/setup.php
+++ b/pandora_console/godmode/setup/setup.php
@@ -133,13 +133,10 @@ $buttons['notifications'] = [
     'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=notifications').'">'.html_print_image('images/alerts_template.png', true, ['title' => __('Notifications')]).'</a>',
 ];
 
-// Enable only if quickshell is enabled.
-if (function_exists('quickShellSettings') === true) {
-    $buttons['quickshell'] = [
-        'active' => false,
-        'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=quickshell').'">'.html_print_image('images/ehorus/terminal.png', true, ['title' => __('Quickshell')]).'</a>',
-    ];
-}
+$buttons['websocket_engine'] = [
+    'active' => false,
+    'text'   => '<a href="'.ui_get_full_url('index.php?sec=gsetup&sec2=godmode/setup/setup&section=websocket_engine').'">'.html_print_image('images/websocket_small.png', true, ['title' => __('Websocket engine')]).'</a>',
+];
 
 $help_header = '';
 if (enterprise_installed()) {
@@ -191,9 +188,9 @@ switch ($section) {
         $subpage = ' &raquo '.__('Notifications');
     break;
 
-    case 'quickshell':
-        $buttons['quickshell']['active'] = true;
-        $subpage = ' &raquo '.__('QuickShell');
+    case 'websocket_engine':
+        $buttons['websocket_engine']['active'] = true;
+        $subpage = ' &raquo '.__('Pandora Websocket Engine');
         $help_header = 'quickshell_settings';
     break;
 
@@ -261,8 +258,8 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/setup/setup_notifications.php';
     break;
 
-    case 'quickshell':
-        quickShellSettings();
+    case 'websocket_engine':
+        include_once $config['homedir'].'/godmode/setup/setup_websocket_engine.php';
     break;
 
     default:
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 46c2c00e44..def984d6af 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -403,50 +403,6 @@ html_print_table($table_mail_conf);
 echo '</fieldset>';
 
 echo '<fieldset>';
-echo '<legend>'.__('WebSocket settings').'</legend>';
-
-$t = new StdClass();
-$t->data = [];
-$t->width = '100%';
-$t->class = 'databox filters';
-$t->data = [];
-$t->style[0] = 'font-weight: bold';
-
-$t->data[0][0] = __('Bind address');
-$t->data[0][1] = html_print_input_text(
-    'ws_bind_address',
-    $config['ws_bind_address'],
-    '',
-    30,
-    100,
-    true
-);
-
-$t->data[1][0] = __('Bind port');
-$t->data[1][2] = html_print_input_text(
-    'ws_port',
-    $config['ws_port'],
-    '',
-    30,
-    100,
-    true
-);
-
-$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip(__('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'), true);
-$t->data[2][2] = html_print_input_text(
-    'ws_proxy_url',
-    $config['ws_proxy_url'],
-    '',
-    30,
-    100,
-    true
-);
-
-html_print_input_hidden('update_config', 1);
-html_print_table($t);
-
-
-echo '</fieldset>';
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
diff --git a/pandora_console/godmode/setup/setup_websocket_engine.php b/pandora_console/godmode/setup/setup_websocket_engine.php
new file mode 100644
index 0000000000..4dec1ac9e7
--- /dev/null
+++ b/pandora_console/godmode/setup/setup_websocket_engine.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Settings for Pandora Websocket engine.
+ *
+ * @category   UI file
+ * @package    Pandora FMS
+ * @subpackage Community
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+global $config;
+
+$url = ui_get_full_url(
+    'index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=websocket_engine&amp;pure='.$config['pure']
+);
+
+echo '<form id="form_setup" method="post" action="'.$url.'">';
+
+echo '<fieldset>';
+echo '<legend>'.__('WebSocket settings').'</legend>';
+
+$t = new StdClass();
+$t->data = [];
+$t->width = '100%';
+$t->class = 'databox filters';
+$t->data = [];
+$t->style[0] = 'font-weight: bold';
+
+$t->data[0][0] = __('Bind address');
+$t->data[0][1] = html_print_input_text(
+    'ws_bind_address',
+    $config['ws_bind_address'],
+    '',
+    30,
+    100,
+    true
+);
+
+$t->data[1][0] = __('Bind port');
+$t->data[1][2] = html_print_input_text(
+    'ws_port',
+    $config['ws_port'],
+    '',
+    30,
+    100,
+    true
+);
+
+$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip(__('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'), true);
+$t->data[2][2] = html_print_input_text(
+    'ws_proxy_url',
+    $config['ws_proxy_url'],
+    '',
+    30,
+    100,
+    true
+);
+
+html_print_input_hidden('update_config', 1);
+html_print_table($t);
+
+
+echo '</fieldset>';
+
+quickShellSettings();
+
+
+echo '<div class="action-buttons" style="width: '.$table->width.'">';
+html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
+echo '</div>';
+echo '</form>';
diff --git a/pandora_console/images/websocket_big.png b/pandora_console/images/websocket_big.png
new file mode 100644
index 0000000000000000000000000000000000000000..0caac15bb8008f468e07a25d5db8a4ade9f3d567
GIT binary patch
literal 7441
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

literal 0
HcmV?d00001

diff --git a/pandora_console/images/websocket_small.png b/pandora_console/images/websocket_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..30a0478abf0b04105ed66b3d268cf8ac00942db1
GIT binary patch
literal 3486
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
M07*qoM6N<$f+s4yF#rGn

literal 0
HcmV?d00001

diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 579cb5ebb5..5a014cbd4b 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -590,6 +590,10 @@ select:-internal-list-box {
 .no-border {
   border: none;
 }
+.no-border-imp,
+.no-border-imp > div {
+  border: none !important;
+}
 .no-padding {
   padding: 0;
 }

From ad6ea431bf8619cec70560a7d2e6ef711316b89a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 13 Dec 2019 13:13:09 +0100
Subject: [PATCH 06/19] minor fix, hide quickshell settings while disabled

---
 pandora_console/godmode/setup/setup_websocket_engine.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_websocket_engine.php b/pandora_console/godmode/setup/setup_websocket_engine.php
index 4dec1ac9e7..2fcfaec302 100644
--- a/pandora_console/godmode/setup/setup_websocket_engine.php
+++ b/pandora_console/godmode/setup/setup_websocket_engine.php
@@ -80,8 +80,9 @@ html_print_table($t);
 
 echo '</fieldset>';
 
-quickShellSettings();
-
+if (function_exists('quickShellSettings') === true) {
+    quickShellSettings();
+}
 
 echo '<div class="action-buttons" style="width: '.$table->width.'">';
 html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');

From a558152cb2fd1951d08e38739c890dc1e55b45b2 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 13 Dec 2019 13:20:44 +0100
Subject: [PATCH 07/19] minor fix

---
 .../godmode/setup/setup_websocket_engine.php       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_websocket_engine.php b/pandora_console/godmode/setup/setup_websocket_engine.php
index 2fcfaec302..fecc60a33c 100644
--- a/pandora_console/godmode/setup/setup_websocket_engine.php
+++ b/pandora_console/godmode/setup/setup_websocket_engine.php
@@ -64,7 +64,10 @@ $t->data[1][2] = html_print_input_text(
     true
 );
 
-$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip(__('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'), true);
+$t->data[2][0] = __('WebSocket proxy url').ui_print_help_tip(
+    __('If you had configured a wsproxy set here target URL (for instance ws://your.public.fqdn/ws).'),
+    true
+);
 $t->data[2][2] = html_print_input_text(
     'ws_proxy_url',
     $config['ws_proxy_url'],
@@ -84,7 +87,12 @@ if (function_exists('quickShellSettings') === true) {
     quickShellSettings();
 }
 
-echo '<div class="action-buttons" style="width: '.$table->width.'">';
-html_print_submit_button(__('Update'), 'update_button', false, 'class="sub upd"');
+echo '<div class="action-buttons" style="width: 100%;">';
+html_print_submit_button(
+    __('Update'),
+    'update_button',
+    false,
+    'class="sub upd"'
+);
 echo '</div>';
 echo '</form>';

From b38c396837d93eedf550e4fec0dd4642bcc6458c Mon Sep 17 00:00:00 2001
From: Tatiana Llorente <tatiana.llorente@artica.es>
Date: Fri, 13 Dec 2019 13:40:19 +0100
Subject: [PATCH 08/19] Change date in hover in compact mode

---
 pandora_console/godmode/setup/setup_visuals.php | 2 +-
 pandora_console/include/functions_ui.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index e07326fe6e..a5355ce148 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -1180,7 +1180,7 @@ $row++;
         $compact = true;
     }
 
-    $table_other->data[$row][0] = __('Timestamp, time comparation, or Compact mode');
+    $table_other->data[$row][0] = __('Timestamp, time comparison, or compact mode');
     $table_other->data[$row][1] = '<div class="switch_radio_button">';
     $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'comparation', __('Comparation in rollover'), $comparation, true);
     $table_other->data[$row][1] .= html_print_radio_button('prominent_time', 'timestamp', __('Timestamp in rollover'), $timestamp, true);
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 9f897767df..f4c9a8b1d4 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -537,7 +537,7 @@ function ui_print_timestamp($unixtime, $return=false, $option=[])
         );
     } else if ($prominent == 'compact') {
         $units = 'tiny';
-        $title = human_time_comparation($unixtime);
+        $title = date($config['date_format'], $unixtime);
         $data = human_time_comparation($unixtime, $units);
     } else {
         $title = date($config['date_format'], $unixtime);

From d30c2c9b3b1c956e7a8c92dc89695b01807aeba4 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Fri, 13 Dec 2019 14:17:25 +0100
Subject: [PATCH 09/19] Fix bug when updating ACL IP list

---
 pandora_console/include/functions_config.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 429c740dfd..0e4dd9940d 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1911,14 +1911,6 @@ function config_process_config()
       * Parse the ACL IP list for access API
       */
 
-    $temp_list_ACL_IPs_for_API = [];
-    if (isset($config['list_ACL_IPs_for_API'])) {
-        if (!empty($config['list_ACL_IPs_for_API'])) {
-            $temp_list_ACL_IPs_for_API = explode(';', $config['list_ACL_IPs_for_API']);
-        }
-    }
-
-    $config['list_ACL_IPs_for_API'] = $temp_list_ACL_IPs_for_API;
     $keysConfig = array_keys($config);
 
     /*
@@ -2976,6 +2968,15 @@ function config_process_config()
 
     // Finally, check if any value was overwritten in a form.
     config_update_config();
+
+    $temp_list_ACL_IPs_for_API = [];
+    if (isset($config['list_ACL_IPs_for_API'])) {
+        if (!empty($config['list_ACL_IPs_for_API'])) {
+            $temp_list_ACL_IPs_for_API = explode(';', $config['list_ACL_IPs_for_API']);
+        }
+    }
+
+    $config['list_ACL_IPs_for_API'] = $temp_list_ACL_IPs_for_API;
 }
 
 

From a203da5a26f6b2613808fa88cebdcbf5676f69da Mon Sep 17 00:00:00 2001
From: Daniel Barbero <daniel.barbero@artica.es>
Date: Fri, 13 Dec 2019 16:01:24 +0100
Subject: [PATCH 10/19] Fixed errors

---
 pandora_console/include/chart_generator.php   |  2 +-
 pandora_console/include/functions.php         | 12 ++++---
 .../include/functions_reporting.php           | 32 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 79242ace64..6ca2caa53b 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -101,7 +101,7 @@ $params = json_decode($_REQUEST['data'], true);
 // Metaconsole connection to the node.
 $server_id = $params['server_id'];
 
-if ($config['metaconsole'] && !empty($server_id)) {
+if (is_metaconsole() && !empty($server_id)) {
     $server = metaconsole_get_connection_by_id($server_id);
     // Error connecting.
     if (metaconsole_connect($server) !== NOERR) {
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index a3cbaabdf4..f2e350dc8f 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -3851,9 +3851,11 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
     $file_js  = $config['homedir'].'/include/web2image.js';
     $url      = ui_get_full_url(false).$hack_metaconsole.'/include/chart_generator.php';
 
-    $img_file = 'img_'.uniqid().'.png';
-    $img_path = $config['homedir'].'/attachment/'.$img_file;
-    $img_url  = ui_get_full_url(false).$hack_metaconsole.'/attachment/'.$img_file;
+    if (!$params['return_img_base_64']) {
+        $img_file = 'img_'.uniqid().'.png';
+        $img_path = $config['homedir'].'/attachment/'.$img_file;
+        $img_url  = ui_get_full_url(false).$hack_metaconsole.'/attachment/'.$img_file;
+    }
 
     $width_img  = 500;
 
@@ -3866,8 +3868,8 @@ function generator_chart_to_pdf($type_graph_pdf, $params, $params_combined=false
     }
 
     if ($type_graph_pdf === 'slicebar') {
-        $height_img = 70;
-        $params['height'] = 70;
+        $height_img = 90;
+        $params['height'] = 90;
     }
 
     $params_encode_json = urlencode(json_encode($params));
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 2f1c481679..3dd290e59e 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -291,16 +291,18 @@ function reporting_make_reporting_data(
             $agents_to_macro = $content['id_agent'];
         }
 
-        // Metaconsole connection.
-        if (is_metaconsole()) {
-            $server = metaconsole_get_connection_names();
-            $connection = metaconsole_get_connection($server);
-            if (metaconsole_connect($connection) != NOERR) {
-                continue;
-            }
-        }
-
         if (isset($content['style']['name_label'])) {
+            $server_name = $content['server_name'];
+            $metaconsole_on = is_metaconsole();
+
+            // Metaconsole connection.
+            if ($metaconsole_on && $server_name != '') {
+                $connection = metaconsole_get_connection($server_name);
+                if (!metaconsole_load_external_db($connection)) {
+                    continue;
+                }
+            }
+
             // Add macros name.
             $items_label = [];
             $items_label['type'] = $content['type'];
@@ -309,8 +311,6 @@ function reporting_make_reporting_data(
             $items_label['modules'] = $modules_to_macro;
             $items_label['agents'] = $agents_to_macro;
             $items_label['visual_format'] = $visual_format;
-            $metaconsole_on = is_metaconsole();
-            $server_name = $content['server_name'];
 
             $items_label['agent_description'] = agents_get_description(
                 $content['id_agent']
@@ -7551,12 +7551,10 @@ function reporting_custom_graph(
 
     if ($type_report == 'custom_graph') {
         if (is_metaconsole()) {
-            $servers = metaconsole_get_connection_names();
-            foreach ($servers as $server) {
-                $connection = metaconsole_get_connection($server);
-                if (metaconsole_connect($connection) != NOERR) {
-                    continue;
-                }
+            $id_meta = metaconsole_get_id_server($content['server_name']);
+            $server  = metaconsole_get_connection_by_id($id_meta);
+            if (metaconsole_connect($server) != NOERR) {
+                return false;
             }
         }
     }

From e43d8914aa83fa1c43d2ad04fc9e4329ded7afa3 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 10:46:37 +0100
Subject: [PATCH 11/19] RPMBUILD console updated with gotty binary file

---
 extras/build_rpm.sh                         | 12 ++++++++++++
 extras/build_rpm_redhat.sh                  | 12 ++++++++++++
 extras/build_rpm_rhel7.sh                   | 16 ++++++++++++++--
 pandora_console/pandora_console.redhat.spec |  4 ++++
 pandora_console/pandora_console.rhel7.spec  |  4 ++++
 pandora_console/pandora_console.spec        |  4 ++++
 6 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh
index f523eeaa7d..054434de71 100755
--- a/extras/build_rpm.sh
+++ b/extras/build_rpm.sh
@@ -8,8 +8,20 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
+# Extra files to be added to rpm.
+if [ "$X86_64" == "" ]; then
+	# Fake gotty.
+	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
+	chmod +x pandora_console/gotty
+else 
+	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
+fi
+
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.spec || exit 1
 
+# Cleanup.
+rm -f pandora_console/gotty
+
 # Server
 rpmbuild -ba $CODEHOME/pandora_server/pandora_server.spec || exit 1
 
diff --git a/extras/build_rpm_redhat.sh b/extras/build_rpm_redhat.sh
index 7f45bc6773..001120ae4d 100755
--- a/extras/build_rpm_redhat.sh
+++ b/extras/build_rpm_redhat.sh
@@ -8,8 +8,20 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
+# Extra files to be added to rpm.
+if [ "$X86_64" == "" ]; then
+	# Fake gotty.
+	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
+	chmod +x pandora_console/gotty
+else 
+	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
+fi
+
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.redhat.spec || exit 1
 
+# Cleanup.
+rm -f pandora_console/gotty
+
 # Server
 rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.spec || exit 1
 
diff --git a/extras/build_rpm_rhel7.sh b/extras/build_rpm_rhel7.sh
index 3684bd42e5..9ddb0aedf7 100755
--- a/extras/build_rpm_rhel7.sh
+++ b/extras/build_rpm_rhel7.sh
@@ -8,13 +8,25 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
+# Extra files to be added to rpm.
+if [ "$X86_64" == "" ]; then
+	# Fake gotty.
+	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
+	chmod +x pandora_console/gotty
+else 
+	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
+fi
+
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.rhel7.spec || exit 1
 
+# Cleanup.
+rm -f pandora_console/gotty
+
 # Server
-#rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1
+rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.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.redhat.spec || exit 1
 
 # Enterprise console
 rpmbuild -ba $PANDHOME_ENT/pandora_console/enterprise/pandora_console_enterprise.rhel7.spec || exit 1
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 1d2c818edf..a9e4dc262a 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -57,6 +57,10 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
 rm -rf $RPM_BUILD_ROOT
 
 %post
+# Install GoTTY binary file.
+cp -pf %{prefix}/pandora_console/gotty /usr/bin/
+chmod +x /usr/bin/gotty
+
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index d74a29fa16..f8aab6db42 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -57,6 +57,10 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
 rm -rf $RPM_BUILD_ROOT
 
 %post
+# Install GoTTY binary file.
+cp -pf %{prefix}/pandora_console/gotty /usr/bin/
+chmod +x /usr/bin/gotty
+
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 96594c4f5b..8017b1f295 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -58,6 +58,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %post
+# Install GoTTY binary file.
+cp -pf %{prefix}/pandora_console/gotty /usr/bin/
+chmod +x /usr/bin/gotty
+
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine

From d370fa560a86cb78f91fad53949a49d59cc847bf Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 10:51:24 +0100
Subject: [PATCH 12/19] DEBIAN console updated with gotty binary file

---
 extras/build_deb.sh             | 11 +++++++++++
 pandora_console/DEBIAN/postinst |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/extras/build_deb.sh b/extras/build_deb.sh
index 788eb72536..543469d473 100755
--- a/extras/build_deb.sh
+++ b/extras/build_deb.sh
@@ -8,8 +8,19 @@ fi
 echo "Creating DEB packages in $RPMHOME/DEB"
 
 # Console
+# Extra files to be added to rpm.
+if [ "$X86_64" == "" ]; then
+	# Fake gotty.
+	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
+	chmod +x pandora_console/gotty
+else 
+	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
+fi
 cd $CODEHOME/pandora_console/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1
 
+# Cleanup.
+rm -f pandora_console/gotty
+
 # Server
 cd $CODEHOME/pandora_server/DEBIAN  && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1
 
diff --git a/pandora_console/DEBIAN/postinst b/pandora_console/DEBIAN/postinst
index a899c6bf0a..f6fe667ff5 100755
--- a/pandora_console/DEBIAN/postinst
+++ b/pandora_console/DEBIAN/postinst
@@ -10,6 +10,9 @@ if [ -f /etc/init.d/apache2 ]; then
 echo Restart the apache.
 /etc/init.d/apache2 restart
 fi
+# Install GoTTY binary file.
+cp -pf %{prefix}/pandora_console/gotty /usr/bin/
+chmod +x /usr/bin/gotty
 
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/

From 79cad3eaa97c7cc01ad2effed24f92f6a48bda9f Mon Sep 17 00:00:00 2001
From: artica <git@artica.es>
Date: Mon, 16 Dec 2019 11:43:58 +0100
Subject: [PATCH 13/19] Updated version and build strings.

---
 pandora_agents/pc/AIX/pandora_agent.conf               | 2 +-
 pandora_agents/pc/FreeBSD/pandora_agent.conf           | 2 +-
 pandora_agents/pc/HP-UX/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Linux/pandora_agent.conf             | 2 +-
 pandora_agents/pc/NT4/pandora_agent.conf               | 2 +-
 pandora_agents/pc/SunOS/pandora_agent.conf             | 2 +-
 pandora_agents/pc/Win32/pandora_agent.conf             | 2 +-
 pandora_agents/shellscript/aix/pandora_agent.conf      | 2 +-
 pandora_agents/shellscript/bsd-ipso/pandora_agent.conf | 2 +-
 pandora_agents/shellscript/hp-ux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/linux/pandora_agent.conf    | 2 +-
 pandora_agents/shellscript/mac_osx/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/openWRT/pandora_agent.conf  | 2 +-
 pandora_agents/shellscript/solaris/pandora_agent.conf  | 2 +-
 pandora_agents/unix/AIX/pandora_agent.conf             | 2 +-
 pandora_agents/unix/DEBIAN/control                     | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh         | 2 +-
 pandora_agents/unix/Darwin/pandora_agent.conf          | 2 +-
 pandora_agents/unix/FreeBSD/pandora_agent.conf         | 2 +-
 pandora_agents/unix/HP-UX/pandora_agent.conf           | 2 +-
 pandora_agents/unix/Linux/pandora_agent.conf           | 2 +-
 pandora_agents/unix/NT4/pandora_agent.conf             | 2 +-
 pandora_agents/unix/NetBSD/pandora_agent.conf          | 2 +-
 pandora_agents/unix/SunOS/pandora_agent.conf           | 2 +-
 pandora_agents/unix/pandora_agent                      | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec          | 4 ++--
 pandora_agents/unix/pandora_agent.spec                 | 4 ++--
 pandora_agents/unix/pandora_agent_installer            | 2 +-
 pandora_agents/win32/bin/pandora_agent.conf            | 2 +-
 pandora_agents/win32/installer/pandora.mpi             | 4 ++--
 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            | 4 ++--
 pandora_console/pandora_console.rhel7.spec             | 4 ++--
 pandora_console/pandora_console.spec                   | 4 ++--
 pandora_console/pandora_console_install                | 2 +-
 pandora_server/DEBIAN/control                          | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh              | 2 +-
 pandora_server/conf/pandora_server.conf.new            | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm                | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm           | 2 +-
 pandora_server/pandora_server.redhat.spec              | 4 ++--
 pandora_server/pandora_server.spec                     | 4 ++--
 pandora_server/pandora_server_installer                | 2 +-
 pandora_server/util/pandora_db.pl                      | 2 +-
 pandora_server/util/pandora_manage.pl                  | 2 +-
 50 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/pandora_agents/pc/AIX/pandora_agent.conf b/pandora_agents/pc/AIX/pandora_agent.conf
index bf26d33be8..b242e667c1 100644
--- a/pandora_agents/pc/AIX/pandora_agent.conf
+++ b/pandora_agents/pc/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, AIX version
+# Version 7.0NG.742, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/FreeBSD/pandora_agent.conf b/pandora_agents/pc/FreeBSD/pandora_agent.conf
index fffddfa142..4fd4b92596 100644
--- a/pandora_agents/pc/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/pc/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, FreeBSD Version
+# Version 7.0NG.742, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/HP-UX/pandora_agent.conf b/pandora_agents/pc/HP-UX/pandora_agent.conf
index 3d22eafb0e..e0af4e7490 100644
--- a/pandora_agents/pc/HP-UX/pandora_agent.conf
+++ b/pandora_agents/pc/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, HP-UX Version
+# Version 7.0NG.742, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Linux/pandora_agent.conf b/pandora_agents/pc/Linux/pandora_agent.conf
index 01359f33f5..fe67398b8a 100644
--- a/pandora_agents/pc/Linux/pandora_agent.conf
+++ b/pandora_agents/pc/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, GNU/Linux
+# Version 7.0NG.742, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/NT4/pandora_agent.conf b/pandora_agents/pc/NT4/pandora_agent.conf
index ab8a35f9f8..092436f485 100644
--- a/pandora_agents/pc/NT4/pandora_agent.conf
+++ b/pandora_agents/pc/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, GNU/Linux
+# Version 7.0NG.742, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/SunOS/pandora_agent.conf b/pandora_agents/pc/SunOS/pandora_agent.conf
index 90c1ba02a1..a2162ac29f 100644
--- a/pandora_agents/pc/SunOS/pandora_agent.conf
+++ b/pandora_agents/pc/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, Solaris Version
+# Version 7.0NG.742, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/pc/Win32/pandora_agent.conf b/pandora_agents/pc/Win32/pandora_agent.conf
index 61eab4edeb..e582bbd963 100644
--- a/pandora_agents/pc/Win32/pandora_agent.conf
+++ b/pandora_agents/pc/Win32/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2010 Artica Soluciones Tecnologicas 
-# Version 7.0NG.741
+# Version 7.0NG.742
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/shellscript/aix/pandora_agent.conf b/pandora_agents/shellscript/aix/pandora_agent.conf
index 3409d48740..80762acbb7 100644
--- a/pandora_agents/shellscript/aix/pandora_agent.conf
+++ b/pandora_agents/shellscript/aix/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.741, AIX version
+# Version 7.0NG.742, AIX version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
index b8306e30c3..4ac18ede49 100644
--- a/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
+++ b/pandora_agents/shellscript/bsd-ipso/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.741
+# Version 7.0NG.742
 # FreeBSD/IPSO version
 # Licenced under GPL licence, 2003-2007 Sancho Lerena
 
diff --git a/pandora_agents/shellscript/hp-ux/pandora_agent.conf b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
index 15d2dab2d4..925081e62c 100644
--- a/pandora_agents/shellscript/hp-ux/pandora_agent.conf
+++ b/pandora_agents/shellscript/hp-ux/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.741, HPUX Version
+# Version 7.0NG.742, HPUX Version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/shellscript/linux/pandora_agent.conf b/pandora_agents/shellscript/linux/pandora_agent.conf
index dbe433408f..68ced2a378 100644
--- a/pandora_agents/shellscript/linux/pandora_agent.conf
+++ b/pandora_agents/shellscript/linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741
+# Version 7.0NG.742
 # Licensed under GPL license v2,
 # (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/mac_osx/pandora_agent.conf b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
index 4ad2f0d8df..495c2516d4 100644
--- a/pandora_agents/shellscript/mac_osx/pandora_agent.conf
+++ b/pandora_agents/shellscript/mac_osx/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741
+# Version 7.0NG.742
 # Licensed under GPL license v2,
 # (c) 2003-2009 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
diff --git a/pandora_agents/shellscript/openWRT/pandora_agent.conf b/pandora_agents/shellscript/openWRT/pandora_agent.conf
index 594f626617..f18f326a05 100644
--- a/pandora_agents/shellscript/openWRT/pandora_agent.conf
+++ b/pandora_agents/shellscript/openWRT/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741
+# Version 7.0NG.742
 # Licensed under GPL license v2,
 # please visit http://pandora.sourceforge.net
 
diff --git a/pandora_agents/shellscript/solaris/pandora_agent.conf b/pandora_agents/shellscript/solaris/pandora_agent.conf
index eace98cb90..e319d9695f 100644
--- a/pandora_agents/shellscript/solaris/pandora_agent.conf
+++ b/pandora_agents/shellscript/solaris/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Fichero de configuracion base de agentes de Pandora
 # Base config file for Pandora agents
-# Version 7.0NG.741, Solaris version
+# Version 7.0NG.742, Solaris version
 
 # General Parameters
 # ==================
diff --git a/pandora_agents/unix/AIX/pandora_agent.conf b/pandora_agents/unix/AIX/pandora_agent.conf
index 2a02b6133f..604509d18d 100644
--- a/pandora_agents/unix/AIX/pandora_agent.conf
+++ b/pandora_agents/unix/AIX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, AIX version
+# Version 7.0NG.742, AIX version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 5e8c5557ea..9b2e9bf9d1 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.741-191216
+Version: 7.0NG.742
 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 f67f7df6d8..82745deed0 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.741-191216"
+pandora_version="7.0NG.742"
 
 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/Darwin/pandora_agent.conf b/pandora_agents/unix/Darwin/pandora_agent.conf
index adf05bac05..1daa7b6ddc 100644
--- a/pandora_agents/unix/Darwin/pandora_agent.conf
+++ b/pandora_agents/unix/Darwin/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, GNU/Linux
+# Version 7.0NG.742, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2012 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/FreeBSD/pandora_agent.conf b/pandora_agents/unix/FreeBSD/pandora_agent.conf
index e5e3a2cc1b..e8d62cc68f 100644
--- a/pandora_agents/unix/FreeBSD/pandora_agent.conf
+++ b/pandora_agents/unix/FreeBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, FreeBSD Version
+# Version 7.0NG.742, FreeBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2016 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/HP-UX/pandora_agent.conf b/pandora_agents/unix/HP-UX/pandora_agent.conf
index 409f06034b..05770c02aa 100644
--- a/pandora_agents/unix/HP-UX/pandora_agent.conf
+++ b/pandora_agents/unix/HP-UX/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, HP-UX Version
+# Version 7.0NG.742, HP-UX Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/Linux/pandora_agent.conf b/pandora_agents/unix/Linux/pandora_agent.conf
index 6340281c06..3aafa0fc85 100644
--- a/pandora_agents/unix/Linux/pandora_agent.conf
+++ b/pandora_agents/unix/Linux/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, GNU/Linux
+# Version 7.0NG.742, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2014 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NT4/pandora_agent.conf b/pandora_agents/unix/NT4/pandora_agent.conf
index c27a3f2da2..a99efbc9c8 100644
--- a/pandora_agents/unix/NT4/pandora_agent.conf
+++ b/pandora_agents/unix/NT4/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, GNU/Linux
+# Version 7.0NG.742, GNU/Linux
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/NetBSD/pandora_agent.conf b/pandora_agents/unix/NetBSD/pandora_agent.conf
index ab0ca2ad46..228d95c9f1 100644
--- a/pandora_agents/unix/NetBSD/pandora_agent.conf
+++ b/pandora_agents/unix/NetBSD/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, NetBSD Version
+# Version 7.0NG.742, NetBSD Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2010 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/SunOS/pandora_agent.conf b/pandora_agents/unix/SunOS/pandora_agent.conf
index 4b6654b6ef..7fc6e08f1d 100644
--- a/pandora_agents/unix/SunOS/pandora_agent.conf
+++ b/pandora_agents/unix/SunOS/pandora_agent.conf
@@ -1,5 +1,5 @@
 # Base config file for Pandora FMS agents
-# Version 7.0NG.741, Solaris Version
+# Version 7.0NG.742, Solaris Version
 # Licensed under GPL license v2,
 # Copyright (c) 2003-2009 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index d47366fc63..044c66f77f 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -54,7 +54,7 @@ my $Sem = undef;
 # Semaphore used to control the number of threads
 my $ThreadSem = undef;
 
-use constant AGENT_VERSION => '7.0NG.741';
+use constant AGENT_VERSION => '7.0NG.742';
 use constant AGENT_BUILD => '191216';
 
 # Agent log default file size maximum and instances
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 92c4c50f60..07e664663b 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 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 2a3685a78a..8327d8401a 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -2,8 +2,8 @@
 #Pandora FMS Linux Agent
 #
 %define name        pandorafms_agent_unix
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 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 9419542f26..66ec9cce29 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -9,7 +9,7 @@
 # Please see http://www.pandorafms.org. This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.741"
+PI_VERSION="7.0NG.742"
 PI_BUILD="191216"
 OS_NAME=`uname -s`
 
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 8b51fc94f1..3e519fa738 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -1,6 +1,6 @@
 # Base config file for Pandora FMS Windows Agent
 # (c) 2006-2017 Artica Soluciones Tecnologicas 
-# Version 7.0NG.741
+# Version 7.0NG.742
 
 # This program is Free Software, you can redistribute it and/or modify it
 # under the terms of the GNU General Public Licence as published by the Free Software
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 69f4979360..fd13c838a3 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -3,7 +3,7 @@ AllowLanguageSelection
 {Yes}
 
 AppName
-{Pandora FMS Windows Agent v7.0NG.741}
+{Pandora FMS Windows Agent v7.0NG.742}
 
 ApplicationID
 {17E3D2CF-CA02-406B-8A80-9D31C17BD08F}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index c6cd764212..e02765f1a2 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.741(Build 191216)")
+#define PANDORA_VERSION ("7.0NG.742(Build 191216)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index bac4f5bfb6..27f352a4e7 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.741(Build 191216))"
+      VALUE "ProductVersion", "(7.0NG.742(Build 191216))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3e2057f671..6ad2a6df2b 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.741-191216
+Version: 7.0NG.742
 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 f8c38969f7..7d8b4cc557 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.741-191216"
+pandora_version="7.0NG.742"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 46ee41ed64..fae97667d2 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -21,7 +21,7 @@
  * Pandora build version and version
  */
 $build_version = 'PC191216';
-$pandora_version = 'v7.0NG.741';
+$pandora_version = 'v7.0NG.742';
 
 // Do not overwrite default timezone set if defined.
 $script_tz = @date_default_timezone_get();
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 9322aa7ff5..fb95696ce2 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -128,7 +128,7 @@
         </div>
         <div style='height: 10px'>
             <?php
-            $version = '7.0NG.741';
+            $version = '7.0NG.742';
             $build = '191216';
             $banner = "v$version Build $build";
 
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 578e6975b7..3e89826c57 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 # 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 fae874db5d..806184dbe5 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 # 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 f7621b3e86..a1e3d51223 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Console
 #
 %define name        pandorafms_console
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index 58b670d218..e6ada8b06d 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.741"
+PI_VERSION="7.0NG.742"
 FORCE=0
 DESTDIR=""
 LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index f093398166..e6fc1f8c53 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.741-191216
+Version: 7.0NG.742
 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 f65aeb5af8..2204248279 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.741-191216"
+pandora_version="7.0NG.742"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 99b1e34ba6..fa9491ce14 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
 #############################################################################
 # Pandora FMS Server Parameters
 # Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.741
+# Version 7.0NG.742
 # Licensed under GPL license v2,
 # (c) 2003-2017 Artica Soluciones Tecnologicas
 # http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 4fc6f831ff..2bdd64b505 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -44,7 +44,7 @@ our @EXPORT = qw(
 	);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.741";
+my $pandora_version = "7.0NG.742";
 my $pandora_build = "191216";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4b2b83f329..20efa9089f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,7 +31,7 @@ use base 'Exporter';
 our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.741";
+my $pandora_version = "7.0NG.742";
 my $pandora_build = "191216";
 our $VERSION = $pandora_version." ".$pandora_build;
 
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 9a59555f89..b1fb46aaa2 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index a10a8a9583..7eaeb1c07f 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
 # Pandora FMS Server 
 #
 %define name        pandorafms_server
-%define version     7.0NG.741
-%define release     191216
+%define version     7.0NG.742
+%define release     1
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index af21ac7c0f..f8d92675ba 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,7 +8,7 @@
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION="7.0NG.741"
+PI_VERSION="7.0NG.742"
 PI_BUILD="191216"
 
 MODE=$1
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5f118b6085..5d2fe5d1f2 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.741 PS191216";
+my $version = "7.0NG.742 PS191216";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 259680cb49..2405c46140 100755
--- 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.741 PS191216";
+my $version = "7.0NG.742 PS191216";
 
 # save program name for logging
 my $progname = basename($0);

From c2d0377a8da30a42a7507300ed464926a4350253 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 12:16:21 +0100
Subject: [PATCH 14/19] Revert "RPMBUILD console updated with gotty binary
 file"

Undo Gotty in Pandora Console RPM

This reverts commit e43d8914aa83fa1c43d2ad04fc9e4329ded7afa3.
---
 extras/build_rpm.sh                         | 12 ------------
 extras/build_rpm_redhat.sh                  | 12 ------------
 extras/build_rpm_rhel7.sh                   | 16 ++--------------
 pandora_console/pandora_console.redhat.spec |  4 ----
 pandora_console/pandora_console.rhel7.spec  |  4 ----
 pandora_console/pandora_console.spec        |  4 ----
 6 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/extras/build_rpm.sh b/extras/build_rpm.sh
index 054434de71..f523eeaa7d 100755
--- a/extras/build_rpm.sh
+++ b/extras/build_rpm.sh
@@ -8,20 +8,8 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
-# Extra files to be added to rpm.
-if [ "$X86_64" == "" ]; then
-	# Fake gotty.
-	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
-	chmod +x pandora_console/gotty
-else 
-	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
-fi
-
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.spec || exit 1
 
-# Cleanup.
-rm -f pandora_console/gotty
-
 # Server
 rpmbuild -ba $CODEHOME/pandora_server/pandora_server.spec || exit 1
 
diff --git a/extras/build_rpm_redhat.sh b/extras/build_rpm_redhat.sh
index 001120ae4d..7f45bc6773 100755
--- a/extras/build_rpm_redhat.sh
+++ b/extras/build_rpm_redhat.sh
@@ -8,20 +8,8 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
-# Extra files to be added to rpm.
-if [ "$X86_64" == "" ]; then
-	# Fake gotty.
-	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
-	chmod +x pandora_console/gotty
-else 
-	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
-fi
-
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.redhat.spec || exit 1
 
-# Cleanup.
-rm -f pandora_console/gotty
-
 # Server
 rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.spec || exit 1
 
diff --git a/extras/build_rpm_rhel7.sh b/extras/build_rpm_rhel7.sh
index 9ddb0aedf7..3684bd42e5 100755
--- a/extras/build_rpm_rhel7.sh
+++ b/extras/build_rpm_rhel7.sh
@@ -8,25 +8,13 @@ fi
 echo "Creating RPM packages in $RPMHOME/RPMS"
 
 # Console
-# Extra files to be added to rpm.
-if [ "$X86_64" == "" ]; then
-	# Fake gotty.
-	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
-	chmod +x pandora_console/gotty
-else 
-	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
-fi
-
 rpmbuild -ba $CODEHOME/pandora_console/pandora_console.rhel7.spec || exit 1
 
-# Cleanup.
-rm -f pandora_console/gotty
-
 # Server
-rpmbuild -ba $CODEHOME/pandora_server/pandora_server.redhat.spec || exit 1
+#rpmbuild -ba $CODEHOME/pandora_server/pandora_server.rhel7.spec || exit 1
 
 # Unix agent
-rpmbuild -ba $CODEHOME/pandora_agents/unix/pandora_agent.redhat.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
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index a9e4dc262a..1d2c818edf 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -57,10 +57,6 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# Install GoTTY binary file.
-cp -pf %{prefix}/pandora_console/gotty /usr/bin/
-chmod +x /usr/bin/gotty
-
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index f8aab6db42..d74a29fa16 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -57,10 +57,6 @@ install -m 0644 pandora_console_logrotate_centos $RPM_BUILD_ROOT%{_sysconfdir}/l
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# Install GoTTY binary file.
-cp -pf %{prefix}/pandora_console/gotty /usr/bin/
-chmod +x /usr/bin/gotty
-
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 8017b1f295..96594c4f5b 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -58,10 +58,6 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# Install GoTTY binary file.
-cp -pf %{prefix}/pandora_console/gotty /usr/bin/
-chmod +x /usr/bin/gotty
-
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/
 chmod +x /etc/init.d/pandora_websocket_engine

From 89b97e340e5fd353e81fee052783263c00b179fd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 12:16:42 +0100
Subject: [PATCH 15/19] Revert "DEBIAN console updated with gotty binary file"

Undo GoTTY in Pandora Console DEB packages

This reverts commit d370fa560a86cb78f91fad53949a49d59cc847bf.
---
 extras/build_deb.sh             | 11 -----------
 pandora_console/DEBIAN/postinst |  3 ---
 2 files changed, 14 deletions(-)

diff --git a/extras/build_deb.sh b/extras/build_deb.sh
index 543469d473..788eb72536 100755
--- a/extras/build_deb.sh
+++ b/extras/build_deb.sh
@@ -8,19 +8,8 @@ fi
 echo "Creating DEB packages in $RPMHOME/DEB"
 
 # Console
-# Extra files to be added to rpm.
-if [ "$X86_64" == "" ]; then
-	# Fake gotty.
-	echo 'Only x86_64 is supported' > $CODEHOME/pandora_console/gotty
-	chmod +x pandora_console/gotty
-else 
-	cp /root/bin/winexe/x64/gotty $CODEHOME/pandora_console/
-fi
 cd $CODEHOME/pandora_console/DEBIAN && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1
 
-# Cleanup.
-rm -f pandora_console/gotty
-
 # Server
 cd $CODEHOME/pandora_server/DEBIAN  && bash ./make_deb_package.sh && mv ../*.deb $RPMHOME/DEB || exit 1
 
diff --git a/pandora_console/DEBIAN/postinst b/pandora_console/DEBIAN/postinst
index f6fe667ff5..a899c6bf0a 100755
--- a/pandora_console/DEBIAN/postinst
+++ b/pandora_console/DEBIAN/postinst
@@ -10,9 +10,6 @@ if [ -f /etc/init.d/apache2 ]; then
 echo Restart the apache.
 /etc/init.d/apache2 restart
 fi
-# Install GoTTY binary file.
-cp -pf %{prefix}/pandora_console/gotty /usr/bin/
-chmod +x /usr/bin/gotty
 
 # Install pandora_websocket_engine service.
 cp -pf %{prefix}/pandora_console/pandora_websocket_engine /etc/init.d/

From abd2213e71168360b8298a79917f573c8a70a03a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 15:42:54 +0100
Subject: [PATCH 16/19] Menu entry for websocket engine settings

---
 pandora_console/godmode/menu.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index b1f8685ada..14b66eda3c 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -316,12 +316,8 @@ if (check_acl($config['id_user'], 0, 'PM')) {
     $sub2['godmode/setup/setup&amp;section=notifications']['text'] = __('Notifications');
     $sub2['godmode/setup/setup&amp;section=notifications']['refr'] = 0;
 
-
-    // Enable only if quickshell is enabled.
-    if (function_exists('quickShellSettings') === true) {
-        $sub2['godmode/setup/setup&amp;section=quickshell']['text'] = __('QuickShell');
-        $sub2['godmode/setup/setup&amp;section=quickshell']['refr'] = 0;
-    }
+    $sub2['godmode/setup/setup&amp;section=websocket_engine']['text'] = __('Websocket Engine');
+    $sub2['godmode/setup/setup&amp;section=websocket_engine']['refr'] = 0;
 
     if ($config['activate_gis']) {
         $sub2['godmode/setup/gis']['text'] = __('Map conections GIS');

From 8bde504fc23125c1bb38833f6b10eba0a47fd16e Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Mon, 16 Dec 2019 15:50:21 +0100
Subject: [PATCH 17/19] Fixed item sql

---
 .../reporting_builder.item_editor.php         |  2 +-
 .../include/functions_reporting.php           | 42 ++++---------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 4bfe60814b..f95ba7cee9 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1856,7 +1856,7 @@ $class = 'databox filters';
                     'combo_server',
                     $server_name,
                     '',
-                    __('Select server'),
+                    __('Local metaconsole'),
                     0
                 );
                 ?>
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 3dd290e59e..8b2e6eb819 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -5092,37 +5092,13 @@ function reporting_sql($report, $content)
     }
 
     if ($content['treport_custom_sql_id'] != 0) {
-        switch ($config['dbtype']) {
-            case 'mysql':
-                $sql = io_safe_output(
-                    db_get_value_filter(
-                        '`sql`',
-                        'treport_custom_sql',
-                        ['id' => $content['treport_custom_sql_id']]
-                    )
-                );
-            break;
-
-            case 'postgresql':
-                $sql = io_safe_output(
-                    db_get_value_filter(
-                        '"sql"',
-                        'treport_custom_sql',
-                        ['id' => $content['treport_custom_sql_id']]
-                    )
-                );
-            break;
-
-            case 'oracle':
-                $sql = io_safe_output(
-                    db_get_value_filter(
-                        'sql',
-                        'treport_custom_sql',
-                        ['id' => $content['treport_custom_sql_id']]
-                    )
-                );
-            break;
-        }
+        $sql = io_safe_output(
+            db_get_value_filter(
+                '`sql`',
+                'treport_custom_sql',
+                ['id' => $content['treport_custom_sql_id']]
+            )
+        );
     } else {
         $sql = io_safe_output($content['external_source']);
     }
@@ -5152,10 +5128,6 @@ function reporting_sql($report, $content)
             $historical_db = $content['historical_db'];
         }
 
-        if (is_metaconsole()) {
-            metaconsole_restore_db();
-        }
-
         $result = db_get_all_rows_sql($sql, $historical_db);
         if ($result !== false) {
             foreach ($result as $row) {

From 4631d9ea644d8899a310ca883b604d12d8421e31 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 16 Dec 2019 16:48:29 +0100
Subject: [PATCH 18/19] minor style fix

---
 pandora_console/extensions/quick_shell.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pandora_console/extensions/quick_shell.php b/pandora_console/extensions/quick_shell.php
index 8228c9f59d..6b70ae21e8 100644
--- a/pandora_console/extensions/quick_shell.php
+++ b/pandora_console/extensions/quick_shell.php
@@ -398,7 +398,8 @@ function quickShellSettings()
     $t->width = '100%';
     $t->class = 'databox filters';
     $t->data = [];
-    $t->style[0] = 'font-weight: bold';
+    $t->style = [];
+    $t->style[0] = 'font-weight: bold; width: 40%;';
 
     $t->data[0][0] = __('Gotty path');
     $t->data[0][1] = html_print_input_text(
@@ -445,7 +446,7 @@ function quickShellSettings()
     $hidden->width = '100%';
     $hidden->class = 'databox filters';
     $hidden->data = [];
-    $hidden->style[0] = 'font-weight: bold';
+    $hidden->style[0] = 'font-weight: bold;width: 40%;';
 
     $hidden->data[0][0] = __('Gotty user').ui_print_help_tip(
         __('Optional, set a user to access gotty service'),

From 0b0c38f9c0ab9a1cb7079a9b2c78d8d7be285019 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 17 Dec 2019 00:01:10 +0100
Subject: [PATCH 19/19] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 4 ++--
 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, 26 insertions(+), 26 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 9b2e9bf9d1..d0a9b4fc46 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.742
+Version: 7.0NG.742-191217
 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 82745deed0..bbd81c6f51 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.742"
+pandora_version="7.0NG.742-191217"
 
 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 044c66f77f..59ab0b9530 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -55,7 +55,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.742';
-use constant AGENT_BUILD => '191216';
+use constant AGENT_BUILD => '191217';
 
 # 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 07e664663b..10e99ce4dc 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.742
-%define release     1
+%define release     191217
 
 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 8327d8401a..4bf932d9cd 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.742
-%define release     1
+%define release     191217
 
 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 66ec9cce29..7c1a0f802b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.742"
-PI_BUILD="191216"
+PI_BUILD="191217"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index fd13c838a3..774fa3d46e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{191216}
+{191217}
 
 ViewReadme
 {Yes}
@@ -2387,7 +2387,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-Setup<%Ext%>}
+{<%AppName%>-<%Version%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e02765f1a2..e4b720807c 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.742(Build 191216)")
+#define PANDORA_VERSION ("7.0NG.742(Build 191217)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 27f352a4e7..32e28abb66 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.742(Build 191216))"
+      VALUE "ProductVersion", "(7.0NG.742(Build 191217))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 6ad2a6df2b..0c893684f3 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.742
+Version: 7.0NG.742-191217
 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 7d8b4cc557..57885c0b67 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.742"
+pandora_version="7.0NG.742-191217"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index fae97667d2..b1359e74d8 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 = 'PC191216';
+$build_version = 'PC191217';
 $pandora_version = 'v7.0NG.742';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index fb95696ce2..837221b102 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.742';
-            $build = '191216';
+            $build = '191217';
             $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 28eef4440b..b87dc2ad0f 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.742
-%define release     1
+%define release     191217
 
 # 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 6d2bedd64f..06e4dcef02 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.742
-%define release     1
+%define release     191217
 
 # 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 f8a7ff8683..bb2d7805c4 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.742
-%define release     1
+%define release     191217
 %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 e6fc1f8c53..a8491f6571 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.742
+Version: 7.0NG.742-191217
 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 2204248279..033ddf4b88 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.742"
+pandora_version="7.0NG.742-191217"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 2bdd64b505..60c50a394f 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.742";
-my $pandora_build = "191216";
+my $pandora_build = "191217";
 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 20efa9089f..6ac9783c33 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.742";
-my $pandora_build = "191216";
+my $pandora_build = "191217";
 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 b1fb46aaa2..ac0ee07142 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.742
-%define release     1
+%define release     191217
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7eaeb1c07f..a810430fca 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.742
-%define release     1
+%define release     191217
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index f8d92675ba..506f15bbb4 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.742"
-PI_BUILD="191216"
+PI_BUILD="191217"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 5d2fe5d1f2..6b98359173 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.742 PS191216";
+my $version = "7.0NG.742 PS191217";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2405c46140..9b3a3b3367 100755
--- 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.742 PS191216";
+my $version = "7.0NG.742 PS191217";
 
 # save program name for logging
 my $progname = basename($0);