From 0dd09276330f195988ed842693e9ffe3fa1d4050 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 18 Mar 2024 09:38:29 +0100
Subject: [PATCH 1/3] #13061 dont show more lts message checkbox

---
 .../update_manager/modal_lts_update.php       | 41 ++++++++++++++++++-
 .../update_manager/update_manager.setup.php   |  4 ++
 pandora_console/include/functions_config.php  |  4 ++
 pandora_console/include/styles/pandora.css    | 12 ++++++
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/update_manager/modal_lts_update.php b/pandora_console/godmode/update_manager/modal_lts_update.php
index fc744b3b57..7721783920 100644
--- a/pandora_console/godmode/update_manager/modal_lts_update.php
+++ b/pandora_console/godmode/update_manager/modal_lts_update.php
@@ -40,6 +40,17 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
     return;
 }
 
+if (is_ajax()) {
+    $stopShowingModal = get_parameter('stopShowingModal', 0);
+    if ($stopShowingModal === '1') {
+        config_update_value('stop_lts_modal', 1);
+    } else {
+        config_update_value('stop_lts_modal', 0);
+    }
+
+    return;
+}
+
 require_once $config['homedir'].'/vendor/autoload.php';
 
 $php_version = phpversion();
@@ -83,7 +94,9 @@ if ($php_version_array[0] < 7) {
         </div>
     </div>
 </div>
-
+<?php
+if ($config['stop_lts_modal'] === '0') {
+    ?>
 <script type="text/javascript">
     $(document).ready(function() {
         // Lts Updates.
@@ -100,12 +113,36 @@ if ($php_version_array[0] < 7) {
             buttons: [{
                 text: "OK",
                 click: function() {
+                    var no_show_more = $('#checkbox-no_show_more').is(':checked');
+                    if (no_show_more === true){
+                        $.ajax({
+                            url: 'ajax.php',
+                            data: {
+                                page: 'godmode/update_manager/modal_lts_update',
+                                stopShowingModal: 1,
+                            },
+                            type: 'POST',
+                            async: false,
+                            dataType: 'json'
+                        });
+                    }
                     $(this).dialog("close");
                 }
             }],
             open: function(event, ui) {
                 $(".ui-dialog-titlebar-close").hide();
+                $("div.ui-dialog-buttonset").addClass('flex-rr-sb-important');
+                $("div.ui-dialog-buttonset").append(`
+                <div class="welcome-wizard-buttons">
+                    <label class="flex-row-center">
+                        <input type="checkbox" id="checkbox-no_show_more" class="welcome-wizard-do-not-show"/>
+                        <?php echo __('Do not show anymore'); ?>
+                    </label>
+                </div>
+                `);
             }
         });
     });
-</script>
\ No newline at end of file
+</script>
+    <?php
+}
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index 78c27d54cc..9b567667a3 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -242,6 +242,10 @@ if (!$action_update_url_update_manager) {
             $result = config_update_value('identification_reminder', $identification_reminder);
         }
 
+        if ($result && $lts_updates === 1) {
+            config_update_value('stop_lts_modal', '0');
+        }
+
         ui_print_result_message(
             $result,
             __('Succesful Update the url config vars.'),
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 32ca1a613c..7c55dda0ed 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -3143,6 +3143,10 @@ function config_process_config()
         config_update_value('default_assign_tags', '');
     }
 
+    if (!isset($config['stop_lts_modal'])) {
+        config_update_value('stop_lts_modal', 0);
+    }
+
     if (!isset($config['default_no_hierarchy'])) {
         config_update_value('default_no_hierarchy', 0);
     }
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 72221434db..5112581bc4 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -943,6 +943,18 @@ select:-internal-list-box {
   align-items: center;
 }
 
