From f8666adf0f0fc51d13072c8954d044ae99bcc148 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 30 Sep 2020 14:20:57 +0200
Subject: [PATCH 01/11] F2 feature

---
 pandora_console/godmode/setup/setup_auth.php | 31 ++++++++++++++++++++
 pandora_console/include/functions_config.php |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index db436224c3..9ba6c00c4f 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -221,6 +221,20 @@ if (is_ajax()) {
         );
         $table->data['double_auth_enabled'] = $row;
 
+        // Enable 2FA for all users.
+        // Set default value.
+        set_unless_defined($config['2FA_all_users'], false);
+        $row = [];
+        $row['name'] = __('Force 2FA for all users is enabled');
+        $row['control'] .= html_print_checkbox_switch(
+            '
+            ',
+            1,
+            $config['2FA_all_users'],
+            true
+        );
+        $table->data['2FA_all_users'] = $row;
+
         // Session timeout.
         // Default session timeout.
         set_when_empty($config['session_timeout'], 90);
@@ -313,6 +327,23 @@ echo '</form>';
 ?>
 
 <script type="text/javascript">
+
+    $( document ).ready(function() {   
+    //For change autocreate remote users
+        $('input[type=checkbox][name=double_auth_enabled]').change(function () {
+            if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                $('#table1-2FA_all_users').show();
+                $('#table3-2FA_all_users').show();
+                $('#table5-2FA_all_users').show();
+            }
+            else {
+                $('#table1-2FA_all_users').hide();
+                $('#table3-2FA_all_users').hide();
+                $('#table5-2FA_all_users').hide();
+            }
+            }).change();
+        });
+
     $('#auth').on('change', function(){
         type_auth = $('#auth').val();
         $.ajax({
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index ca997f5a6e..f4c48ec0bb 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -717,6 +717,10 @@ function config_update_config()
                         $error_update[] = __('Double authentication');
                     }
 
+                    if (!config_update_value('2FA_all_users', get_parameter('2FA_all_users'))) {
+                        $error_update[] = __('2FA all users');
+                    }
+
                     if (!config_update_value('session_timeout', get_parameter('session_timeout'))) {
                         $error_update[] = __('Session timeout');
                     }

From e5fe9d5c29a2e92d4d5bcedea6f3f5325e93befe Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Mon, 5 Oct 2020 12:29:51 +0200
Subject: [PATCH 02/11] feature 2FA_all_users

---
 pandora_console/godmode/setup/setup_auth.php  |  7 +-----
 pandora_console/operation/users/user_edit.php | 23 ++++++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 9ba6c00c4f..acd4e99833 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -227,8 +227,7 @@ if (is_ajax()) {
         $row = [];
         $row['name'] = __('Force 2FA for all users is enabled');
         $row['control'] .= html_print_checkbox_switch(
-            '
-            ',
+            '2FA_all_users',
             1,
             $config['2FA_all_users'],
             true
@@ -333,13 +332,9 @@ echo '</form>';
         $('input[type=checkbox][name=double_auth_enabled]').change(function () {
             if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
                 $('#table1-2FA_all_users').show();
-                $('#table3-2FA_all_users').show();
-                $('#table5-2FA_all_users').show();
             }
             else {
                 $('#table1-2FA_all_users').hide();
-                $('#table3-2FA_all_users').hide();
-                $('#table5-2FA_all_users').hide();
             }
             }).change();
         });
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 23b797a8f2..1e04ad89e0 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -395,7 +395,12 @@ $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user',
 
 if ($config['double_auth_enabled']) {
     $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
-    $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    if ($config['double_auth_enabled']) {
+        $double_authentication .= html_print_checkbox_switch('double_auth', 1, 1, true);
+    } else {
+        $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    }
+
     // Dialog.
     $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
 }
@@ -878,17 +883,19 @@ $(document).ready (function () {
             $("#text-block_size").removeAttr('disabled');
         }
     }
+    var fa_enable = <?php echo $config['2FA_all_users']; ?>
 
     $("input#checkbox-double_auth").change(function (e) {
         e.preventDefault();
+        if(fa_enable != 1){
+            if (this.checked) {
+                show_double_auth_activation();
+            } else {
+                show_double_auth_deactivation();
+            }
+        }
+    }); 
 
-        if (this.checked) {
-            show_double_auth_activation();
-        }
-        else {
-            show_double_auth_deactivation();
-        }
-    });
     
     show_data_section();
 });

