Browse Source

[Web] Fixes #1055 and changes location.reload to window = xy in footer script

André Peters 7 years ago
parent
commit
03031516e9
2 changed files with 18 additions and 1 deletions
  1. 6 0
      data/web/inc/ajax/destroy_tfa_auth.php
  2. 12 1
      data/web/inc/footer.inc.php

+ 6 - 0
data/web/inc/ajax/destroy_tfa_auth.php

@@ -0,0 +1,6 @@
+<?php
+session_start();
+unset($_SESSION['pending_mailcow_cc_username']);
+unset($_SESSION['pending_mailcow_cc_role']);
+unset($_SESSION['pending_tfa_method']);
+?>

+ 12 - 1
data/web/inc/footer.inc.php

@@ -79,6 +79,17 @@ $(document).ready(function() {
         });
         });
       }
       }
   });
   });
+  $('#ConfirmTFAModal').on('hidden.bs.modal', function(){
+      $.ajax({
+        type: "GET",
+        cache: false,
+        dataType: 'script',
+        url: '/inc/ajax/destroy_tfa_auth.php',
+        complete: function(data){
+          window.location = window.location.href.split("#")[0];
+        }
+      });
+  });
   <?php endif; ?>
   <?php endif; ?>
 
 
   // Set TFA modals
   // Set TFA modals
@@ -205,7 +216,7 @@ $(document).ready(function() {
           $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
           $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
           $('#statusTriggerRestartContainer2').append(data);
           $('#statusTriggerRestartContainer2').append(data);
           $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
           $('#triggerRestartContainer').html('<span class="glyphicon glyphicon-ok"></span> ');
-          location.reload();
+          window.location = window.location.href.split("#")[0];
         }
         }
       });
       });
     });
     });