+.flex-rr-sb {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: space-between;
+}
+
+.flex-rr-sb-important {
+  display: flex !important;
+  flex-direction: row-reverse !important;
+  justify-content: space-between !important;
+}
+
 .flex-row-vcenter {
   display: flex;
   flex-direction: row;

From 8a29e03b586540f67c3f94c62a6b33637dc1cd90 Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 25 Mar 2024 08:32:56 +0100
Subject: [PATCH 2/3] #13061 toekn lts message no show to individual users

---
 pandora_console/extras/mr/69.sql                      |  6 ++++++
 .../godmode/update_manager/modal_lts_update.php       | 11 +++++++----
 .../godmode/update_manager/update_manager.setup.php   |  6 +++++-
 pandora_console/include/functions_config.php          |  4 ----
 pandora_console/pandoradb.sql                         |  2 ++
 5 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 pandora_console/extras/mr/69.sql

diff --git a/pandora_console/extras/mr/69.sql b/pandora_console/extras/mr/69.sql
new file mode 100644
index 0000000000..c7f619f3a1
--- /dev/null
+++ b/pandora_console/extras/mr/69.sql
@@ -0,0 +1,6 @@
+START TRANSACTION;
+
+ALTER TABLE `tusuario`
+ADD COLUMN `stop_lts_modal` TINYINT NOT NULL DEFAULT 0 AFTER `session_max_time_expire`;
+
+COMMIT;
\ No newline at end of file
diff --git a/pandora_console/godmode/update_manager/modal_lts_update.php b/pandora_console/godmode/update_manager/modal_lts_update.php
index 7721783920..349e378b40 100644
--- a/pandora_console/godmode/update_manager/modal_lts_update.php
+++ b/pandora_console/godmode/update_manager/modal_lts_update.php
@@ -43,9 +43,11 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 if (is_ajax()) {
     $stopShowingModal = get_parameter('stopShowingModal', 0);
     if ($stopShowingModal === '1') {
-        config_update_value('stop_lts_modal', 1);
-    } else {
-        config_update_value('stop_lts_modal', 0);
+        db_process_sql_update(
+            'tusuario',
+            ['stop_lts_modal' => '1'],
+            ['id_user' => $config['id_user']],
+        );
     }
 
     return;
@@ -95,7 +97,8 @@ if ($php_version_array[0] < 7) {
     </div>
 </div>
 <?php
-if ($config['stop_lts_modal'] === '0') {
+$stop_lts_modal = db_get_value('stop_lts_modal', 'tusuario', 'id_user', $config['id_user']);
+if ($stop_lts_modal === '0') {
     ?>
 <script type="text/javascript">
     $(document).ready(function() {
diff --git a/pandora_console/godmode/update_manager/update_manager.setup.php b/pandora_console/godmode/update_manager/update_manager.setup.php
index 9b567667a3..63a8ce026f 100644
--- a/pandora_console/godmode/update_manager/update_manager.setup.php
+++ b/pandora_console/godmode/update_manager/update_manager.setup.php
@@ -243,7 +243,11 @@ if (!$action_update_url_update_manager) {
         }
 
         if ($result && $lts_updates === 1) {
-            config_update_value('stop_lts_modal', '0');
+            db_process_sql_update(
+                'tusuario',
+                ['stop_lts_modal' => '0'],
+                ['id_user' => $config['id_user']],
+            );
         }
 
         ui_print_result_message(
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 7c55dda0ed..32ca1a613c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -3143,10 +3143,6 @@ function config_process_config()
         config_update_value('default_assign_tags', '');
     }
 
-    if (!isset($config['stop_lts_modal'])) {
-        config_update_value('stop_lts_modal', 0);
-    }
-
     if (!isset($config['default_no_hierarchy'])) {
         config_update_value('default_no_hierarchy', 0);
     }
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0467099681..cd5e97d22e 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1326,6 +1326,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
   `allowed_ip_list` TEXT,
   `auth_token_secret` VARCHAR(45) DEFAULT NULL,
   `session_max_time_expire` INT NOT NULL DEFAULT 0,
+  `stop_lts_modal` TINYINT NOT NULL DEFAULT 0;
+
   CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
   UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

From 677eb81eb820e3211fa840ffb6c41c40e15246ff Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.leon@pandorafms.com>
Date: Mon, 25 Mar 2024 08:56:19 +0100
Subject: [PATCH 3/3] #13061 toekn lts message no show to individual users

---
 pandora_console/pandoradb.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index cd5e97d22e..651cbfce94 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1326,8 +1326,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
   `allowed_ip_list` TEXT,
   `auth_token_secret` VARCHAR(45) DEFAULT NULL,
   `session_max_time_expire` INT NOT NULL DEFAULT 0,
-  `stop_lts_modal` TINYINT NOT NULL DEFAULT 0;
-
+  `stop_lts_modal` TINYINT NOT NULL DEFAULT 0,
   CONSTRAINT `fk_filter_id` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
   UNIQUE KEY `id_user` (`id_user`)
 ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;