From 848f60229a7d3f76571ee7b603f1c94cdff69934 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Tue, 6 Oct 2020 17:02:58 +0200
Subject: [PATCH 03/11] updates on 2FA all users feature

---
 pandora_console/general/register.php          |  83 ++++++
 pandora_console/godmode/setup/setup_auth.php  |   8 +
 .../godmode/users/configure_user.php          | 244 +++++++++++++++++-
 .../include/ajax/double_auth.ajax.php         |   4 +-
 pandora_console/include/functions_config.php  |   4 +
 pandora_console/index.php                     |   3 +
 pandora_console/operation/users/user_edit.php |  15 +-
 7 files changed, 351 insertions(+), 10 deletions(-)

diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index e7097b994e..12196fab08 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -183,6 +183,89 @@ try {
     $welcome = false;
 }
 
+$double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
+
+if (!$double_auth_enabled && $config['2FA_all_users'] != ''
+    && $config['2Fa_auth'] != '1'
+    && $config['double_auth_enabled']
+) {
+    echo '<div id="doble_auth_window" style="display: none"; >';
+    ?>
+    <script type="text/javascript">
+  var userID = "<?php echo $config['id_user']; ?>";
+  console.log(userID);
+
+  var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+  var $dialogContainer = $("div#doble_auth_window");
+
+  $dialogContainer.html($loadingSpinner);
+
+  // Load the info page
+  var request = $.ajax({
+    url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+    type: 'POST',
+    dataType: 'html',
+    data: {
+      page: 'include/ajax/double_auth.ajax',
+      id_user: userID,
+      get_double_auth_info_page: 1,
+      containerID: $dialogContainer.prop('id')
+    },
+    complete: function (xhr, textStatus) {
+
+    },
+    success: function (data, textStatus, xhr) {
+      // isNaN = is not a number
+      if (isNaN(data)) {
+        $dialogContainer.html(data);
+      }
+      // data is a number, convert it to integer to do the compare
+      else if (Number(data) === -1) {
+        $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+      }
+      else {
+        $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+      }
+    },
+    error: function (xhr, textStatus, errorThrown) {
+      $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+    }
+  });
+
+  $("div#doble_auth_window").dialog({
+    <?php config_update_value('2Fa_auth', ''); ?>
+    resizable: true,
+    draggable: true,
+    modal: true,
+    title: "<?php echo __('Double autentication activation'); ?>",
+    overlay: {
+      opacity: 0.5,
+      background: "black"
+    },
+    width: 500,
+    height: 400,
+    close: function (event, ui) {
+        
+    <?php
+    if (!$double_auth_enabled) {
+        config_update_value('2Fa_auth', '1');
+    }
+    ?>
+      // Abort the ajax request
+      if (typeof request != 'undefined'){
+        request.abort();
+      }
+      // Remove the contained html
+      $dialogContainer.empty();
+
+      //document.location.reload();
+    }
+  })
+    .show();    </script>
+    <?php
+    echo '</div>';
+}
+
 $newsletter = null;
 
 ?>
diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index acd4e99833..273fa17de5 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -329,12 +329,20 @@ echo '</form>';
 
     $( document ).ready(function() {   
     //For change autocreate remote users
+    console.log($('input[type=checkbox][id=checkbox-double_auth_enabled]:checked').val());
+    if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                $('#table1-2FA_all_users').show();
+            }
+            else {
+                $('#table1-2FA_all_users').hide();
+            }
         $('input[type=checkbox][name=double_auth_enabled]').change(function () {
             if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
                 $('#table1-2FA_all_users').show();
             }
             else {
                 $('#table1-2FA_all_users').hide();
+                $('input[type=checkbox][name=2FA_all_users][value=0]').prop('checked', false);
             }
             }).change();
         });
diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php
index b98d35e003..daac4addeb 100644
--- a/pandora_console/godmode/users/configure_user.php
+++ b/pandora_console/godmode/users/configure_user.php
@@ -1128,6 +1128,28 @@ if ($config['ehorus_user_level_conf']) {
     $ehorus .= '</div>';
 }
 
+$double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $id);
+
+if ($config['double_auth_enabled'] && check_acl($config['id_user'], 0, 'PM')) {
+    $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
+    if (($config['2FA_all_users'] == '' && !$double_auth_enabled)
+        || ($config['double_auth_enabled'] == '' && $double_auth_enabled)
+        || check_acl($config['id_user'], 0, 'PM')
+    ) {
+        $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
+    }
+
+    // Dialog.
+    $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
+}
+
+if ($double_auth_enabled && $config['double_auth_enabled'] && $config['2FA_all_users'] != '') {
+    $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
+}
+
+if (isset($double_authentication)) {
+    $double_authentication .= '</div>';
+}
 
 if ($meta) {
     enterprise_include_once('include/functions_metaconsole.php');
@@ -1179,7 +1201,7 @@ echo '<div id="user_form">
     <div class="edit_user_autorefresh white_box"><p style="font-weight:bold;">Extra info</p>'.$email.$phone.$not_login.$session_time.'</div>
 </div> 
 <div class="user_edit_second_row white_box">
-    <div class="edit_user_options">'.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.'</div>
+    <div class="edit_user_options">'.$language.$access_or_pagination.$skin.$home_screen.$default_event_filter.$newsletter.$double_authentication.'</div>
 
     <div class="edit_user_timezone">'.$timezone;
 if (!is_metaconsole()) {
@@ -1278,6 +1300,15 @@ if (!is_metaconsole()) {
 var json_profile = $('#hidden-json_profile');
 /* <![CDATA[ */
 $(document).ready (function () {
+    $("input#checkbox-double_auth").change(function (e) {
+        e.preventDefault();
+            if (this.checked) {
+                show_double_auth_activation();
+            } else {
+                show_double_auth_deactivation();
+            }
+    }); 
+
     $('input:radio[name="is_admin"]').change(function() {
         if($('#radiobtn0002').prop('checked')) {     
             $('#metaconsole_agents_manager_div').show();
@@ -1476,5 +1507,216 @@ function switch_ehorus_conf()
 
 }
 
+function show_double_auth_info () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    $dialogContainer.html($loadingSpinner);
+console.log(userID);
+    // Load the info page
+    var request = $.ajax({
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        type: 'POST',
+        dataType: 'html',
+        data: {
+            page: 'include/ajax/double_auth.ajax',
+            id_user: userID,
+            get_double_auth_data_page: 1,
+            FA_forced: 1,
+            containerID: $dialogContainer.prop('id')
+        },
+        complete: function(xhr, textStatus) {
+            
+        },
+        success: function(data, textStatus, xhr) {
+            // isNaN = is not a number
+            if (isNaN(data)) {
+                $dialogContainer.html(data);
+            }
+            // data is a number, convert it to integer to do the compare
+            else if (Number(data) === -1) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+            }
+            else {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+            }
+        },
+        error: function(xhr, textStatus, errorThrown) {
+            $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+        }
+    });
+
+    $("div#dialog-double_auth")
+        .css('display','block')
+        .append($dialogContainer)
+        .dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication information'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 400,
+            height: 375,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+            }
+        })
+        .show();
+
+}
+
+function show_double_auth_activation () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    $dialogContainer.html($loadingSpinner);
+
+    // Load the info page
+    var request = $.ajax({
+        url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+        type: 'POST',
+        dataType: 'html',
+        data: {
+            page: 'include/ajax/double_auth.ajax',
+            id_user: userID,
+            FA_forced: 1,
+            get_double_auth_info_page: 1,
+            containerID: $dialogContainer.prop('id')
+        },
+        complete: function(xhr, textStatus) {
+            
+        },
+        success: function(data, textStatus, xhr) {
+            // isNaN = is not a number
+            if (isNaN(data)) {
+                $dialogContainer.html(data);
+            }
+            // data is a number, convert it to integer to do the compare
+            else if (Number(data) === -1) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+            }
+            else {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Error').'</div></b>'; ?>");
+            }
+        },
+        error: function(xhr, textStatus, errorThrown) {
+            $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error loading the data').'</div></b>'; ?>");
+        }
+    });
+
+    $("div#dialog-double_auth").dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication activation'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 500,
+            height: 400,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+
+                document.location.reload();
+            }
+        })
+        .show();
+}
+
+function show_double_auth_deactivation () {
+    var userID = '<?php echo io_safe_output($id); ?>';
+    console.log(userID);
+    var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
+    var $dialogContainer = $("div#dialog-double_auth-container");
+
+    var message = "<p><?php echo __('Are you sure?').'<br>'.__('The double authentication will be deactivated'); ?></p>";
+    var $button = $("<input type=\"button\" value=\"<?php echo __('Deactivate'); ?>\" />");
+
+    $dialogContainer
+        .empty()
+        .append(message)
+        .append($button);
+
+    var request;
+
+    $button.click(function(e) {
+        e.preventDefault();
+
+        $dialogContainer.html($loadingSpinner);
+
+        // Deactivate the double auth
+        request = $.ajax({
+            url: "<?php echo ui_get_full_url('ajax.php', false, false, false); ?>",
+            type: 'POST',
+            dataType: 'json',
+            data: {
+                page: 'include/ajax/double_auth.ajax',
+                id_user: userID,
+                FA_forced: 1,
+                deactivate_double_auth: 1
+            },
+            complete: function(xhr, textStatus) {
+                
+            },
+            success: function(data, textStatus, xhr) {
+                console.log(data);
+                if (data === -1) {
+                    $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('Authentication error').'</div></b>'; ?>");
+                }
+                else if (data) {
+                    $dialogContainer.html("<?php echo '<b><div class=\"green\">'.__('The double autentication was deactivated successfully').'</div></b>'; ?>");
+                }
+                else {
+                    $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error deactivating the double autentication').'</div></b>'; ?>");
+                }
+            },
+            error: function(xhr, textStatus, errorThrown) {
+                $dialogContainer.html("<?php echo '<b><div class=\"red\">'.__('There was an error deactivating the double autentication').'</div></b>'; ?>");
+            }
+        });
+    });
+    
+
+    $("div#dialog-double_auth").dialog({
+            resizable: true,
+            draggable: true,
+            modal: true,
+            title: "<?php echo __('Double autentication activation'); ?>",
+            overlay: {
+                opacity: 0.5,
+                background: "black"
+            },
+            width: 300,
+            height: 150,
+            close: function(event, ui) {
+                // Abort the ajax request
+                if (typeof request != 'undefined')
+                    request.abort();
+                // Remove the contained html
+                $dialogContainer.empty();
+
+                document.location.reload();
+            }
+        })
+        .show();
+}
+
+
 /* ]]> */
 </script>
