From ca9b167741bed0c6c8496a51977b6a0f07e172ae Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 16 Oct 2020 14:00:38 +0200
Subject: [PATCH 01/26] SAML with pandora sessions

---
 pandora_console/include/auth/mysql.php   |  3 +-
 pandora_console/include/load_session.php | 68 +++++++++++++++++++++---
 pandora_console/index.php                | 29 +++++-----
 3 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 930e2cdbd2..f297089ea0 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -239,8 +239,7 @@ function process_user_login_remote($login, $pass, $api=false)
 
         // Unknown authentication method
         default:
-            $config['auth_error'] = 'User not found in database 
-					or incorrect password';
+            $config['auth_error'] = 'User not found in database or incorrect password';
         return false;
             break;
     }
diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index 3575310141..bcc1cc594f 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -198,11 +198,63 @@ function pandora_session_gc($max_lifetime=300)
 }
 
 
-$result_handler = session_set_save_handler(
-    'pandora_session_open',
-    'pandora_session_close',
-    'pandora_session_read',
-    'pandora_session_write',
-    'pandora_session_destroy',
-    'pandora_session_gc'
-);
+/**
+ * Enables custom session handlers.
+ *
+ * @return boolean Context changed or  not.
+ */
+function enable_session_handlers()
+{
+    global $config;
+
+    if ($config['_using_pandora_sessionhandlers'] !== true) {
+        if (session_status() !== PHP_SESSION_NONE) {
+            // Close previous version.
+            session_write_close();
+        }
+
+        $sesion_handler = session_set_save_handler(
+            'pandora_session_open',
+            'pandora_session_close',
+            'pandora_session_read',
+            'pandora_session_write',
+            'pandora_session_destroy',
+            'pandora_session_gc'
+        );
+
+        session_start();
+
+        // Restore previous session.
+        $config['_using_pandora_sessionhandlers'] = true;
+        return $sesion_handler;
+    }
+
+    return false;
+}
+
+
+/**
+ * Disables custom session handlers.
+ *
+ * @return void
+ */
+function disable_session_handlers()
+{
+    global $config;
+
+    if (session_status() !== PHP_SESSION_NONE) {
+        // Close previous version.
+        session_write_close();
+    }
+
+    $ss = new SessionHandler();
+    session_set_save_handler($ss, true);
+
+    session_start();
+
+    $config['_using_pandora_sessionhandlers'] = false;
+}
+
+
+// Always enable session handler.
+$result_handler = enable_session_handlers();
diff --git a/pandora_console/index.php b/pandora_console/index.php
index af8671ded7..43645f69cb 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -395,24 +395,25 @@ if (! isset($config['id_user'])) {
             $nick_in_db = $_SESSION['prepared_login_da']['id_user'];
             $expired_pass = false;
         } else if (($config['auth'] == 'saml') && ($login_button_saml)) {
-            $saml_configured = include_once $config['homedir'].'/'.ENTERPRISE_DIR.'/include/auth/saml.php';
-
-            if (!$saml_configured) {
+            $saml_path = $config['homedir'].'/'.ENTERPRISE_DIR.'/include/auth/saml.php';
+            if (!$saml_path) {
                 include_once 'general/noaccesssaml.php';
-            }
+            } else {
+                include_once $saml_path;
 
-            $saml_user_id = saml_process_user_login();
+                $saml_user_id = saml_process_user_login();
 
-            if (!$saml_user_id) {
-                include_once 'general/noaccesssaml.php';
-            }
+                if (!$saml_user_id) {
+                    include_once 'general/noaccesssaml.php';
+                }
 
 
-            $nick_in_db = $saml_user_id;
-            if (!$nick_in_db) {
-                include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-                $as = new SimpleSAML_Auth_Simple($config['saml_source']);
-                $as->logout();
+                $nick_in_db = $saml_user_id;
+                if (!$nick_in_db) {
+                    include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
+                    $as = new SimpleSAML_Auth_Simple($config['saml_source']);
+                    $as->logout();
+                }
             }
         } else {
             // process_user_login is a virtual function which should be defined in each auth file.
@@ -971,7 +972,7 @@ if (isset($_GET['bye'])) {
 
     if ($config['auth'] == 'saml') {
         include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        $as = new SimpleSAML_Auth_Simple('PandoraFMS');
+        $as = new SimpleSAML_Auth_Simple($config['saml_source']);
         $as->logout();
     }
 

From 30c7da054f6e1227339b3ef74f5b76243f9aa98d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 16 Oct 2020 15:24:21 +0200
Subject: [PATCH 02/26] fixes SAML

---
 pandora_console/include/load_session.php | 8 +++++++-
 pandora_console/index.php                | 6 ++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index bcc1cc594f..883704b8e0 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -236,9 +236,11 @@ function enable_session_handlers()
 /**
  * Disables custom session handlers.
  *
+ * @param string|null $id_session Force swap to target session.
+ *
  * @return void
  */
-function disable_session_handlers()
+function disable_session_handlers($id_session=null)
 {
     global $config;
 
@@ -250,6 +252,10 @@ function disable_session_handlers()
     $ss = new SessionHandler();
     session_set_save_handler($ss, true);
 
+    if ($id_session !== null) {
+        session_id($id_session);
+    }
+
     session_start();
 
     $config['_using_pandora_sessionhandlers'] = false;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 43645f69cb..e87fae5353 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -411,8 +411,7 @@ if (! isset($config['id_user'])) {
                 $nick_in_db = $saml_user_id;
                 if (!$nick_in_db) {
                     include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-                    $as = new SimpleSAML_Auth_Simple($config['saml_source']);
-                    $as->logout();
+                    saml_logout();
                 }
             }
         } else {
@@ -972,8 +971,7 @@ if (isset($_GET['bye'])) {
 
     if ($config['auth'] == 'saml') {
         include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        $as = new SimpleSAML_Auth_Simple($config['saml_source']);
-        $as->logout();
+        saml_logout();
     }
 
     while (@ob_end_flush()) {

From 85ac793e2b7c30e841f0f6063ff79d0570feb8f1 Mon Sep 17 00:00:00 2001
From: Kevin <kevin.rojas@artica.es>
Date: Fri, 16 Oct 2020 16:05:57 +0200
Subject: [PATCH 03/26] force folders creation

---
 pandora_agents/unix/Darwin/dmg/scripts/postinstall | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pandora_agents/unix/Darwin/dmg/scripts/postinstall b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
index 2f76310fee..5b25222a37 100644
--- a/pandora_agents/unix/Darwin/dmg/scripts/postinstall
+++ b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
@@ -26,11 +26,13 @@ else
 	`/usr/local/share/pandora_agent/inst_utilities/print_conf.pl /usr/local/share/pandora_agent/pandora_agent.conf remote_config $REMOTECFG`
 	
 	# Create agent directories and files
-	mkdir -p /usr/local/share/pandora_agent/collections
-	mkdir -p /usr/local/share/pandora_agent/commands
+	mkdir -p /usr/local/bin/
+	mkdir -p /usr/local/share/man/man1/
+	mkdir -p /usr/local/share/pandora_agent/collections/
+	mkdir -p /usr/local/share/pandora_agent/commands/
 	mkdir -p /etc/pandora/
-	mkdir -p /var/spool/pandora/data_out
-	mkdir -p /var/log/pandora
+	mkdir -p /var/spool/pandora/data_out/
+	mkdir -p /var/log/pandora/
 	mv pandora_agent.conf /etc/pandora/
 	touch /var/log/pandora/pandora_agent.log
 
@@ -70,9 +72,9 @@ ln -s /usr/local/share/pandora_agent/collections /etc/pandora/collections
 
 
 # Copy manuals
-cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1
+cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/pandora_agent.1.gz
-cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1
+cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/tentacle_client.1.gz
 
 # Create newsyslog entry

From ee45d0c684142bcca838b7bed85bd75f9b3ff2ba Mon Sep 17 00:00:00 2001
From: Kevin <kevin.rojas@artica.es>
Date: Fri, 16 Oct 2020 16:29:02 +0200
Subject: [PATCH 04/26] Fix autoupdate version issue

---
 extras/pandora_update_version.sh                   | 2 +-
 pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 8a16e8e18d..23ea7a4627 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -143,7 +143,7 @@ done
 
 # Darwin dmg installer files
 echo "Updating DARWIN DMG files..."
-sed -i -e "/VERSION/s/=.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
+sed -i -e "/VERSION/s/=\"7.0NG.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
 sed -i -r "s/(version=\").*(\"\s+onConclusion=)/\1$VERSION\2/g"  "$AGENT_DARWIN_DISTR"
 sed -i -r "s/(CFBundleVersion<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
 sed -i -r "s/(CFBundleShortVersionString<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
diff --git a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
index 325d149578..95878467ab 100644
--- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
+++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
@@ -22,7 +22,7 @@ fi
 
 # DMG package version
 if [ "$#" -ge 2 ]; then
-	VERSION="7.0NG.750"
+	VERSION="$2"
 else
 	VERSION="7.0NG.750"
 fi
@@ -37,7 +37,7 @@ fi
 BUILD_DMG="$BUILD_PATH/build"
 BUILD_TMP="$BUILD_PATH/buildtmp"
 
-FULLNAME="7.0NG.749"
+FULLNAME="$DMGNAME-$VERSION.dmg"
 echo "VERSION-"$VERSION" NAME-"$DMGNAME
 pushd .
 cd $LOCALINST

From 7b73a36eb02e1b28b63cf88b02c6838204cd4b6e Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 16 Oct 2020 16:41:42 +0200
Subject: [PATCH 05/26] rc1

---
 pandora_console/index.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index e87fae5353..8a95702146 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -961,19 +961,23 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
 
 // Log off.
 if (isset($_GET['bye'])) {
-    include 'general/logoff.php';
     $iduser = $_SESSION['id_usuario'];
+    $samlid = $_SESSION['samlid'];
+
+    // Process logout.
+    include 'general/logoff.php';
+
+    if ($config['auth'] == 'saml' && empty($samlid) === false) {
+        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
+        enterprise_include('include/auth/saml.php');
+        enterprise_hook('saml_logout', [$samlid]);
+    }
 
     $_SESSION = [];
     session_destroy();
     header_remove('Set-Cookie');
     setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
-    if ($config['auth'] == 'saml') {
-        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        saml_logout();
-    }
-
     while (@ob_end_flush()) {
         // Dumping...
         continue;

From f6020e87918206218775dce0f2f3f3ef33c3fbc3 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 10:59:46 +0200
Subject: [PATCH 06/26] Removed unwanted traces

---
 pandora_console/general/login_page.php   |  7 ++-
 pandora_console/include/load_session.php | 40 ++++++++-----
 pandora_console/index.php                | 73 +++++++++++++++++-------
 3 files changed, 83 insertions(+), 37 deletions(-)

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index c4cd8482bc..97548deee4 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -450,7 +450,12 @@ if ($login_screen == 'logout') {
             echo '<div class="content_message_alert">';
                 echo '<div class="text_message_alert">';
                     echo '<h1>'.__('Logged out').'</h1>';
-                    echo '<p>'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'</p>';
+    if (empty($config['logout_msg']) === true) {
+        echo '<p>'.__('Your session has ended. Please close your browser window to close this %s session.', get_product_name()).'</p>';
+    } else {
+        echo '<p>'.__($config['logout_msg']).'</p>';
+    }
+
                 echo '</div>';
                 echo '<div class="button_message_alert">';
                     html_print_submit_button('Ok', 'hide-login-logout', false);
diff --git a/pandora_console/include/load_session.php b/pandora_console/include/load_session.php
index 883704b8e0..b557edd5d3 100644
--- a/pandora_console/include/load_session.php
+++ b/pandora_console/include/load_session.php
@@ -64,14 +64,23 @@ function pandora_session_close()
 function pandora_session_read($session_id)
 {
     $session_id = addslashes($session_id);
-    $session_data = db_get_value(
-        'data',
-        'tsessions_php',
-        'id_session',
-        $session_id
+
+    // Do not use SQL cache here.
+    $session_data = db_get_all_rows_sql(
+        sprintf(
+            'SELECT data
+            FROM `tsessions_php` WHERE id_session="%s"',
+            $session_id
+        ),
+        false,
+        false
     );
 
-    if (!empty($session_data)) {
+    if (is_array($session_data) === true) {
+        $session_data = $session_data[0]['data'];
+    }
+
+    if (empty($session_data) === false) {
         return $session_data;
     } else {
         return '';
@@ -90,7 +99,6 @@ function pandora_session_read($session_id)
 function pandora_session_write($session_id, $data)
 {
     $session_id = addslashes($session_id);
-
     if (is_ajax()) {
         // Avoid session upadte while processing ajax responses - notifications.
         if (get_parameter('check_new_notifications', false)) {
@@ -101,18 +109,22 @@ function pandora_session_write($session_id, $data)
     $values = [];
     $values['last_active'] = time();
 
-    if (!empty($data)) {
+    if (empty($data) === false) {
         $values['data'] = addslashes($data);
     }
 
-    $session_exists = (bool) db_get_value(
-        'COUNT(id_session)',
-        'tsessions_php',
-        'id_session',
-        $session_id
+    // Do not use SQL cache here.
+    $session_exists = db_get_all_rows_sql(
+        sprintf(
+            'SELECT id_session
+             FROM `tsessions_php` WHERE id_session="%s"',
+            $session_id
+        ),
+        false,
+        false
     );
 
-    if (!$session_exists) {
+    if ($session_exists === false) {
         $values['id_session'] = $session_id;
         $retval_write = db_process_sql_insert('tsessions_php', $values);
     } else {
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 8a95702146..56ea0fcd34 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -222,7 +222,7 @@ echo '<head>'."\n";
 ob_start('ui_process_page_head');
 
 // Enterprise main.
-enterprise_include('index.php');
+enterprise_include_once('index.php');
 
 echo '<script type="text/javascript">';
     echo 'var dispositivo = navigator.userAgent.toLowerCase();';
@@ -395,23 +395,25 @@ if (! isset($config['id_user'])) {
             $nick_in_db = $_SESSION['prepared_login_da']['id_user'];
             $expired_pass = false;
         } else if (($config['auth'] == 'saml') && ($login_button_saml)) {
-            $saml_path = $config['homedir'].'/'.ENTERPRISE_DIR.'/include/auth/saml.php';
-            if (!$saml_path) {
+            enterprise_include_once('include/auth/saml.php');
+            $saml_user_id = enterprise_hook('saml_process_user_login');
+            if (!$saml_user_id) {
                 include_once 'general/noaccesssaml.php';
-            } else {
-                include_once $saml_path;
-
-                $saml_user_id = saml_process_user_login();
-
-                if (!$saml_user_id) {
-                    include_once 'general/noaccesssaml.php';
-                }
+            }
 
 
-                $nick_in_db = $saml_user_id;
-                if (!$nick_in_db) {
+            $nick_in_db = $saml_user_id;
+            if (!$nick_in_db) {
+                $samlid = $_SESSION['samlid'];
+                $_SESSION = [];
+                session_destroy();
+                header_remove('Set-Cookie');
+                setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+
+                if ($config['auth'] == 'saml' && empty($samlid) === false) {
                     include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-                    saml_logout();
+                    enterprise_include_once('include/auth/saml.php');
+                    enterprise_hook('saml_logout', [$samlid]);
                 }
             }
         } else {
@@ -735,7 +737,7 @@ if (! isset($config['id_user'])) {
 
             exit('</html>');
         }
-    } else {
+    } else if (isset($_GET['bye']) === false) {
         // There is no user connected.
         if ($config['enterprise_installed']) {
             enterprise_include_once('include/functions_reset_pass.php');
@@ -962,22 +964,49 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
 // Log off.
 if (isset($_GET['bye'])) {
     $iduser = $_SESSION['id_usuario'];
-    $samlid = $_SESSION['samlid'];
+
+    if ($config['auth'] === 'saml') {
+        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
+        enterprise_include_once('include/auth/saml.php');
+
+        $samlid = $_SESSION['samlid'];
+        $saml_logout_state = (string) get_parameter('LogoutState', '');
+
+        if (empty($saml_logout_state) === false) {
+            try {
+                $state = \SimpleSAML\Auth\State::loadState(
+                    $saml_logout_state,
+                    'MyLogoutState'
+                );
+                $ls = $state['saml:sp:LogoutStatus'];
+                // Only works for SAML SP.
+                if ($ls['Code'] === 'urn:oasis:names:tc:SAML:2.0:status:Success'
+                    && isset($ls['SubCode']) === false
+                ) {
+                    // Successful logout.
+                    $config['logout_msg'] = 'You have been logged out.';
+                } else {
+                    // Logout failed. Tell the user to close the browser.
+                    $config['logout_msg'] = 'We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.';
+                }
+            } catch (Exception $e) {
+                $config['logout_msg'] = 'Failed to logout from SAML: '.$e->getMessage();
+            }
+        }
+    }
 
     // Process logout.
     include 'general/logoff.php';
 
-    if ($config['auth'] == 'saml' && empty($samlid) === false) {
-        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        enterprise_include('include/auth/saml.php');
-        enterprise_hook('saml_logout', [$samlid]);
-    }
-
     $_SESSION = [];
     session_destroy();
     header_remove('Set-Cookie');
     setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
+    if ($config['auth'] == 'saml' && empty($samlid) === false) {
+        enterprise_hook('saml_logout', [$samlid]);
+    }
+
     while (@ob_end_flush()) {
         // Dumping...
         continue;

From 987e77271e23a3176945f87acf1c5d9b8b1ba720 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 17:42:50 +0200
Subject: [PATCH 07/26] another try

---
 pandora_console/index.php | 58 ++++++++++++---------------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 56ea0fcd34..cfa342d212 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -404,17 +404,21 @@ if (! isset($config['id_user'])) {
 
             $nick_in_db = $saml_user_id;
             if (!$nick_in_db) {
-                $samlid = $_SESSION['samlid'];
-                $_SESSION = [];
-                session_destroy();
-                header_remove('Set-Cookie');
-                setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                if ($config['auth'] !== 'saml' || (bool) get_parameter('LogoutState')) {
+                    $_SESSION = [];
+                    session_destroy();
+                    header_remove('Set-Cookie');
+                    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                }
 
-                if ($config['auth'] == 'saml' && empty($samlid) === false) {
+                if ($config['auth'] === 'saml') {
                     include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
                     enterprise_include_once('include/auth/saml.php');
                     enterprise_hook('saml_logout', [$samlid]);
                 }
+
+                // Process logout.
+                include 'general/logoff.php';
             }
         } else {
             // process_user_login is a virtual function which should be defined in each auth file.
@@ -965,48 +969,22 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
 if (isset($_GET['bye'])) {
     $iduser = $_SESSION['id_usuario'];
 
+    if ($config['auth'] !== 'saml' || (bool) get_parameter('LogoutState')) {
+        $_SESSION = [];
+        session_destroy();
+        header_remove('Set-Cookie');
+        setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+    }
+
     if ($config['auth'] === 'saml') {
         include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
         enterprise_include_once('include/auth/saml.php');
-
-        $samlid = $_SESSION['samlid'];
-        $saml_logout_state = (string) get_parameter('LogoutState', '');
-
-        if (empty($saml_logout_state) === false) {
-            try {
-                $state = \SimpleSAML\Auth\State::loadState(
-                    $saml_logout_state,
-                    'MyLogoutState'
-                );
-                $ls = $state['saml:sp:LogoutStatus'];
-                // Only works for SAML SP.
-                if ($ls['Code'] === 'urn:oasis:names:tc:SAML:2.0:status:Success'
-                    && isset($ls['SubCode']) === false
-                ) {
-                    // Successful logout.
-                    $config['logout_msg'] = 'You have been logged out.';
-                } else {
-                    // Logout failed. Tell the user to close the browser.
-                    $config['logout_msg'] = 'We were unable to log you out of all your sessions. To be completely sure that you are logged out, you need to close your web browser.';
-                }
-            } catch (Exception $e) {
-                $config['logout_msg'] = 'Failed to logout from SAML: '.$e->getMessage();
-            }
-        }
+        enterprise_hook('saml_logout');
     }
 
     // Process logout.
     include 'general/logoff.php';
 
-    $_SESSION = [];
-    session_destroy();
-    header_remove('Set-Cookie');
-    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
-
-    if ($config['auth'] == 'saml' && empty($samlid) === false) {
-        enterprise_hook('saml_logout', [$samlid]);
-    }
-
     while (@ob_end_flush()) {
         // Dumping...
         continue;

From 92211c71b729ae4dca3ca8c5a25c326e4965ed67 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 18:45:40 +0200
Subject: [PATCH 08/26] trick to avoid simplesamlphp logout bug while using
 custom session handlers

---
 pandora_console/index.php | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index cfa342d212..fac333e101 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -273,6 +273,7 @@ if (strlen($search) > 0) {
 }
 
 // Login process.
+enterprise_include_once('include/auth/saml.php');
 if (! isset($config['id_user'])) {
     // Clear error messages.
     unset($_COOKIE['errormsg']);
@@ -395,7 +396,6 @@ if (! isset($config['id_user'])) {
             $nick_in_db = $_SESSION['prepared_login_da']['id_user'];
             $expired_pass = false;
         } else if (($config['auth'] == 'saml') && ($login_button_saml)) {
-            enterprise_include_once('include/auth/saml.php');
             $saml_user_id = enterprise_hook('saml_process_user_login');
             if (!$saml_user_id) {
                 include_once 'general/noaccesssaml.php';
@@ -404,18 +404,14 @@ if (! isset($config['id_user'])) {
 
             $nick_in_db = $saml_user_id;
             if (!$nick_in_db) {
-                if ($config['auth'] !== 'saml' || (bool) get_parameter('LogoutState')) {
-                    $_SESSION = [];
-                    session_destroy();
-                    header_remove('Set-Cookie');
-                    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                if ($config['auth'] === 'saml') {
+                    enterprise_hook('saml_logout');
                 }
 
-                if ($config['auth'] === 'saml') {
-                    include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-                    enterprise_include_once('include/auth/saml.php');
-                    enterprise_hook('saml_logout', [$samlid]);
-                }
+                $_SESSION = [];
+                session_destroy();
+                header_remove('Set-Cookie');
+                setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
                 // Process logout.
                 include 'general/logoff.php';
@@ -956,6 +952,10 @@ if (! isset($config['id_user'])) {
             }
 
             exit('</html>');
+        } else {
+            if ($config['auth'] === 'saml') {
+                enterprise_hook('saml_login_status_verifier');
+            }
         }
     }
 }
@@ -969,19 +969,16 @@ if (file_exists(ENTERPRISE_DIR.'/load_enterprise.php')) {
 if (isset($_GET['bye'])) {
     $iduser = $_SESSION['id_usuario'];
 
-    if ($config['auth'] !== 'saml' || (bool) get_parameter('LogoutState')) {
-        $_SESSION = [];
-        session_destroy();
-        header_remove('Set-Cookie');
-        setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
-    }
-
     if ($config['auth'] === 'saml') {
-        include_once $config['saml_path'].'simplesamlphp/lib/_autoload.php';
-        enterprise_include_once('include/auth/saml.php');
         enterprise_hook('saml_logout');
     }
 
+    $_SESSION = [];
+    session_destroy();
+    header_remove('Set-Cookie');
+    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+
+
     // Process logout.
     include 'general/logoff.php';
 

From 3562192d691d9516677bd796dc85368d84c8a394 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 18:51:18 +0200
Subject: [PATCH 09/26] minor fix

---
 pandora_console/index.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index fac333e101..84741eb310 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -408,10 +408,12 @@ if (! isset($config['id_user'])) {
                     enterprise_hook('saml_logout');
                 }
 
-                $_SESSION = [];
-                session_destroy();
-                header_remove('Set-Cookie');
-                setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                if (session_status() !== PHP_SESSION_NONE) {
+                    $_SESSION = [];
+                    session_destroy();
+                    header_remove('Set-Cookie');
+                    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+                }
 
                 // Process logout.
                 include 'general/logoff.php';
@@ -973,10 +975,12 @@ if (isset($_GET['bye'])) {
         enterprise_hook('saml_logout');
     }
 
-    $_SESSION = [];
-    session_destroy();
-    header_remove('Set-Cookie');
-    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+    if (session_status() !== PHP_SESSION_NONE) {
+        $_SESSION = [];
+        session_destroy();
+        header_remove('Set-Cookie');
+        setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
+    }
 
 
     // Process logout.

From d7f3810bba3dfff7534cbd10405a76e1c0b0ac8a Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 19:00:00 +0200
Subject: [PATCH 10/26] improved message saml

---
 pandora_console/index.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 84741eb310..825d00bc86 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -398,9 +398,15 @@ if (! isset($config['id_user'])) {
         } else if (($config['auth'] == 'saml') && ($login_button_saml)) {
             $saml_user_id = enterprise_hook('saml_process_user_login');
             if (!$saml_user_id) {
-                include_once 'general/noaccesssaml.php';
-            }
+                $login_failed = true;
+                include_once 'general/login_page.php';
+                while (@ob_end_flush()) {
+                    // Dumping...
+                    continue;
+                }
 
+                exit('</html>');
+            }
 
             $nick_in_db = $saml_user_id;
             if (!$nick_in_db) {

From 8b4fd551d1bd12550de13308204296b2d55ed602 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 19 Oct 2020 19:17:07 +0200
Subject: [PATCH 11/26] minor fixes

---
 pandora_console/index.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pandora_console/index.php b/pandora_console/index.php
index 825d00bc86..7ff9900150 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -981,13 +981,10 @@ if (isset($_GET['bye'])) {
         enterprise_hook('saml_logout');
     }
 
-    if (session_status() !== PHP_SESSION_NONE) {
-        $_SESSION = [];
-        session_destroy();
-        header_remove('Set-Cookie');
-        setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
-    }
-
+    $_SESSION = [];
+    session_destroy();
+    header_remove('Set-Cookie');
+    setcookie(session_name(), $_COOKIE[session_name()], (time() - 4800), '/');
 
     // Process logout.
     include 'general/logoff.php';

From bfa5b81ee804dafa68da27c732646788b1dee424 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 21 Oct 2020 14:03:46 +0200
Subject: [PATCH 12/26] Added server component status - crash -

---
 .../godmode/servers/servers.build_table.php          | 12 +++++++++++-
 pandora_console/include/constants.php                |  3 ++-
 pandora_console/include/functions_modules.php        |  2 ++
 pandora_console/include/functions_ui.php             |  4 ++++
 pandora_server/bin/pandora_server                    |  2 +-
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 668ef26f0c..169789d81c 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -92,7 +92,17 @@ foreach ($servers as $server) {
     // Status
     $data[1] = ui_print_status_image(STATUS_SERVER_OK, '', true);
     if (($server['status'] == 0) || (($date - time_w_fixed_tz($server['keepalive'])) > ($server['server_keepalive']) * 2)) {
-        $data[1] = ui_print_status_image(STATUS_SERVER_DOWN, '', true);
+        $data[1] = ui_print_status_image(
+            STATUS_SERVER_DOWN,
+            __('Server is stopped.'),
+            true
+        );
+    } else if ($server['status'] == -1) {
+        $data[1] = ui_print_status_image(
+            STATUS_SERVER_CRASH,
+            __('Server has crashed.'),
+            true
+        );
     }
 
     // Type
diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index d32dacb1fe..258b6e805c 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -309,7 +309,7 @@ define('STATUS_ALERT_DISABLED', 'alert_disabled.png');
 // For servers.
 define('STATUS_SERVER_OK', 'server_ok.png');
 define('STATUS_SERVER_DOWN', 'server_down.png');
-
+define('STATUS_SERVER_CRASH', 'server_crash.png');
 
 
 // Status images (ball).
@@ -335,6 +335,7 @@ define('STATUS_ALERT_DISABLED_BALL', 'alert_disabled_ball.png');
 // For servers.
 define('STATUS_SERVER_OK_BALL', 'server_ok_ball.png');
 define('STATUS_SERVER_DOWN_BALL', 'server_down_ball.png');
+define('STATUS_SERVER_CRASH_BALL', 'server_crash_ball.png');
 
 
 
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 9a5ea93f92..e28c255f9c 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2494,6 +2494,8 @@ function modules_get_color_status($status, $force_module=false)
         case STATUS_AGENT_CRITICAL:
         case STATUS_MODULE_CRITICAL_BALL:
         case STATUS_AGENT_CRITICAL_BALL:
+        case STATUS_SERVER_CRASH:
+        case STATUS_SERVER_CRASH_BALL:
         return COL_CRITICAL;
 
         case AGENT_MODULE_STATUS_WARNING:
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index ab6079fb36..65e6facc93 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2762,6 +2762,7 @@ function get_shape_status_set($type)
         // Small squares.
         case STATUS_SERVER_OK:
         case STATUS_SERVER_DOWN:
+        case STATUS_SERVER_CRASH:
             $return = ['class' => 'status_small_squares'];
         break;
 
@@ -2773,6 +2774,9 @@ function get_shape_status_set($type)
         case STATUS_AGENT_OK_BALL:
         case STATUS_AGENT_NO_DATA_BALL:
         case STATUS_AGENT_NO_MONITORS_BALL:
+        case STATUS_SERVER_OK_BALL:
+        case STATUS_SERVER_DOWN_BALL:
+        case STATUS_SERVER_CRASH_BALL:
             $return = ['class' => 'status_balls'];
         break;
 
diff --git a/pandora_server/bin/pandora_server b/pandora_server/bin/pandora_server
index 812bf1e57b..d82944f93b 100755
--- a/pandora_server/bin/pandora_server
+++ b/pandora_server/bin/pandora_server
@@ -771,7 +771,7 @@ sub main() {
 			die("Server thread crashed.") unless (check_server_threads() == 1);
 
 			db_do ($DBH,
-				"UPDATE tserver SET status = 0
+				"UPDATE tserver SET status = -1
 				WHERE UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(keepalive) > 2*server_keepalive"
 			);
 

From 6f498d6d5dca5a96b69633dc10350bb8572da463 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 21 Oct 2020 14:04:45 +0200
Subject: [PATCH 13/26] server status images

---
 .../images/status_sets/default/server_crash.png  | Bin 0 -> 5300 bytes
 .../status_sets/default/server_crash_ball.png    | Bin 0 -> 6783 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pandora_console/images/status_sets/default/server_crash.png
 create mode 100644 pandora_console/images/status_sets/default/server_crash_ball.png

diff --git a/pandora_console/images/status_sets/default/server_crash.png b/pandora_console/images/status_sets/default/server_crash.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bee46f76cecb376a3e1625415201c629ae4f95f
GIT binary patch
literal 5300
zcmeHLX;c(f7A_P7QN-YAaETTTsHjC%Z_wS+?2UA=0UJaR6|1YNp`<sf3TR{!MZvh^
z5=D`SMm!N6ml-uEt{60E;)*&(jSJ!k<Gv*3NW^*7Ahd~N#&ahBgwsvG`@Z|#`@VPY
zdtJ<pj~(Ua+Rqh&AUAb%q!#?`&c9r`fcK=V3AZ7r(@)b9lQ}J(16vrgo;FZ0musP5
z%1Y}Y$a?8saq8A9aQE5QQdGq~FMF=OWm#S|%l}}A&$2c0;!WCSEj_bSjaSIgvIza*
zUmkrj+bkQJ>N@5`LTuBa57_S~oPKmO==j#AIeUYPvUfc-xIc57tv-D`x2dV$%k6cD
zCBRAfiFZSB&-1tY%O^c=iES*2UNLGx?7@P^zCM4wx;AEQ>30fkcHZ6s#mS$iwRE4g
zZNoZ`%a<x^o9|@InKaI`FxTZ+eo0}RGg%gPyehxM=|*VU>2d0fs>ipwc6yvrx+ri`
zp?l&$<@3WWJ?53y4V-N4p|83ecdxw6Ipl87gR4?5DW5F+@#&g+zuG&cJMvbtrJIKf
zy~>-$pCkPCewN?ctN2B7xUh8IfqP5G1i^Xz8#y1nivE1=2QSo16unC%*_Ss~AE}+?
zhOnJiQ>^ghl|Is?yInN_$Ic$9-sZ6F(D6!i=j{`DRZ)xPj>LU>)nsf4Pd<NeXqxMZ
zJ=!&m4@V|FoIlRv@Isa8yr&Z^8I)T-@=(#^mgEUej#;1m@b^Q^xr8r=P298VadbdN
zb*L)uKp*mjN9Y`^@^D{|o-&WQ+AqIZxzJ@Q_t38=v!b@QOZ4)Q`x=HWg}%)_u`qqX
z&&f%_Cob-Qbo-;aNK#yrRR%-tp!tgi3>(&OthAyc^TJY}BjtX+F_}+>5ALHuR;^0?
zy1xF*`DLr~9^Un3`xq9LBz%2Wep`#t`Al`4Q|FH>CTuvmNji4(Bo=XNs?*i2D3Q7&
zm1p<Fd>ecwq4K`+nJ5EZ9yLI5cKZ$QBGHm53Hnk+-OeWQDJEgPMfW1UrL>=N<D<d5
zx?Iw@6_qG`GK@p2R_1$->NGXgaq;PWD?f@AGRcj7c6f`gx>DAPZn0mfx;x&4FQ^0e
zrZueDUFi98UjLBV!ovG$i@SCE@xz8-rnz7|+PvNm?=^ng4cC8rSzm05-0+iwzQ6p;
zf#kH$uT|cNb3RZoDI8r_d^)Dl_o>How9ruR?AYQtyR7DJ*u{T@ud09`hXOhxB3>O4
z@u~qp*_VE@L>c`}=zt?>sT;JzdnEOoS{whxh&l7PbHo0!E_`F}@mbiOr`<{<K7Rg-
zW@c7b7aiF&YyOU{J+{t-e{ra9Xe@6O__m;aJLf#QzI)Jv`^x)Q9a^FaEA;<#TsvjO
zlGwoo2GdxV1A>CEr-B~Q-=Di3DResZD9e3N+5=tCcg<JI*2f)N-Th(LnjND9N7TF3
zuhPWa-WN9j_f>lZ4;dKPIJ2f`Lh-~;Z%*JYo)UXU4OYet@ai+~qY*jS@V>(yNv0-_
zksg1RJ~2sVo|-gVdZB8_bX>M=%Lw+1f4MA8uJMR;Sv)49Z|~$eXErU-2{g@J-Cu6M
z`Qb6&Wt+Q4Epkd+7tZ{8efq<_sXH)f)8N8hq0i<Ur!VMKJ#lSH<-G^QWz!lcKmGd0
zna!Ks;1>0?{aaK;Gg^$->#MdL%R6+d2lli)W_ClgLrF`xgEeHm`M5*p%Fv7x_qOaR
zs&j@TCT=jzm=!VkZ_z*88TjCS)7^X5#9LZEh0+M7?BopfQ3!IMPlE#~Su<Ken2r88
zY1UExR-*+RSP&ExVzuBzCdI)zDxEed1rPQf6u>m86pWK<FpVXG%AljCF;v2|*hFGl
zCLt#UA;GReRs|q1QXCFjjRq5|uqp*MUIqBfn^6I5gK(KjL9!+ujxaM6Eb*84V~EO1
zXNv^Eu5b`T>J{3^s5S~PQVKFS&Z0okoSYp09I?NdNk@fpxg5nrs7QnW1j6Q;INXYu
zSZ|)9l_Qd335K?CwAlpnoVd=M#VG{>Fb}tpgIPjl1;(}j{Mbg%awMt-0|{6U0H7ia
zlOdQ05y??|e=w`jw0oP_HWh)Ms1>)MLVpZ38ej8ZIaPK?yf=EViQry9wG?a4VhBo=
zO_?}v`=Ay>7Hc0fi=}vzEpG#<M?q4y$o4*?)SCEqA6~|E+Gw$P@MwD^NwniES&YGk
zAqkW+P)3jl3z&tk;W=90u|cn`hoAXfA|PBl|7+-1df9TZ>8gk{6Ipyvb)-_j=c^#i
z1WhVzA9YeOp~C|(gc3@1h(t_ch&+HK5i$^$P*@-(6j3reDz%B_a1%lCRDj%{20S9Y
zoWv-h454t0L?k+i2$2U80SHOx<&;>5%W!#s9Yq{NgHFH=_F3^%B%s1@9WD+aq=+2T
zi4X}!h!B~G5F;`PMuIuHR4mllsQ7(QgvG0s0+Bz~VTm{3oZieBm4eZ<Da+b1kw_b<
z1P<p#69!;nkxVGTFu6=7m)m(KQ49-;oaYo`{vwghog@@dfDs49MjP>T3bmNhZ4>;q
zD8OQXusGivfZ1jTYf(fn6waBMM6=nT6!5viJf*Fr;Gni<QH(YdHb)znBKdx6>$q?{
z9kmUE(6@nq$CQv^&N2OOJRQ(>mN16PF*BKQOq^~CMR0HDc@wyuNej+8mSb|&f3T?E
z;DTDqH5&MunOwX03DnfqQR{(ZplwpYu<Z~~;6$tZES^n~wk-fUwoVZlxG9|ir)^uS
zy|UA9C}WunCn+H=0d*^rA`-crLU24lhKOaLwgYgA5|XW*(9X`9^;{0lP+{qy2Eaap
z*0Sw0Jk(Zwey`_}lR<$R8IFk*7$#`lUN{Kl57bx73*wI)jYeTFKoEZ<Db#%BC1hDF
z2AX1C7v@!={1=>^e_K)hk-I&t)jPs$$puZD!Nuj6-WvW5z*dIQG(nkI^V?FlhqTIK
zckh6lTW#Pz1J@(kem}OA1>ZS;;!j(-{fQ9(_4^?2r0;vV-pln)3cM5eeRaK;>zx#M
zC-D2~`oGEL+VO-<nZOsl9Ps>{I<5lzD-i0Uiy0LOz2tw_?*D2TuynOVr?3#ztr!1t
zfJ#a|fzg>$YgEn+uD!d-hK6^oya-Hv)sbO|Lr)RE4!ZHAEZ^}^O{l>0Jf@XEkoUn(
URgx=90RaT5Rk4v<!za)D4`jThH~;_u

literal 0
HcmV?d00001

diff --git a/pandora_console/images/status_sets/default/server_crash_ball.png b/pandora_console/images/status_sets/default/server_crash_ball.png
new file mode 100644
index 0000000000000000000000000000000000000000..fea84fee554f1989c918ffbff407e912183784af
GIT binary patch
literal 6783
zcmeHLc{r478y_WGktL-pP2)&n%wjMz$6y%CSRz}pq*>k>gIUas3>DJRq9SsTHlj~t
zJL#kp?TaErmQYfn1>>}7<9lbQ^nIPauj~50{~Fiexu4(td!GCE-1q&w*Sp<wg_E+<
zA|(g}qD*!sd4YfDNWKbk;BUXEpaBR(zBAUxU+6`NhVuAa1}g%93S)Qx6cDi(5QymR
zkbmIuN6S<`GBqn@cSA1lMb2uKn^%wPY<f{!%<*toHQ`1&qQ9%<s@<SY4SFzsoc$nV
zjF+LsPxD(}s&=SbP`GKw{1N7ULGs)EBTNGA-3FVp1ZX#P=Z5%`@9N`wJh(H4kvv~(
zg|O6IjE&9U+qC<&3WtBK2!GW6UafU8(d`W}R(9u^QvdaPQUkMNuMK<*-|{%{l2KJ-
z*n~K6ZB1~6iiVM43Ra`VH=)r|ESAS=T+%tk2wG4!uwRdYyx#bHo=vD`oNa&9@3p5V
zX3Z;m6L)@B<JA)GLywWdzxu7u^+s#N`|oY<x^ZZ@@m0ms9cdrKPX;1e&YVdzb_+P<
zUUQOPhK#)UXv3OgSlRoD;W(#j%`@6oCv4c9t#QqTpjN^)Dm>tLynq?RB3^NGNlXis
z(LUGif3$_)s?M}YPvZ?VD38I<-#q2YtuCnK*xW2_tq`xsCM#Y{_g*sg<Pf%2lm0lv
z!|0@CAQ8b=w^Mey)tEiYHoZpVld>t~T6^ll8@3fXW|k4W%P|i1>3SSo>KLRU+aI|m
z#P#@M8Khd9spnFZ>NfL8vbn>O^o+IF<Tl93n)kVBs1|sI+PmJU*X+go_2+0xfmxPP
zPuI59kc&Oe5cdI@67&r1G5yn<?DKhbM=}BmPTanEG)Msd)2~SH!<GuVk(WaOIji|p
zzh40Rc0g#&t`!H=bX?1WW1rQeZgP<SW$sx5lCqP$hj|caGpcN`zBXf{-x}bK!Lg(}
z?Hwm#^jAEu2C91AG!^8gGvEQfCs^&2+?+oEV?Xzj)m5Wg0+bfCElvq>g4cNFZ_e<@
zuxu3<Uw0+_#q-iJgF515A|qvOL;3YoSDZI*P^Yp(am`AFfcf%FL#H_k40j)s8p@lL
zZo_W7Tj!FrYj)38>9N@q#2c(74m)+nCEnFDWbv^Ir?snB>R<YZBzEOmSQQZ-b^~Eg
z6N=r{#+Luau2d^hP~W+8AswZ?W~8Y2_>)$`N6TLAfK{W<PKjZZochD;C)KkTn(xD<
zRO*O?i1F9g*$X2UZE!d|6m}llapGjCgUq26wzJ?Lr|XTZxgA!EV93FseCnkgmvedh
zC>P=atCXu<>(h4K+x2261hzs}ag1z&x2&j#ia3NQ(%SPwqYACv@S>MK>*fVQV%k~f
z!%UXZkq4e_>J=y_XFbUl7(Snwq3aix5MLIgRzS53=#(q3J2Br_z52;NR<@EXUOqQ1
z`+Yf$hU+@AogLWmr+O0Zn1fh0sExiaOs1bvC_Bq{Y;4hzo?Xp8`C=FQ3j=va9!5Pl
zzI2ph%!4lrI`83mOx%6)h54KlH*GqezDIp{C3{70d3SY$NS%2~-729sC_@k;Zk)AQ
zzd<<^lQz67)FQjLP%Z(>54&{#HTM1X4v&k0vsE5-)pf4ZGC1^6CvZF|S0$%ziLGof
zB);=l{)y1cfYdsgMN=JNC}|_6$+N0uG>_VVSpIlxa^OIAvnnbxS$ol%RNYd@el@=C
zK<y?$=R)6}KU9M}u9VKoJS*c7*RS+`aQVQ@xXQKV18<7TV-H$u=im*_G%jkjZF_#4
zm^{ph)Z}cF$uyQFcF|m_X1v}X0d3oM@qUGCu>hNwUDLg{)!V+c&HPljNg^cWc7cqX
zVu_}xKc&w`InuH7QS-pP(t;o_mM&+5Y1;hS#g`^>#0}eca<fac>+tM|hK(c8J*&IR
zX8vN*)gzad-q$VG8mn(oQMVWa>T~nji+|BLn|@27&nQ$^u}g66_S26IQEf?D?CV;}
zMq<*^nd|4us}>E&00F;p&gK^EW!`1VWmpLy&kk%}IK$6xs7GsoGuFG^hvq+e*;Fg|
z&8tGOtKQq$4;K^TWk0IDbZVN&hrW8W&$FgV!)Y~lzD0AxLFmAk_=EM8hc8-R7#}CR
zdQj9Tr?hz9TIbA*&Y4GXS@k>bx-^&3-rZ1qJ5$##wJSWc(A2~rU)@lMeAQ;GU+osI
z>6&-I=qS>YqMu{TcNEWyZ0RQ(_Wur7G&&M<vi@8q{L=lp6dSthNwwCBVWUO&p6Q*i
zZQ7Vum;8GZ`hK<ilffcr+7?pY@fdBva!q4m&*jk0rg|uMWk_4IFzQ)P;k^Lp+zZ3E
zUr)^T6vs0BI$tFmK1!fe&fD#N&MN7{KvC7iny4Pq>OpcwrT)sptmagMxF(=*i1;+=
z;JvZ6Eq7lRwcK77x*-{JO|%RWj}U1c)jv}1E71F6YhiC)NBrgS#V$PuXBHIip5vlR
zAQpM|6nck6#ucw;l)p<nko>@CB!89uwak&f^jKRDzxJG0n!Sqd<WQco{tm?at<k=$
zRVJeu4HcZ|`E8v&eH#rPbeHhEZI|S&VjN5V10S2FmRhdn^7vy{aNwK~%g3mgFwLIM
zmMm45lJ1wU4eD-QU-vHkEyp*uM77rJ*n+p5J2R-=u!-YJSGe~JuiD5FZpjCT^7_Z4
z-#H=DAH=_=wms=wM<8_7`Ysa9s;+<AvA1OR8sn{RE{d~p(RU)wdYY*?`PQTgel?s~
zfAj3)b4lgcE`t}|_qJBO8{aqHy*>6<q3WxbgX8gU1GC1T8ikKF<;M>;g?z+yyx6#P
zT(MfLt&6|d#cpg~=PXvywf+#C8u#nVL$3xx?!FKov5~hpvvp#|jiIGk{nX(x2t?*L
zmc6|v+1~!sB@bTh`!}W$oG;nxTnPz0;$^Jjry6<P^MJ{=WMS*_d3kn6H3OoMr(e#_
z!Te%mnvxiP;X>+_;>|lM%T&q|p<^<Aj|K|{VFu#}qZ8XkdrvJM872(hlNonRDq^(D
z=7wdatyub71jkpQ7WNzQB}~P+zIA|vn$<WOHFt5y2-WK5`|d;e9(DWXh!rnax>=g^
zDfjJlcO5wEp+hksFR?b%vm8vkoEnrB9QQCt*wJXF@3@rUp|fOuvaU%q(s<$WQB0)I
zO7k0Un8AKnZls^Fd0Vw%JOx``Y9cuBSRvj2vN}m&_e%SPn*Q6Gi_@qu_xFl(Cn_E;
zs597eY>s2fET23({)gUp@tMF%r1_JjNgB3qcCh1j&bSbqySi#<gx1A52-(E!bqRle
zOc^>(j;$$mNKF`L_x4qn)~!F^uY!D8;JW3JvrNvoos7sPpL;`QW|eJd!%*p;sV(wQ
z``{y-gw6JAOPo8O>5U9Oc|LUCtaLmM5<=r2x|Kk_3W2Elv%rTge|I-LjmtKr(79B=
zRK(_i4`mRDm5qo;p@joNC>3C`I0V?pnR75Gi%x*8GIvM1^X!38mUAp0@Qz*KLyHZk
z;pi|MYb7fY9wcA`LJCyGj^GIJA_7dxiwFOgm=Q3j6e0{K!2I1kq4r!p0L7SMOp$O0
z5o;Y9W~~IZ;?o&;FOuUF1vnzWLWM#e9)XCCjy8=pGv)G`2ow&7Lm<%zG#U;f;DQ*A
zkRpO}1o{$+Ne&Vqpz&EeA&bj_N;oN0Zj_J!gMstVDROX@<{$!%QwvDOQhI@qjv#{r
z3>XgxK%kLGEF6i3qj8Ao{@|>;`)6;CU`j<$PlSlVL!eBN2sZmG4}s8O-Iw*g=^^j|
zpM4QtfPfptrvVP@0FF?9`l14%7w|=s|AGR9e?`EHh!RZSbd&&)n52P6&>09YD(Tjz
zFX}{g_x$W5IR_?-&69da(9@B0+GiXuiXS1x&}j%D0$_uY2ta1kS9l?d@i);(X8vs>
z;Bue&zZtu9FVcg-len}f$)aQu0R~!3=`1>)h$PyR>@1LW7Ut$ClmnWGa<sI!BRS&i
z%#j#7jNLSMGDje!aA?3McNXZ5!!dAx8Px(#rJxva42nX5<1iK&IM&j_(j1KeFjRAk
zX%rrO7Fa%%h;QwLPN5>v6b2HGMlsNE3>JfeQ|VYLoQ9@j=_o3dhBU)TsU+ItiJoKv
z3~h@1V)2Zi2pL>Hn*eiTaiT<DCVW_Iz*|U>2!*mhnxU~M3<_<5!<l1IUqF5UUjSBy
zgcF4{MWdxNbQ<0fWTb!@%3@QP0D{M1N+%>ofd_*D#iU3I3S^erK~?ege1Ib4@_o46
z2m(y9SEz(iT8B`psS3lpacNRVDHxzjigc<>?I=uybZCY69{AswyhFLsod1sJ3-mJ!
zkuQwq^20s&9@H>^Cj36nx4@s7yub!25b|Tl{~@S<!C6hFs59ux<;P50-y4XW98Gqy
z2$obTC{)@x@D$pl`~u24fG#}(P{+wBS}29X1i%(ORbHR$tZ$_;*35!#X+eimF;q$J
zfvpXTqoLq93I=CJ1JjRTiTRpcz-0)dDSUv)1akm9XR!RG=L}sY%|4^A(b1s*m?OqW
zG#-hBO&%}Q3L)vjpTe_}v>A7I{B!}PG$8?e78so)pUalUE^T;t`rj6_xx;sh8I%X?
zfcS68Fxd>u!G7>J&0s1sCG8PUmQ;jy6pt6d0{CAa*rx>k8=Tb_`&6;~C->>FNpE{D
zF9vKTp+b*n&Ucsp25^$WjYR`E0`B*=J{>Z7T+=R5aL<!A@Nx$4dc^0;ekxrh75#tw
zOqId^aRre2=ORC(?@zgY%JoAE{1EtOcKwv=hZOiB@Xze}pUI{4<#hqT0Uto4!IuGj
z8t-Mm7YTAyS0@r=Lh_SaQ@97TDDs?F3m}l$8j`OJBxk=CXp|R{-5ul~DQV8eV*C`I
zWq~F$GKuK3tdT}fNSsi!o>(Y`T-6NJTBrqnwy)e-vOUfJ3iAAATbR}zTc4oaI*|oS
al_96?)KBiREA#-}A!LUYq%ym;iT?x=b#cxB

literal 0
HcmV?d00001


From ea87392bc12c435e2304c397c10622e5c964f0ae Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 21 Oct 2020 17:03:46 +0200
Subject: [PATCH 14/26] minor fix

---
 .../godmode/servers/servers.build_table.php      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 169789d81c..fd6f8d7a02 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -91,18 +91,20 @@ foreach ($servers as $server) {
 
     // Status
     $data[1] = ui_print_status_image(STATUS_SERVER_OK, '', true);
-    if (($server['status'] == 0) || (($date - time_w_fixed_tz($server['keepalive'])) > ($server['server_keepalive']) * 2)) {
-        $data[1] = ui_print_status_image(
-            STATUS_SERVER_DOWN,
-            __('Server is stopped.'),
-            true
-        );
-    } else if ($server['status'] == -1) {
+    if ($server['status'] == -1) {
         $data[1] = ui_print_status_image(
             STATUS_SERVER_CRASH,
             __('Server has crashed.'),
             true
         );
+    } else if (($server['status'] == 0)
+        || (($date - time_w_fixed_tz($server['keepalive'])) > ($server['server_keepalive']) * 2)
+    ) {
+        $data[1] = ui_print_status_image(
+            STATUS_SERVER_DOWN,
+            __('Server is stopped.'),
+            true
+        );
     }
 
     // Type

From 3738dfa5001ca985bbb968a3315018342ba7cdce Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Thu, 22 Oct 2020 15:17:09 +0200
Subject: [PATCH 15/26] removed extra messages while login using AD after
 change password in AD

---
 pandora_console/include/auth/mysql.php | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pandora_console/include/auth/mysql.php b/pandora_console/include/auth/mysql.php
index 930e2cdbd2..dc0906a36c 100644
--- a/pandora_console/include/auth/mysql.php
+++ b/pandora_console/include/auth/mysql.php
@@ -263,11 +263,6 @@ function process_user_login_remote($login, $pass, $api=false)
             if ($config['autocreate_remote_users'] == 1) {
                 if ($config['ad_save_password']) {
                     $update_credentials = change_local_user_pass_ldap($login, $pass);
-
-                    if ($update_credentials) {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 } else {
                     delete_user_pass_ldap($login);
                 }
@@ -288,11 +283,6 @@ function process_user_login_remote($login, $pass, $api=false)
                 if ($return === 'error_permissions') {
                     $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
                     return false;
-                } else {
-                    if ($return === 'permissions_changed') {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 }
             }
         } else if ($config['auth'] === 'ldap') {
@@ -300,11 +290,6 @@ function process_user_login_remote($login, $pass, $api=false)
             if ($config['autocreate_remote_users'] == 1) {
                 if ($config['ldap_save_password']) {
                     $update_credentials = change_local_user_pass_ldap($login, $pass);
-
-                    if ($update_credentials) {
-                        $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                        return false;
-                    }
                 } else {
                     delete_user_pass_ldap($login);
                 }
@@ -326,11 +311,6 @@ function process_user_login_remote($login, $pass, $api=false)
                     if ($return === 'error_permissions') {
                         $config['auth_error'] = __('Problems with configuration permissions. Please contact with Administrator');
                         return false;
-                    } else {
-                        if ($return === 'permissions_changed') {
-                            $config['auth_error'] = __('Your permissions have changed. Please, login again.');
-                            return false;
-                        }
                     }
                 }
             }

From 315e522b2e09fea5df3dbe4d3cc0510774e1db2e Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 27 Oct 2020 12:01:38 +0100
Subject: [PATCH 16/26] added check for element

---
 .../agentes/module_manager_editor_common.php  | 212 ++++++++--------
 .../manage_network_components_form_common.php | 231 +++++++++---------
 2 files changed, 224 insertions(+), 219 deletions(-)

diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index e6d384e5e4..b6a7213ef8 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -1340,115 +1340,117 @@ $(document).ready (function () {
         var type_name_selected = type_names[type_selected];
         var element = document.getElementById("module_type_help");
         var language =  "<?php echo $config['language']; ?>" ;
-        element.onclick = function (event) {
-            if(type_name_selected == 'async_data' ||
-             type_name_selected == 'async_proc' ||
-             type_name_selected == 'async_string' ||
-             type_name_selected == 'generic_proc'||
-             type_name_selected == 'generic_data' ||
-             type_name_selected == 'generic_data_inc' ||
-             type_name_selected == 'generic_data_inc_abs'||
-             type_name_selected == 'generic_data_string' ||
-             type_name_selected == 'keep_alive'
-               ){
-                if (language == 'es'){
-                 window.open(
-                     'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
-                     '_blank',
-                     'width=800,height=600'
-                        );
-               }
-               else{
-                window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-               }
-              
-                
-            }
-            if(type_name_selected == 'remote_icmp' ||
-             type_name_selected == 'remote_icmp_proc'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-              
-                
-            }
-            if(type_name_selected == 'remote_snmp_string' ||
-             type_name_selected == 'remote_snmp_proc' ||
-             type_name_selected == 'remote_snmp_inc' ||
-             type_name_selected == 'remote_snmp'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-               
-                
-            }
-            if(type_name_selected == 'remote_tcp_string' ||
-             type_name_selected == 'remote_tcp_proc' ||
-             type_name_selected == 'remote_tcp_inc' ||
-             type_name_selected == 'remote_tcp'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
+        if (typeof element !== 'undefined' && element !== null) {
+            element.onclick = function (event) {
+                if(type_name_selected == 'async_data' ||
+                 type_name_selected == 'async_proc' ||
+                 type_name_selected == 'async_string' ||
+                 type_name_selected == 'generic_proc'||
+                 type_name_selected == 'generic_data' ||
+                 type_name_selected == 'generic_data_inc' ||
+                 type_name_selected == 'generic_data_inc_abs'||
+                 type_name_selected == 'generic_data_string' ||
+                 type_name_selected == 'keep_alive'
+                   ){
+                    if (language == 'es'){
+                     window.open(
+                         'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
+                         '_blank',
+                         'width=800,height=600'
+                            );
                    }
                    else{
                     window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-            }
-            if(type_name_selected == 'web_data' ||
-             type_name_selected == 'web_proc' ||
-             type_name_selected == 'web_content_data' ||
-             type_name_selected == 'web_content_string'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
+                         '_blank',
+                         'width=800,height=600'
+                         );
                    }
+                  
+                    
+                }
+                if(type_name_selected == 'remote_icmp' ||
+                 type_name_selected == 'remote_icmp_proc'
+                 ){
+                     if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                     else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                  
+                    
+                }
+                if(type_name_selected == 'remote_snmp_string' ||
+                 type_name_selected == 'remote_snmp_proc' ||
+                 type_name_selected == 'remote_snmp_inc' ||
+                 type_name_selected == 'remote_snmp'
+                 ){
+                     if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                     else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                     }
+                   
+                    
+                }
+                if(type_name_selected == 'remote_tcp_string' ||
+                 type_name_selected == 'remote_tcp_proc' ||
+                 type_name_selected == 'remote_tcp_inc' ||
+                 type_name_selected == 'remote_tcp'
+                   ){
+                       if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                       else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                }
+                if(type_name_selected == 'web_data' ||
+                 type_name_selected == 'web_proc' ||
+                 type_name_selected == 'web_content_data' ||
+                 type_name_selected == 'web_content_string'
+                   ){
+                       if(language == 'es'){
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                       else{
+                        window.open(
+                        'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
+                         '_blank',
+                         'width=800,height=600'
+                         );
+                       }
+                }
             }
         }
 
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index 35c5648db2..d42e93c949 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -386,121 +386,124 @@ $next_row++;
             console.log(type_name_selected);
             var element = document.getElementById("module_type_help");
             var language =  "<?php echo $config['language']; ?>" ;
-        element.onclick = function (event) {
-            if(type_name_selected == 'async_data' ||
-             type_name_selected == 'async_proc' ||
-             type_name_selected == 'async_string' ||
-             type_name_selected == 'generic_proc'||
-             type_name_selected == 'generic_data' ||
-             type_name_selected == 'generic_data_inc' ||
-             type_name_selected == 'generic_data_inc_abs'||
-             type_name_selected == 'generic_data_string' ||
-             type_name_selected == 'keep_alive'
-               ){
-                if (language == 'es'){
-                 window.open(
-                     'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
-                     '_blank',
-                     'width=800,height=600'
-                        );
-               }
-               else{
-                window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-               }
-              
-                
+
+            if (typeof element !== 'undefined' && element !== null) {
+                element.onclick = function (event) {
+                    if(type_name_selected == 'async_data' ||
+                     type_name_selected == 'async_proc' ||
+                     type_name_selected == 'async_string' ||
+                     type_name_selected == 'generic_proc'||
+                     type_name_selected == 'generic_data' ||
+                     type_name_selected == 'generic_data_inc' ||
+                     type_name_selected == 'generic_data_inc_abs'||
+                     type_name_selected == 'generic_data_string' ||
+                     type_name_selected == 'keep_alive'
+                       ){
+                        if (language == 'es'){
+                         window.open(
+                             'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Operacion&printable=yes#Tipos_de_m.C3.B3dulos',
+                             '_blank',
+                             'width=800,height=600'
+                                );
+                       }
+                       else{
+                        window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Operations&printable=yes#Types_of_Modules',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                       }
+                      
+                        
+                    }
+                    if(type_name_selected == 'remote_icmp' ||
+                     type_name_selected == 'remote_icmp_proc'
+                     ){
+                         if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                         else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                      
+                        
+                    }
+                    if(type_name_selected == 'remote_snmp_string' ||
+                     type_name_selected == 'remote_snmp_proc' ||
+                     type_name_selected == 'remote_snmp_inc' ||
+                     type_name_selected == 'remote_snmp'
+                     ){
+                         if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                         else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                         }
+                       
+                        
+                    }
+                    if(type_name_selected == 'remote_tcp_string' ||
+                     type_name_selected == 'remote_tcp_proc' ||
+                     type_name_selected == 'remote_tcp_inc' ||
+                     type_name_selected == 'remote_tcp'
+                       ){
+                           if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                           else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                      
+                        
+                    }
+                    if(type_name_selected == 'web_data' ||
+                     type_name_selected == 'web_proc' ||
+                     type_name_selected == 'web_content_data' ||
+                     type_name_selected == 'web_content_string'
+                       ){
+                           if(language == 'es'){
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                           else{
+                            window.open(
+                            'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
+                             '_blank',
+                             'width=800,height=600'
+                             );
+                           }
+                      
+                        
+                    }
+                }
             }
-            if(type_name_selected == 'remote_icmp' ||
-             type_name_selected == 'remote_icmp_proc'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_ICMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#ICMP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-              
-                
-            }
-            if(type_name_selected == 'remote_snmp_string' ||
-             type_name_selected == 'remote_snmp_proc' ||
-             type_name_selected == 'remote_snmp_inc' ||
-             type_name_selected == 'remote_snmp'
-             ){
-                 if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizando_con_m.C3.B3dulos_de_red_tipo_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-                 else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#Monitoring_by_Network_Modules_with_SNMP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                 }
-               
-                
-            }
-            if(type_name_selected == 'remote_tcp_string' ||
-             type_name_selected == 'remote_tcp_proc' ||
-             type_name_selected == 'remote_tcp_inc' ||
-             type_name_selected == 'remote_tcp'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_remota&printable=yes#Monitorizaci.C3.B3n_TCP',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Remote_Monitoring&printable=yes#TCP_Monitoring',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-              
-                
-            }
-            if(type_name_selected == 'web_data' ||
-             type_name_selected == 'web_proc' ||
-             type_name_selected == 'web_content_data' ||
-             type_name_selected == 'web_content_string'
-               ){
-                   if(language == 'es'){
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_es:Monitorizacion_web&printable=yes#Creaci.C3.B3n_de_m.C3.B3dulos_web',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-                   else{
-                    window.open(
-                    'https://wiki.pandorafms.com/index.php?title=Pandora:Documentation_en:Web_Monitoring&printable=yes#Creating_Web_Modules',
-                     '_blank',
-                     'width=800,height=600'
-                     );
-                   }
-              
-                
-            }
-        }
             
             if (type_name_selected.match(/_string$/) == null) {
                 // Numeric types

From 081e46c9c2cd141f2a24ec9045eb6de120cebbde Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 4 Nov 2020 01:00:47 +0100
Subject: [PATCH 17/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 8c24bcb56a..04c7ccfff0 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201103
+Version: 7.0NG.750-201104
 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 664fc368ed..8b542cabbc 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.750-201103"
+pandora_version="7.0NG.750-201104"
 
 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 3d0a47fcda..ecfb28e3a6 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.750';
-use constant AGENT_BUILD => '201103';
+use constant AGENT_BUILD => '201104';
 
 # 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 1e4ad58036..3208823d37 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.750
-%define release     201103
+%define release     201104
 
 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 057b26df2a..4940dea73f 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.750
-%define release     201103
+%define release     201104
 
 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 e08e30678b..a577aea1e1 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201103"
+PI_BUILD="201104"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6228d5b274..4452eb0cc6 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201103}
+{201104}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index d31a184151..e64936f6fb 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.750(Build 201103)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201104)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3bdb9fe63b..77211c3d7d 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.750(Build 201103))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201104))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 395cdae6ad..a14a6e5917 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201103
+Version: 7.0NG.750-201104
 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 b45e60e545..d7baa037d3 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.750-201103"
+pandora_version="7.0NG.750-201104"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 602e73e968..09bf2878c3 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 = 'PC201103';
+$build_version = 'PC201104';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index ab1a48c2a2..58c6e85fa0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201103';
+            $build = '201104';
             $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 91259e1401..99ae580add 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.750
-%define release     201103
+%define release     201104
 
 # 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 eb5c08bb57..d9383f2d63 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.750
-%define release     201103
+%define release     201104
 
 # 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 12875c993f..dc7a4fbe9f 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.750
-%define release     201103
+%define release     201104
 %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 351c9df7da..319e5beafa 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201103
+Version: 7.0NG.750-201104
 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 d6a143ec1b..c0025b02c6 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.750-201103"
+pandora_version="7.0NG.750-201104"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index e424083278..48911166b2 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.750";
-my $pandora_build = "201103";
+my $pandora_build = "201104";
 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 08d7a557e1..a30f78dbf3 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201103";
+my $pandora_build = "201104";
 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 aa10565a20..72cc6de732 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.750
-%define release     201103
+%define release     201104
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index af6fa905f4..e5eca20c18 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.750
-%define release     201103
+%define release     201104
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 67b41d9570..e84dc4ff91 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201103"
+PI_BUILD="201104"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 169775b461..35c3256ef3 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201103";
+my $version = "7.0NG.750 PS201104";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index f928d268cf..182804e5b7 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.750 PS201103";
+my $version = "7.0NG.750 PS201104";
 
 # save program name for logging
 my $progname = basename($0);

From 2f2556ef79e3054536a8b6e43327ceaf4708f62d Mon Sep 17 00:00:00 2001
From: Luis <luis.calvo@artica.es>
Date: Wed, 4 Nov 2020 16:41:25 +0100
Subject: [PATCH 18/26] Ent 6680 ventana de perdida de conexion incorrecta

---
 pandora_console/general/login_page.php        |   7 +
 .../include/javascript/connection_check.js    | 170 ++++++++++++++++++
 pandora_console/include/javascript/pandora.js | 117 ------------
 .../include/javascript/pandora_ui.js          |  58 ------
 pandora_console/index.php                     |   2 +-
 .../operation/agentes/stat_win.php            |   1 +
 .../operation/events/sound_events.php         |   7 +
 .../operation/gis_maps/public_console.php     |   2 +
 .../visual_console/legacy_public_view.php     |   5 +-
 .../operation/visual_console/public_view.php  |   9 +-
 10 files changed, 191 insertions(+), 187 deletions(-)
 create mode 100644 pandora_console/include/javascript/connection_check.js

diff --git a/pandora_console/general/login_page.php b/pandora_console/general/login_page.php
index c4cd8482bc..9f50b10cb5 100755
--- a/pandora_console/general/login_page.php
+++ b/pandora_console/general/login_page.php
@@ -114,6 +114,13 @@ foreach ($custom_fields as $field) {
     }
 }
 
+// Connection lost alert.
+ui_require_css_file('register', 'include/styles/', true);
+ui_require_javascript_file('connection_check');
+$conn_title = __('Connection with server has been lost');
+$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+
 // Get the custom icons.
 $docs_logo = ui_get_docs_logo();
 $support_logo = ui_get_support_logo();
diff --git a/pandora_console/include/javascript/connection_check.js b/pandora_console/include/javascript/connection_check.js
new file mode 100644
index 0000000000..5ea72d2184
--- /dev/null
+++ b/pandora_console/include/javascript/connection_check.js
@@ -0,0 +1,170 @@
+/**
+ * -------------------------------------
+ *        Connection Check
+ * --------------------------------------
+ */
+
+checkConnection(1);
+
+/**
+ * Performs connection tests every minutes and add connection listeners
+ * @param {integer} time in minutes
+ */
+
+function checkConnection(minutes) {
+  var cicle = minutes * 60 * 1000;
+  var checkConnection = setInterval(handleConnection, cicle);
+
+  // Connection listeters.
+  window.addEventListener("online", handleConnection);
+  window.addEventListener("offline", handleConnection);
+}
+
+/**
+ * Handle connection status test.
+ *
+ * Test conectivity with server and shows modal message.
+ */
+function handleConnection() {
+  var connected;
+  var msg = "online";
+
+  if (navigator.onLine) {
+    isReachable(getServerUrl())
+      .then(function(online) {
+        if (online) {
+          // handle online status
+          connected = true;
+          showConnectionMessage(connected, msg);
+        } else {
+          connected = false;
+          msg = "No connectivity with server";
+          showConnectionMessage(connected, msg);
+        }
+      })
+      .catch(function(err) {
+        connected = false;
+        msg = err;
+        showConnectionMessage(connected, msg);
+      });
+  } else {
+    // handle offline status
+    connected = false;
+    msg = "Connection offline";
+    showConnectionMessage(connected, msg);
+  }
+}
+
+/**
+ * Test server reachibilty and get response.
+ *
+ * @param {String} url
+ *
+ * Return {promise}
+ */
+function isReachable(url) {
+  /**
+   * Note: fetch() still "succeeds" for 404s on subdirectories,
+   * which is ok when only testing for domain reachability.
+   *
+   * Example:
+   *   https://google.com/noexist does not throw
+   *   https://noexist.com/noexist does throw
+   */
+  return fetch(url, { method: "HEAD", mode: "no-cors" })
+    .then(function(resp) {
+      return resp && (resp.ok || resp.type === "opaque");
+    })
+    .catch(function(error) {
+      console.warn("[conn test failure]:", error);
+    });
+}
+
+/**
+ * Gets server origin url
+ */
+function getServerUrl() {
+  var server_url;
+
+  server_url = window.location.origin;
+
+  return server_url;
+}
+
+/**
+ * Shows or hide connection infoMessage.
+ *
+ * @param {bool} conn
+ * @param {string} msg
+ */
+function showConnectionMessage(conn = true, msg = "") {
+  var data = {};
+  if (conn) {
+    $("div#message_dialog_connection")
+      .closest(".ui-dialog-content")
+      .dialog("close");
+  } else {
+    data.title = "Connection with server has been lost";
+    data.text = "Connection status: " + msg;
+
+    infoMessage(data, "message_dialog_connection");
+  }
+}
+
+function infoMessage(data, idMsg) {
+  var title = data.title;
+  var err_messge = data.text;
+
+  if (idMsg == null) {
+    idMsg = uniqId();
+  }
+
+  if ($("#" + idMsg).length === 0) {
+    $("body").append('<div title="' + title + '" id="' + idMsg + '"></div>');
+    $("#" + idMsg).empty();
+  }
+
+  $("#err_msg").empty();
+  $("#err_msg").html("\n\n" + err_messge);
+
+  $("#" + idMsg)
+    .dialog({
+      height: 250,
+      width: 528,
+      opacity: 1,
+      modal: true,
+      position: {
+        my: "center",
+        at: "center",
+        of: window,
+        collision: "fit"
+      },
+      title: data.title,
+      buttons: [
+        {
+          class:
+            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
+          text: "Retry",
+          click: function(e) {
+            handleConnection();
+          }
+        },
+        {
+          class:
+            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-cancel",
+          text: "Close",
+          click: function() {
+            $(this).dialog("close");
+          }
+        }
+      ],
+
+      open: function(event, ui) {
+        $(".ui-widget-overlay").addClass("error-modal-opened");
+      },
+      close: function(event, ui) {
+        $(".ui-widget-overlay").removeClass("error-modal-opened");
+      }
+    })
+    .show();
+}
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index e7f007a425..04a8f5336e 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -1930,120 +1930,3 @@ function ajaxRequest(id, settings) {
     }
   });
 }
-
-/**
- * -------------------------------------
- *        Connection Check
- * --------------------------------------
- */
-
-checkConnection(1);
-
-/**
- * Performs connection tests every minutes and add connection listeners
- * @param {integer} time in minutes
- */
-
-function checkConnection(minutes) {
-  var cicle = minutes * 60 * 1000;
-  var checkConnection = setInterval(handleConnection, cicle);
-
-  // Connection listeters.
-  window.addEventListener("online", handleConnection);
-  window.addEventListener("offline", handleConnection);
-}
-
-/**
- * Handle connection status test.
- *
- * Test conectivity with server and shows modal message.
- */
-function handleConnection() {
-  var connected;
-  var msg = "online";
-
-  if (navigator.onLine) {
-    isReachable(getServerUrl())
-      .then(function(online) {
-        if (online) {
-          // handle online status
-          connected = true;
-          showConnectionMessage(connected, msg);
-        } else {
-          connected = false;
-          msg = "No connectivity with server";
-          showConnectionMessage(connected, msg);
-        }
-      })
-      .catch(function(err) {
-        connected = false;
-        msg = err;
-        showConnectionMessage(connected, msg);
-      });
-  } else {
-    // handle offline status
-    connected = false;
-    msg = "Connection offline";
-    showConnectionMessage(connected, msg);
-  }
-}
-
-/**
- * Test server reachibilty and get response.
- *
- * @param {String} url
- *
- * Return {promise}
- */
-function isReachable(url) {
-  /**
-   * Note: fetch() still "succeeds" for 404s on subdirectories,
-   * which is ok when only testing for domain reachability.
-   *
-   * Example:
-   *   https://google.com/noexist does not throw
-   *   https://noexist.com/noexist does throw
-   */
-  return fetch(url, { method: "HEAD", mode: "no-cors" })
-    .then(function(resp) {
-      return resp && (resp.ok || resp.type === "opaque");
-    })
-    .catch(function(error) {
-      console.warn("[conn test failure]:", error);
-    });
-}
-
-/**
- * Gets server origin url
- */
-function getServerUrl() {
-  var server_url;
-
-  try {
-    server_url = get_php_value("homeurl");
-  } catch (SyntaxError) {
-    console.warn("Pandora homeurl cannot be found.");
-    server_url = $("#hidden-homeurl").val();
-  }
-  return server_url;
-}
-
-/**
- * Shows or hide connection infoMessage.
- *
- * @param {bool} conn
- * @param {string} msg
- */
-function showConnectionMessage(conn = true, msg = "") {
-  var data = {};
-  if (conn) {
-    $("div#message_dialog_connection")
-      .closest(".ui-dialog-content")
-      .dialog("close");
-  } else {
-    data.title = "Connection with server has been lost";
-    data.text = "Connection status: " + msg;
-
-    infoMessage(data, "message_dialog_connection");
-  }
-}
diff --git a/pandora_console/include/javascript/pandora_ui.js b/pandora_console/include/javascript/pandora_ui.js
index 2445473591..15b7f83217 100644
--- a/pandora_console/include/javascript/pandora_ui.js
+++ b/pandora_console/include/javascript/pandora_ui.js
@@ -494,61 +494,3 @@ function generalShowMsg(data, idMsg) {
     ]
   });
 }
-
-function infoMessage(data, idMsg) {
-  var title = data.title;
-  var err_messge = data.text;
-
-  if (idMsg == null) {
-    idMsg = uniqId();
-  }
-
-  if ($("#" + idMsg).length === 0) {
-    $("body").append('<div title="' + title + '" id="' + idMsg + '"></div>');
-    $("#" + idMsg).empty();
-  }
-
-  $("#err_msg").empty();
-  $("#err_msg").html("\n\n" + err_messge);
-
-  $("#" + idMsg)
-    .dialog({
-      height: 250,
-      width: 528,
-      opacity: 1,
-      modal: true,
-      position: {
-        my: "center",
-        at: "center",
-        of: window,
-        collision: "fit"
-      },
-      title: data.title,
-      buttons: [
-        {
-          class:
-            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next",
-          text: "Retry",
-          click: function(e) {
-            handleConnection();
-          }
-        },
-        {
-          class:
-            "ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-cancel",
-          text: "Close",
-          click: function() {
-            $(this).dialog("close");
-          }
-        }
-      ],
-
-      open: function(event, ui) {
-        $(".ui-widget-overlay").addClass("error-modal-opened");
-      },
-      close: function(event, ui) {
-        $(".ui-widget-overlay").removeClass("error-modal-opened");
-      }
-    })
-    .show();
-}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 599e013c12..f7f3d6b207 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1255,8 +1255,8 @@ echo '</div>';
 echo '<div id="um_msg_receiver">';
 echo '</div>';
 
-
 // Connection lost alert.
+ui_require_javascript_file('connection_check');
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index d5e22eb06b..a75e30e269 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -86,6 +86,7 @@ ui_require_css_file('register', 'include/styles/', true);
 // Connection lost alert.
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_require_javascript_file('connection_check');
 ui_print_message_dialog(
     $conn_title,
     $conn_text,
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index 5037e63b22..7434c18eaf 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -61,6 +61,13 @@ echo '</head>';
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
 echo "<h1 class='modalheaderh1'>".__('Sound console').'</h1>';
 
+// Connection lost alert.
+ui_require_css_file('register', 'include/styles/', true);
+$conn_title = __('Connection with server has been lost');
+$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+ui_require_javascript_file('connection_check');
+ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
+
 $table = new StdClass;
 $table->width = '100%';
 $table->styleTable = 'padding-left:16px; padding-right:16px; padding-top:16px;';
diff --git a/pandora_console/operation/gis_maps/public_console.php b/pandora_console/operation/gis_maps/public_console.php
index ba5b99633c..a756d04c0c 100755
--- a/pandora_console/operation/gis_maps/public_console.php
+++ b/pandora_console/operation/gis_maps/public_console.php
@@ -273,8 +273,10 @@ if ($layers != false) {
     gis_activate_ajax_refresh($layers, $timestampLastOperation, 1, $idMap);
 
     // Connection lost alert.
+    ui_require_css_file('register', 'include/styles/', true);
     $conn_title = __('Connection with server has been lost');
     $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
+    ui_require_javascript_file('connection_check');
     ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
 }
 
diff --git a/pandora_console/operation/visual_console/legacy_public_view.php b/pandora_console/operation/visual_console/legacy_public_view.php
index 4df0a6db28..609447800e 100644
--- a/pandora_console/operation/visual_console/legacy_public_view.php
+++ b/pandora_console/operation/visual_console/legacy_public_view.php
@@ -48,6 +48,7 @@ html_print_input_hidden('homeurl', $config['homeurl']);
 $url_css_modal = ui_get_full_url('include/styles/register.css', false, false, false);
 echo '<link rel="stylesheet" href="'.$url_css_modal.'" type="text/css" />';
 // Connection lost alert.
+ui_require_javascript_file('connection_check', 'include/javascript/', true);
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
@@ -157,10 +158,6 @@ echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of
 echo '<div id="qrcode_container_image"></div>';
 echo '</div>';
 
-// Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_alert($conn_title, $conn_text, 'connection', '/images/error_1.png');
 
 ui_require_jquery_file('countdown', 'include/javascript/', true);
 ui_require_javascript_file('wz_jsgraphics', 'include/javascript/', true);
diff --git a/pandora_console/operation/visual_console/public_view.php b/pandora_console/operation/visual_console/public_view.php
index 301ec3ca9c..6cc9f817a1 100644
--- a/pandora_console/operation/visual_console/public_view.php
+++ b/pandora_console/operation/visual_console/public_view.php
@@ -29,11 +29,10 @@ if (file_exists(ENTERPRISE_DIR.'/include/functions_login.php')) {
 require_once $config['homedir'].'/vendor/autoload.php';
 
 ui_require_css_file('visual_maps');
-ui_require_css_file('register');
-
-html_print_input_hidden('homeurl', $config['homeurl']);
+ui_require_css_file('register', 'include/styles/', true);
 
 // Connection lost alert.
+ui_require_javascript_file('connection_check', 'include/javascript/', true);
 $conn_title = __('Connection with server has been lost');
 $conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
 ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
@@ -140,10 +139,6 @@ echo '<div style="display: none;" id="qrcode_container" title="'.__('QR code of
 echo '<div id="qrcode_container_image"></div>';
 echo '</div>';
 
-// Connection lost alert.
-$conn_title = __('Connection with server has been lost');
-$conn_text = __('Connection to the server has been lost. Please check your internet connection or contact with administrator.');
-ui_print_message_dialog($conn_title, $conn_text, 'connection', '/images/error_1.png');
 
 // Check groups can access user.
 $aclUserGroups = [];

From 6662b4f2862d3d8cef8c0900f06af10e64072a46 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 5 Nov 2020 01:00:35 +0100
Subject: [PATCH 19/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 04c7ccfff0..35b6518513 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201104
+Version: 7.0NG.750-201105
 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 8b542cabbc..cf2eb1e980 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.750-201104"
+pandora_version="7.0NG.750-201105"
 
 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 ecfb28e3a6..331f857f57 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.750';
-use constant AGENT_BUILD => '201104';
+use constant AGENT_BUILD => '201105';
 
 # 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 3208823d37..002d42b296 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.750
-%define release     201104
+%define release     201105
 
 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 4940dea73f..7bc7ebbf86 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.750
-%define release     201104
+%define release     201105
 
 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 a577aea1e1..ecae81300e 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201104"
+PI_BUILD="201105"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 4452eb0cc6..6fd065ba3c 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201104}
+{201105}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index e64936f6fb..f76231aa88 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.750(Build 201104)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201105)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 77211c3d7d..d8664851d2 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.750(Build 201104))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201105))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index a14a6e5917..8812b0febf 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201104
+Version: 7.0NG.750-201105
 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 d7baa037d3..b24df3257b 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.750-201104"
+pandora_version="7.0NG.750-201105"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 09bf2878c3..1eb5c31d8e 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 = 'PC201104';
+$build_version = 'PC201105';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 58c6e85fa0..a2adc1d133 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201104';
+            $build = '201105';
             $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 99ae580add..53e36049cb 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.750
-%define release     201104
+%define release     201105
 
 # 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 d9383f2d63..4aaf82e99d 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.750
-%define release     201104
+%define release     201105
 
 # 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 dc7a4fbe9f..8217053f12 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.750
-%define release     201104
+%define release     201105
 %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 319e5beafa..bfd68738c9 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201104
+Version: 7.0NG.750-201105
 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 c0025b02c6..38ec25a5e7 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.750-201104"
+pandora_version="7.0NG.750-201105"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 48911166b2..c94687866a 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.750";
-my $pandora_build = "201104";
+my $pandora_build = "201105";
 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 a30f78dbf3..839f1d3550 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201104";
+my $pandora_build = "201105";
 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 72cc6de732..6718c68ed7 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.750
-%define release     201104
+%define release     201105
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index e5eca20c18..7c589a530c 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.750
-%define release     201104
+%define release     201105
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e84dc4ff91..2b7651608a 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201104"
+PI_BUILD="201105"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 35c3256ef3..cee09ca550 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201104";
+my $version = "7.0NG.750 PS201105";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 182804e5b7..ba141b545f 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.750 PS201104";
+my $version = "7.0NG.750 PS201105";
 
 # save program name for logging
 my $progname = basename($0);

From 2cbe4643bc3b6bb21fc6766585ecf51158681197 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Fri, 6 Nov 2020 01:00:35 +0100
Subject: [PATCH 20/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 35b6518513..e78509f4fb 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201105
+Version: 7.0NG.750-201106
 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 cf2eb1e980..34e2c63f75 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.750-201105"
+pandora_version="7.0NG.750-201106"
 
 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 331f857f57..6653ed87b4 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.750';
-use constant AGENT_BUILD => '201105';
+use constant AGENT_BUILD => '201106';
 
 # 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 002d42b296..82989e2377 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.750
-%define release     201105
+%define release     201106
 
 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 7bc7ebbf86..d8cf7fd85e 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.750
-%define release     201105
+%define release     201106
 
 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 ecae81300e..9b67b8edd0 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201105"
+PI_BUILD="201106"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 6fd065ba3c..2d0eefa0b1 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201105}
+{201106}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index f76231aa88..77917986e5 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.750(Build 201105)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201106)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index d8664851d2..3e50c6637e 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.750(Build 201105))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201106))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 8812b0febf..36d6e97af4 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201105
+Version: 7.0NG.750-201106
 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 b24df3257b..efe9ce72a1 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.750-201105"
+pandora_version="7.0NG.750-201106"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 1eb5c31d8e..0ff041025b 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 = 'PC201105';
+$build_version = 'PC201106';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index a2adc1d133..dbd1515dfc 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201105';
+            $build = '201106';
             $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 53e36049cb..e5eb888467 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.750
-%define release     201105
+%define release     201106
 
 # 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 4aaf82e99d..f73d8b7b81 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.750
-%define release     201105
+%define release     201106
 
 # 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 8217053f12..39a813ae52 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.750
-%define release     201105
+%define release     201106
 %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 bfd68738c9..ce14200139 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201105
+Version: 7.0NG.750-201106
 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 38ec25a5e7..2a1476e304 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.750-201105"
+pandora_version="7.0NG.750-201106"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index c94687866a..8d1970f775 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.750";
-my $pandora_build = "201105";
+my $pandora_build = "201106";
 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 839f1d3550..6ccf363909 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201105";
+my $pandora_build = "201106";
 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 6718c68ed7..2889ee3920 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.750
-%define release     201105
+%define release     201106
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7c589a530c..08b2f7f037 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.750
-%define release     201105
+%define release     201106
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 2b7651608a..e405468b23 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201105"
+PI_BUILD="201106"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index cee09ca550..f20e41c9ce 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201105";
+my $version = "7.0NG.750 PS201106";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index ba141b545f..30820b6c7f 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.750 PS201105";
+my $version = "7.0NG.750 PS201106";
 
 # save program name for logging
 my $progname = basename($0);

From 5010cd7313fac3b9e49ed93cedbf2514c4a44916 Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sat, 7 Nov 2020 01:00:30 +0100
Subject: [PATCH 21/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index e78509f4fb..74ee86ded9 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201106
+Version: 7.0NG.750-201107
 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 34e2c63f75..28520b5681 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.750-201106"
+pandora_version="7.0NG.750-201107"
 
 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 6653ed87b4..40c2a28dd5 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.750';
-use constant AGENT_BUILD => '201106';
+use constant AGENT_BUILD => '201107';
 
 # 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 82989e2377..cddb137231 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.750
-%define release     201106
+%define release     201107
 
 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 d8cf7fd85e..be2cd6522c 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.750
-%define release     201106
+%define release     201107
 
 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 9b67b8edd0..f68b66b383 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201106"
+PI_BUILD="201107"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 2d0eefa0b1..ad6313780d 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201106}
+{201107}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 77917986e5..89e7af5f24 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.750(Build 201106)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201107)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 3e50c6637e..08714cda4c 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.750(Build 201106))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201107))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 36d6e97af4..ac9bdb38ed 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201106
+Version: 7.0NG.750-201107
 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 efe9ce72a1..424d2aff98 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.750-201106"
+pandora_version="7.0NG.750-201107"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0ff041025b..245c46add3 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 = 'PC201106';
+$build_version = 'PC201107';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index dbd1515dfc..1fca4c4cb0 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201106';
+            $build = '201107';
             $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 e5eb888467..9bef5fcca6 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.750
-%define release     201106
+%define release     201107
 
 # 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 f73d8b7b81..8595a6dd86 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.750
-%define release     201106
+%define release     201107
 
 # 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 39a813ae52..a89e8a5785 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.750
-%define release     201106
+%define release     201107
 %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 ce14200139..e664b79c12 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201106
+Version: 7.0NG.750-201107
 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 2a1476e304..92ea1b2647 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.750-201106"
+pandora_version="7.0NG.750-201107"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 8d1970f775..8bf6c1ed1a 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.750";
-my $pandora_build = "201106";
+my $pandora_build = "201107";
 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 6ccf363909..3300f3189f 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201106";
+my $pandora_build = "201107";
 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 2889ee3920..0e9f32e2d0 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.750
-%define release     201106
+%define release     201107
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 08b2f7f037..1605a0c731 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.750
-%define release     201106
+%define release     201107
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index e405468b23..20473cdf54 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201106"
+PI_BUILD="201107"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index f20e41c9ce..c01889ef64 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201106";
+my $version = "7.0NG.750 PS201107";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 30820b6c7f..0ddcf9d733 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.750 PS201106";
+my $version = "7.0NG.750 PS201107";
 
 # save program name for logging
 my $progname = basename($0);

From 4887dc3e3d79512c8c787d94701f44f058f0ab5e Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Sun, 8 Nov 2020 01:00:36 +0100
Subject: [PATCH 22/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 74ee86ded9..57d156c07b 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201107
+Version: 7.0NG.750-201108
 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 28520b5681..a612142fdb 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.750-201107"
+pandora_version="7.0NG.750-201108"
 
 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 40c2a28dd5..836a639a44 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.750';
-use constant AGENT_BUILD => '201107';
+use constant AGENT_BUILD => '201108';
 
 # 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 cddb137231..96233a4f10 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.750
-%define release     201107
+%define release     201108
 
 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 be2cd6522c..6b4ee2a7f5 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.750
-%define release     201107
+%define release     201108
 
 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 f68b66b383..dbf516381b 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201107"
+PI_BUILD="201108"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index ad6313780d..b90549756e 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201107}
+{201108}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 89e7af5f24..7e4195faf6 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.750(Build 201107)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201108)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 08714cda4c..a7569d26b5 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.750(Build 201107))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201108))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index ac9bdb38ed..3840e65827 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201107
+Version: 7.0NG.750-201108
 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 424d2aff98..e92e7e889a 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.750-201107"
+pandora_version="7.0NG.750-201108"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 245c46add3..a0824eb6eb 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 = 'PC201107';
+$build_version = 'PC201108';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 1fca4c4cb0..f2b4920e5d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201107';
+            $build = '201108';
             $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 9bef5fcca6..20256a00d9 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.750
-%define release     201107
+%define release     201108
 
 # 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 8595a6dd86..73be85396d 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.750
-%define release     201107
+%define release     201108
 
 # 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 a89e8a5785..c5769f324f 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.750
-%define release     201107
+%define release     201108
 %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 e664b79c12..8644f23409 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201107
+Version: 7.0NG.750-201108
 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 92ea1b2647..310fb4970d 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.750-201107"
+pandora_version="7.0NG.750-201108"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 8bf6c1ed1a..1ae79f7abf 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.750";
-my $pandora_build = "201107";
+my $pandora_build = "201108";
 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 3300f3189f..74600faa61 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201107";
+my $pandora_build = "201108";
 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 0e9f32e2d0..c7a0b6fc76 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.750
-%define release     201107
+%define release     201108
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1605a0c731..94bc6b49b4 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.750
-%define release     201107
+%define release     201108
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 20473cdf54..efdd1400b6 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201107"
+PI_BUILD="201108"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index c01889ef64..aa57019e8b 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201107";
+my $version = "7.0NG.750 PS201108";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 0ddcf9d733..befbfff16c 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.750 PS201107";
+my $version = "7.0NG.750 PS201108";
 
 # save program name for logging
 my $progname = basename($0);

From 767397ceb623d2dbc1a8487e1bfac83be9fded4c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Mon, 9 Nov 2020 01:00:33 +0100
Subject: [PATCH 23/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 57d156c07b..4b0e762234 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201108
+Version: 7.0NG.750-201109
 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 a612142fdb..545395b419 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.750-201108"
+pandora_version="7.0NG.750-201109"
 
 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 836a639a44..1d9309fc1a 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.750';
-use constant AGENT_BUILD => '201108';
+use constant AGENT_BUILD => '201109';
 
 # 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 96233a4f10..5c3e980ed8 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.750
-%define release     201108
+%define release     201109
 
 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 6b4ee2a7f5..cd5041412d 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.750
-%define release     201108
+%define release     201109
 
 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 dbf516381b..abf8e47f3f 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201108"
+PI_BUILD="201109"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index b90549756e..79382379d7 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201108}
+{201109}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 7e4195faf6..ac687ec5e8 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.750(Build 201108)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201109)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index a7569d26b5..18673def7a 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.750(Build 201108))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201109))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 3840e65827..aefba89897 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201108
+Version: 7.0NG.750-201109
 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 e92e7e889a..59ed03020b 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.750-201108"
+pandora_version="7.0NG.750-201109"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a0824eb6eb..0d8508e25d 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 = 'PC201108';
+$build_version = 'PC201109';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index f2b4920e5d..b0d30602f4 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201108';
+            $build = '201109';
             $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 20256a00d9..9894018bfc 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.750
-%define release     201108
+%define release     201109
 
 # 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 73be85396d..7044aa1654 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.750
-%define release     201108
+%define release     201109
 
 # 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 c5769f324f..25b5f1aff2 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.750
-%define release     201108
+%define release     201109
 %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 8644f23409..b120f7d70a 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201108
+Version: 7.0NG.750-201109
 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 310fb4970d..6b72adc223 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.750-201108"
+pandora_version="7.0NG.750-201109"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 1ae79f7abf..cbf407df40 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.750";
-my $pandora_build = "201108";
+my $pandora_build = "201109";
 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 74600faa61..0939a4661d 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201108";
+my $pandora_build = "201109";
 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 c7a0b6fc76..471ca2a17a 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.750
-%define release     201108
+%define release     201109
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 94bc6b49b4..1736d3978a 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.750
-%define release     201108
+%define release     201109
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index efdd1400b6..c16466dd4b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201108"
+PI_BUILD="201109"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index aa57019e8b..ef378f2619 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201108";
+my $version = "7.0NG.750 PS201109";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index befbfff16c..77c9da45e3 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.750 PS201108";
+my $version = "7.0NG.750 PS201109";
 
 # save program name for logging
 my $progname = basename($0);

From 2046689b002bdab0b03d7d3ec54362d8d4b6a42a Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Tue, 10 Nov 2020 01:01:19 +0100
Subject: [PATCH 24/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 4b0e762234..9d8383f3cd 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201109
+Version: 7.0NG.750-201110
 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 545395b419..895c172aff 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.750-201109"
+pandora_version="7.0NG.750-201110"
 
 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 1d9309fc1a..248e478e90 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.750';
-use constant AGENT_BUILD => '201109';
+use constant AGENT_BUILD => '201110';
 
 # 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 5c3e980ed8..775e0b8d03 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.750
-%define release     201109
+%define release     201110
 
 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 cd5041412d..f5216f943e 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.750
-%define release     201109
+%define release     201110
 
 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 abf8e47f3f..2c888df984 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201109"
+PI_BUILD="201110"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 79382379d7..73e5275392 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201109}
+{201110}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index ac687ec5e8..694a757fa1 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.750(Build 201109)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201110)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 18673def7a..dd07c7e05e 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.750(Build 201109))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201110))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index aefba89897..cb163f7a71 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201109
+Version: 7.0NG.750-201110
 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 59ed03020b..e91af80084 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.750-201109"
+pandora_version="7.0NG.750-201110"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 0d8508e25d..8081929e5f 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 = 'PC201109';
+$build_version = 'PC201110';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b0d30602f4..06268b68a7 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201109';
+            $build = '201110';
             $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 9894018bfc..ed517c0500 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.750
-%define release     201109
+%define release     201110
 
 # 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 7044aa1654..c784d10b0b 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.750
-%define release     201109
+%define release     201110
 
 # 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 25b5f1aff2..77fda01772 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.750
-%define release     201109
+%define release     201110
 %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 b120f7d70a..d03a593531 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201109
+Version: 7.0NG.750-201110
 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 6b72adc223..a9ffa068ab 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.750-201109"
+pandora_version="7.0NG.750-201110"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index cbf407df40..677e8c1149 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.750";
-my $pandora_build = "201109";
+my $pandora_build = "201110";
 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 0939a4661d..da308bf854 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201109";
+my $pandora_build = "201110";
 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 471ca2a17a..a85eb9033a 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.750
-%define release     201109
+%define release     201110
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 1736d3978a..4256526172 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.750
-%define release     201109
+%define release     201110
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c16466dd4b..dbd631dc57 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201109"
+PI_BUILD="201110"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index ef378f2619..d0f9298278 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201109";
+my $version = "7.0NG.750 PS201110";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 77c9da45e3..e043a0a4b3 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.750 PS201109";
+my $version = "7.0NG.750 PS201110";
 
 # save program name for logging
 my $progname = basename($0);

From ea0e2299517345c76db8752e8e342647b7c02710 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Tue, 10 Nov 2020 12:10:25 +0100
Subject: [PATCH 25/26] Fixed license expired and license trial

---
 pandora_console/general/register.php          |  9 ++++---
 .../update_manager/update_manager.offline.php |  7 +++++
 .../update_manager/update_manager.online.php  |  7 +++++
 .../include/functions_update_manager.php      | 27 ++++++++++++++++++-
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index e7097b994e..8c10adc32b 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -148,7 +148,8 @@ if ($initial && users_is_admin()) {
     config_wiz_modal(
         false,
         true,
-        (($registration === true) ? 'show_registration_wizard()' : null)
+        (($registration === true) ? 'show_registration_wizard()' : null),
+        true
     );
 }
 
@@ -159,7 +160,8 @@ if (!$config['disabled_newsletter']) {
             false,
             // Launch only if not being launch from 'initial'.
             !$initial,
-            (($show_newsletter === true) ? 'force_run_newsletter()' : null)
+            (($show_newsletter === false) ? 'force_run_newsletter()' : null),
+            true
         );
     } else {
         if ($show_newsletter) {
@@ -167,7 +169,8 @@ if (!$config['disabled_newsletter']) {
             newsletter_wiz_modal(
                 false,
                 // Launch only if not being call from 'registration'.
-                !$registration && !$initial
+                !$registration && !$initial,
+                true
             );
         }
     }
diff --git a/pandora_console/godmode/update_manager/update_manager.offline.php b/pandora_console/godmode/update_manager/update_manager.offline.php
index 8fb4447772..37e9eed8e8 100644
--- a/pandora_console/godmode/update_manager/update_manager.offline.php
+++ b/pandora_console/godmode/update_manager/update_manager.offline.php
@@ -44,6 +44,13 @@ if (! check_acl($config['id_user'], 0, 'PM')
     return;
 }
 
+if (update_manager_verify_license_expired()) {
+    ui_print_error_message(
+        __('The license has expired. Please contact Artica at info@artica.es')
+    );
+    return;
+}
+
 $baseurl = ui_get_full_url(false, false, false, false);
 
 $current_package = db_get_value(
diff --git a/pandora_console/godmode/update_manager/update_manager.online.php b/pandora_console/godmode/update_manager/update_manager.online.php
index a1524d5518..6ac5c61f9b 100644
--- a/pandora_console/godmode/update_manager/update_manager.online.php
+++ b/pandora_console/godmode/update_manager/update_manager.online.php
@@ -94,6 +94,13 @@ if ($upload_max_filesize < $PHPupload_max_filesize_min) {
     $php_settings_fine++;
 }
 
+if (update_manager_verify_license_expired()) {
+    ui_print_error_message(
+        __('The license has expired. Please contact Artica at info@artica.es')
+    );
+    return;
+}
+
 // Verify registry.
 if (update_manager_verify_registration() === false) {
     ui_require_css_file('register');
diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php
index 2b3dcbc093..6156e5e174 100755
--- a/pandora_console/include/functions_update_manager.php
+++ b/pandora_console/include/functions_update_manager.php
@@ -73,6 +73,24 @@ function update_manager_verify_trial()
 }
 
 
+/**
+ * Check if the trial license is not expired.
+ *
+ * @return boolean true if the trial license is expired, false otherwise.
+ */
+function update_manager_verify_license_expired()
+{
+    global $config;
+
+    $current_date = date('Ymd');
+    if (isset($config['license_expiry_date']) && $current_date >= $config['license_expiry_date']) {
+        return true;
+    }
+
+    return false;
+}
+
+
 /**
  * Parses responses from configuration wizard.
  *
@@ -454,13 +472,20 @@ function registration_wiz_process()
 function registration_wiz_modal(
     $return=false,
     $launch=true,
-    $callback=false
+    $callback=false,
+    $return_message=false
 ) {
     global $config;
     $output = '';
 
     // Do not show the wizard for trial licenses.
     if (update_manager_verify_trial()) {
+        ui_print_info_message('Your license is trial. Please contact Artica at info@artica.es for a valid license', '', $return_message);
+        return '';
+    }
+
+    if (update_manager_verify_license_expired()) {
+        ui_print_error_message('The license has expired. Please contact Artica at info@artica.es', '', $return_message);
         return '';
     }
 

From 33fbdd1819d8c19f33f946a26cd2e34a5d11761c Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Wed, 11 Nov 2020 01:00:32 +0100
Subject: [PATCH 26/26] Auto-updated build strings.

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

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 9d8383f3cd..d45b4bafb5 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.750-201110
+Version: 7.0NG.750-201111
 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 895c172aff..0fa21bd5a0 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.750-201110"
+pandora_version="7.0NG.750-201111"
 
 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 248e478e90..f15435c581 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.750';
-use constant AGENT_BUILD => '201110';
+use constant AGENT_BUILD => '201111';
 
 # 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 775e0b8d03..d3d3cfc4c8 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.750
-%define release     201110
+%define release     201111
 
 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 f5216f943e..d8e990c2a6 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.750
-%define release     201110
+%define release     201111
 
 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 2c888df984..782c61cce4 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201110"
+PI_BUILD="201111"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 73e5275392..02ce38fb77 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{201110}
+{201111}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 694a757fa1..cfdae5a3a3 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.750(Build 201110)")
+#define PANDORA_VERSION ("7.0NG.750(Build 201111)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index dd07c7e05e..b327a39ac2 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.750(Build 201110))"
+      VALUE "ProductVersion", "(7.0NG.750(Build 201111))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index cb163f7a71..b2eb6352d5 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.750-201110
+Version: 7.0NG.750-201111
 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 e91af80084..1f4736fe3d 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.750-201110"
+pandora_version="7.0NG.750-201111"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 8081929e5f..7ff6335385 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 = 'PC201110';
+$build_version = 'PC201111';
 $pandora_version = 'v7.0NG.750';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 06268b68a7..5938e2f1bc 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.750';
-            $build = '201110';
+            $build = '201111';
             $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 ed517c0500..278e32346b 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.750
-%define release     201110
+%define release     201111
 
 # 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 c784d10b0b..6c9d6d2c23 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.750
-%define release     201110
+%define release     201111
 
 # 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 77fda01772..2de2d46d34 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.750
-%define release     201110
+%define release     201111
 %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 d03a593531..c9d37462bf 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.750-201110
+Version: 7.0NG.750-201111
 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 a9ffa068ab..49c01de846 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.750-201110"
+pandora_version="7.0NG.750-201111"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 677e8c1149..17cbdb722e 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.750";
-my $pandora_build = "201110";
+my $pandora_build = "201111";
 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 da308bf854..dda3ec8d2e 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.750";
-my $pandora_build = "201110";
+my $pandora_build = "201111";
 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 a85eb9033a..de60dbcdab 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.750
-%define release     201110
+%define release     201111
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 4256526172..08f8aa5ed9 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.750
-%define release     201110
+%define release     201111
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index dbd631dc57..c95cb92ab2 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.750"
-PI_BUILD="201110"
+PI_BUILD="201111"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d0f9298278..250829ecbd 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.750 PS201110";
+my $version = "7.0NG.750 PS201111";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index e043a0a4b3..3fb25264fd 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.750 PS201110";
+my $version = "7.0NG.750 PS201111";
 
 # save program name for logging
 my $progname = basename($0);