diff --git a/pandora_console/include/ajax/double_auth.ajax.php b/pandora_console/include/ajax/double_auth.ajax.php
index 7633a28979..2f2970ee23 100644
--- a/pandora_console/include/ajax/double_auth.ajax.php
+++ b/pandora_console/include/ajax/double_auth.ajax.php
@@ -17,7 +17,9 @@ check_login();
 
 // Security check
 $id_user = (string) get_parameter('id_user');
-if ($id_user !== $config['id_user']) {
+$FA_forced = (int) get_parameter('FA_forced');
+
+if ($id_user !== $config['id_user'] && $FA_forced != 1) {
     db_pandora_audit(
         'ACL Violation',
         'Trying to access Double Authentication'
diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index f4c48ec0bb..d65720b44f 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -1990,6 +1990,10 @@ function config_process_config()
         config_update_value('welcome_state', WELCOME_STARTED);
     }
 
+    if (!isset($config['2Fa_auth'])) {
+        config_update_value('2Fa_auth', '');
+    }
+
      /*
       * Parse the ACL IP list for access API
       */
diff --git a/pandora_console/index.php b/pandora_console/index.php
index af8671ded7..289a91b3f1 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -389,6 +389,7 @@ if (! isset($config['id_user'])) {
         }
 
         $login_button_saml = get_parameter('login_button_saml', false);
+        config_update_value('2Fa_auth', '');
         if (isset($double_auth_success) && $double_auth_success) {
             // This values are true cause there are checked before complete
             // the 2nd auth step.
@@ -709,6 +710,8 @@ if (! isset($config['id_user'])) {
             $redirect_url .= '&'.safe_url_extraclean($key).'='.safe_url_extraclean($value);
         }
 
+        $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
+
         header('Location: '.ui_get_full_url('index.php'.$redirect_url));
         exit;
         // Always exit after sending location headers.
diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php
index 1e04ad89e0..b55a0952e4 100644
--- a/pandora_console/operation/users/user_edit.php
+++ b/pandora_console/operation/users/user_edit.php
@@ -393,11 +393,13 @@ $timezone .= html_print_timezone_select('timezone', $user_info['timezone']).'</d
 // Double auth.
 $double_auth_enabled = (bool) db_get_value('id', 'tuser_double_auth', 'id_user', $config['id_user']);
 
-if ($config['double_auth_enabled']) {
+if ($config['double_auth_enabled'] || ($config['double_auth_enabled'] == '' && $double_auth_enabled)) {
     $double_authentication = '<div class="label_select_simple"><p class="edit_user_labels">'.__('Double authentication').'</p>';
-    if ($config['double_auth_enabled']) {
-        $double_authentication .= html_print_checkbox_switch('double_auth', 1, 1, true);
-    } else {
+    if (($config['2FA_all_users'] == '' && !$double_auth_enabled)
+        || ($config['2FA_all_users'] != '' && !$double_auth_enabled)
+        || ($config['double_auth_enabled'] == '' && $double_auth_enabled)
+        || check_acl($config['id_user'], 0, 'PM')
+    ) {
         $double_authentication .= html_print_checkbox_switch('double_auth', 1, $double_auth_enabled, true);
     }
 
@@ -405,7 +407,7 @@ if ($config['double_auth_enabled']) {
     $double_authentication .= '<div id="dialog-double_auth" style="display:none"><div id="dialog-double_auth-container"></div></div>';
 }
 
-if ($double_auth_enabled) {
+if ($double_auth_enabled && $config['double_auth_enabled'] && $config['2FA_all_users'] != '') {
     $double_authentication .= html_print_button(__('Show information'), 'show_info', false, 'javascript:show_double_auth_info();', '', true);
 }
 
@@ -883,17 +885,14 @@ $(document).ready (function () {
             $("#text-block_size").removeAttr('disabled');
         }
     }
-    var fa_enable = <?php echo $config['2FA_all_users']; ?>
 
     $("input#checkbox-double_auth").change(function (e) {
         e.preventDefault();
-        if(fa_enable != 1){
             if (this.checked) {
                 show_double_auth_activation();
             } else {
                 show_double_auth_deactivation();
             }
-        }
     }); 
 
     

From 53362f64244aa0fb1e48a673a9bbdc46676b3354 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Tue, 13 Oct 2020 15:04:33 +0200
Subject: [PATCH 04/11] update branch

---
 pandora_console/godmode/setup/setup_auth.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 273fa17de5..9b39734b57 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -329,13 +329,7 @@ echo '</form>';
 
     $( document ).ready(function() {   
     //For change autocreate remote users
-    console.log($('input[type=checkbox][id=checkbox-double_auth_enabled]:checked').val());
-    if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
-                $('#table1-2FA_all_users').show();
-            }
-            else {
-                $('#table1-2FA_all_users').hide();
-            }
+
         $('input[type=checkbox][name=double_auth_enabled]').change(function () {
             if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
                 $('#table1-2FA_all_users').show();

From 96387a874f1b81e0ff4474f7a52bb4aaba04a454 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 18 Nov 2020 10:38:49 +0100
Subject: [PATCH 05/11] remove console log

---
 pandora_console/general/register.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/general/register.php b/pandora_console/general/register.php
index 12196fab08..07b63421a5 100644
--- a/pandora_console/general/register.php
+++ b/pandora_console/general/register.php
@@ -193,7 +193,6 @@ if (!$double_auth_enabled && $config['2FA_all_users'] != ''
     ?>
     <script type="text/javascript">
   var userID = "<?php echo $config['id_user']; ?>";
-  console.log(userID);
 
   var $loadingSpinner = $("<img src=\"<?php echo $config['homeurl']; ?>/images/spinner.gif\" />");
   var $dialogContainer = $("div#doble_auth_window");

From 73f931d51648b3c50ee3a825d296d09daa07d9c3 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 25 Nov 2020 10:50:06 +0100
Subject: [PATCH 06/11] show and hide 2fa swtich

---
 pandora_console/godmode/setup/setup_auth.php | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index e8c4ccbfad..b97f857a37 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -334,17 +334,20 @@ echo '</form>';
     $( document ).ready(function() {   
     //For change autocreate remote users
 
-        $('input[type=checkbox][name=double_auth_enabled]').change(function () {
-            if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
-                $('#table1-2FA_all_users').show();
-            }
-            else {
-                $('#table1-2FA_all_users').hide();
-                $('input[type=checkbox][name=2FA_all_users][value=0]').prop('checked', false);
-            }
+    $('input[type=checkbox][name=double_auth_enabled]').change(function () {  
+                if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                    $('#table1-2FA_all_users').show();
+                    $('#table3-2FA_all_users').show();
+                    $('#table5-2FA_all_users').show();
+                }
+                else {
+                    $('input[type=checkbox][name=2FA_all_users][value=1]').prop('checked', false);
+                    $('#table1-2FA_all_users').hide();
+                    $('#table3-2FA_all_users').hide();
+                    $('#table5-2FA_all_users').hide();
+                }
             }).change();
-        });
-
+    });
     $('#auth').on('change', function(){
         type_auth = $('#auth').val();
         $.ajax({

From e3e9736fc50daa41108ccc0483e8a1bfd422bc2e Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 25 Nov 2020 13:07:38 +0100
Subject: [PATCH 07/11] show and hide

---
 pandora_console/godmode/setup/setup_auth.php | 30 +++++++++++---------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index b97f857a37..81380c5600 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -334,20 +334,24 @@ echo '</form>';
     $( document ).ready(function() {   
     //For change autocreate remote users
 
-    $('input[type=checkbox][name=double_auth_enabled]').change(function () {  
-                if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
-                    $('#table1-2FA_all_users').show();
-                    $('#table3-2FA_all_users').show();
-                    $('#table5-2FA_all_users').show();
-                }
-                else {
-                    $('input[type=checkbox][name=2FA_all_users][value=1]').prop('checked', false);
-                    $('#table1-2FA_all_users').hide();
-                    $('#table3-2FA_all_users').hide();
-                    $('#table5-2FA_all_users').hide();
-                }
+    if ($('#checkbox-double_auth_enabled').val() == 1) {
+        $('#table1-2FA_all_users').show();
+     } else {
+        $('#table1-2FA_all_users').hide();
+     }
+
+        $('input[type=checkbox][name=double_auth_enabled]').change(function () {
+            if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                $('#table1-2FA_all_users').show();
+            }
+            else {
+                $('input[type=checkbox][name=double_auth_enabled]:checked').value = 0;
+                $('#table1-2FA_all_users').hide();
+                $('input[type=checkbox][name=2FA_all_users][value=0]').prop('checked', false);
+            }
             }).change();
-    });
+        });
+
     $('#auth').on('change', function(){
         type_auth = $('#auth').val();
         $.ajax({

From 5476c969412f241b553e88d34ab4f3eda9710223 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 25 Nov 2020 13:40:37 +0100
Subject: [PATCH 08/11] update fix

---
 pandora_console/godmode/setup/setup_auth.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 81380c5600..7b1e698b69 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -334,22 +334,28 @@ echo '</form>';
     $( document ).ready(function() {   
     //For change autocreate remote users
 
-    if ($('#checkbox-double_auth_enabled').val() == 1) {
-        $('#table1-2FA_all_users').show();
-     } else {
-        $('#table1-2FA_all_users').hide();
-     }
 
-        $('input[type=checkbox][name=double_auth_enabled]').change(function () {
+
+        $('#checkbox-double_auth_enabled').change(function () {
+            $('#checkbox-double_auth_enabled').val("1");
+
             if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
                 $('#table1-2FA_all_users').show();
             }
             else {
-                $('input[type=checkbox][name=double_auth_enabled]:checked').value = 0;
+                $('#checkbox-double_auth_enabled').val("0");
                 $('#table1-2FA_all_users').hide();
                 $('input[type=checkbox][name=2FA_all_users][value=0]').prop('checked', false);
             }
             }).change();
+        
+            if ($('#checkbox-double_auth_enabled').val() == 1) {
+                $('#table1-2FA_all_users').show();
+            } else {
+                $('#table1-2FA_all_users').hide();
+            }
+        
+        
         });
 
     $('#auth').on('change', function(){

From c824972c8c93794b7af5a1ce623c539574cf82df Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 26 Nov 2020 11:02:48 +0100
Subject: [PATCH 09/11] updates

---
 pandora_console/godmode/setup/setup_auth.php | 43 ++++++++------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 7b1e698b69..f76d9b44d0 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -221,7 +221,9 @@ if (is_ajax()) {
             'double_auth_enabled',
             1,
             $config['double_auth_enabled'],
-            true
+            true,
+            false,
+            'showAndHide()'
         );
         $table->data['double_auth_enabled'] = $row;
 
@@ -331,33 +333,24 @@ echo '</form>';
 
 <script type="text/javascript">
 
+
+function showAndHide() {
+    if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+        $('#table1-2FA_all_users').show();
+    } else {
+        $('#table1-2FA_all_users').hide();
+    }
+}
     $( document ).ready(function() {   
+        if ($('#checkbox-double_auth_enabled').prop('checked') == true) {
+            $('#table1-2FA_all_users').show();
+        } else {
+            $('#table1-2FA_all_users').hide();
+        }
+
+    });
     //For change autocreate remote users
 
-
-
-        $('#checkbox-double_auth_enabled').change(function () {
-            $('#checkbox-double_auth_enabled').val("1");
-
-            if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
-                $('#table1-2FA_all_users').show();
-            }
-            else {
-                $('#checkbox-double_auth_enabled').val("0");
-                $('#table1-2FA_all_users').hide();
-                $('input[type=checkbox][name=2FA_all_users][value=0]').prop('checked', false);
-            }
-            }).change();
-        
-            if ($('#checkbox-double_auth_enabled').val() == 1) {
-                $('#table1-2FA_all_users').show();
-            } else {
-                $('#table1-2FA_all_users').hide();
-            }
-        
-        
-        });
-
     $('#auth').on('change', function(){
         type_auth = $('#auth').val();
         $.ajax({

From af863a45dead97c768c816a55bb33108899a6237 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 26 Nov 2020 16:25:21 +0100
Subject: [PATCH 10/11] updates

---
 pandora_console/godmode/setup/setup_auth.php | 25 ++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index f76d9b44d0..4756824968 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -229,16 +229,17 @@ if (is_ajax()) {
 
         // Enable 2FA for all users.
         // Set default value.
-        set_unless_defined($config['2FA_all_users'], false);
-        $row = [];
-        $row['name'] = __('Force 2FA for all users is enabled');
-        $row['control'] .= html_print_checkbox_switch(
-            '2FA_all_users',
-            1,
-            $config['2FA_all_users'],
-            true
-        );
-        $table->data['2FA_all_users'] = $row;
+            set_unless_defined($config['2FA_all_users'], false);
+            $row = [];
+            $row['name'] = __('Force 2FA for all users is enabled');
+            $row['control'] .= html_print_checkbox_switch(
+                '2FA_all_users',
+                1,
+                $config['2FA_all_users'],
+                true
+            );
+            $table->data['2FA_all_users'] = $row;
+
 
         // Session timeout.
         // Default session timeout.
@@ -342,12 +343,12 @@ function showAndHide() {
     }
 }
     $( document ).ready(function() {   
-        if ($('#checkbox-double_auth_enabled').prop('checked') == true) {
+        var enbale = "<?php echo $config['double_auth_enabled']; ?>";
+        if (enbale == '1') {
             $('#table1-2FA_all_users').show();
         } else {
             $('#table1-2FA_all_users').hide();
         }
-
     });
     //For change autocreate remote users
 

From 1ce48c812f72f5447060e6cfb7d6bee05dafe529 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 26 Nov 2020 18:11:30 +0100
Subject: [PATCH 11/11] updated 2fa all user

---
 pandora_console/godmode/setup/setup_auth.php | 50 +++++++++++---------
 pandora_console/include/styles/pandora.css   |  4 ++
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/pandora_console/godmode/setup/setup_auth.php b/pandora_console/godmode/setup/setup_auth.php
index 4756824968..282d391bc4 100644
--- a/pandora_console/godmode/setup/setup_auth.php
+++ b/pandora_console/godmode/setup/setup_auth.php
@@ -229,15 +229,22 @@ if (is_ajax()) {
 
         // Enable 2FA for all users.
         // Set default value.
-            set_unless_defined($config['2FA_all_users'], false);
-            $row = [];
-            $row['name'] = __('Force 2FA for all users is enabled');
-            $row['control'] .= html_print_checkbox_switch(
-                '2FA_all_users',
-                1,
-                $config['2FA_all_users'],
-                true
-            );
+        set_unless_defined($config['2FA_all_users'], false);
+        $row = [];
+        $row['name'] = __('Force 2FA for all users is enabled');
+        $row['control'] .= html_print_checkbox_switch(
+            '2FA_all_users',
+            1,
+            $config['2FA_all_users'],
+            true
+        );
+
+        if (!$config['double_auth_enabled']) {
+            $table->rowclass['2FA_all_users'] = 'invisible';
+        } else {
+            $table->rowclass['2FA_all_users'] = '';
+        }
+
             $table->data['2FA_all_users'] = $row;
 
 
@@ -334,21 +341,18 @@ echo '</form>';
 
 <script type="text/javascript">
 
-
-function showAndHide() {
-    if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
-        $('#table1-2FA_all_users').show();
-    } else {
-        $('#table1-2FA_all_users').hide();
-    }
-}
-    $( document ).ready(function() {   
-        var enbale = "<?php echo $config['double_auth_enabled']; ?>";
-        if (enbale == '1') {
-            $('#table1-2FA_all_users').show();
-        } else {
-            $('#table1-2FA_all_users').hide();
+    function showAndHide() {
+        if ($('input[type=checkbox][name=double_auth_enabled]:checked').val() == 1) {
+                $('#table1-2FA_all_users').removeClass('invisible');
+                $('#table1-2FA_all_users-name').removeClass('invisible');
+                $('#table1-2FA_all_users-control').removeClass('invisible');
+                $('#table1-2FA_all_users').show();
+            } else {
+                $('#table1-2FA_all_users').hide();
         }
+    }
+    $( document ).ready(function() {   
+
     });
     //For change autocreate remote users
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 922ed8c79a..4a58ead47d 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -691,6 +691,10 @@ select:-internal-list-box {
   display: none;
 }
 
+.visible {
+  display: block;
+}
+
 div#page {
   background: #fbfbfb;
   background-image: none;