From faf140868e280d97bed5f00b610e15f13c424ecb Mon Sep 17 00:00:00 2001
From: Josaphat Imani <josaphat.imani97@gmail.com>
Date: Wed, 17 Jul 2024 07:04:29 +0200
Subject: [PATCH] Fixed good logout

---
 modules/core/output_modules.php               | 4 ++--
 modules/core/site.js                          | 2 +-
 tests/phpunit/modules/core/output_modules.php | 2 +-
 tests/selenium/login.py                       | 7 +++----
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index d9796c35be..37f2e65c74 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -363,10 +363,10 @@ protected function output() {
         $res .= '<div class="d-none position-fixed top-0 end-0 mt-3 me-3 sys_messages'.$logged_out_class.'">';
         foreach ($msgs as $msg) {
             if (preg_match("/ERR/", $msg)) {
-                $res .= sprintf('<div class="alert alert-danger alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span class="danger" id="sys_messages">%s</span>', $this->trans(mb_substr((string) $msg, 3)));
+                $res .= sprintf('<div class="alert alert-danger alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span class="danger">%s</span>', $this->trans(mb_substr((string) $msg, 3)));
             }
             else {
-                $res .= sprintf('<div class="alert alert-success alert-dismissible fade show" role="alert"><i class="bi bi-check-circle me-2"></i><span class="info" id="sys_messages">%s</span>', $this->trans($msg));
+                $res .= sprintf('<div class="alert alert-success alert-dismissible fade show" role="alert"><i class="bi bi-check-circle me-2"></i><span class="info">%s</span>', $this->trans($msg));
             }
             $res .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>';
         }
diff --git a/modules/core/site.js b/modules/core/site.js
index 8b98e0e391..43b9eeb306 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -1435,7 +1435,7 @@ var Hm_Utils = {
     },
 
     confirm_logout: function() {
-        if ($('#unsaved_changes').val() == 0) {
+        if (! $('#unsaved_changes').length || $('#unsaved_changes').val() == 0) {
             document.getElementById('logout_without_saving').click();
         }
         else {
diff --git a/tests/phpunit/modules/core/output_modules.php b/tests/phpunit/modules/core/output_modules.php
index 041825406b..5eba653d2a 100644
--- a/tests/phpunit/modules/core/output_modules.php
+++ b/tests/phpunit/modules/core/output_modules.php
@@ -332,7 +332,7 @@ public function test_msgs() {
         $test = new Output_Test('msgs', 'core');
         $test->handler_response = array('router_login_state' => false);
         $res = $test->run();
-        $this->assertEquals(array('<div class="d-none position-fixed top-0 end-0 mt-3 me-3 sys_messages logged_out"><div class="alert alert-danger alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span class="danger" id="sys_messages">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-success alert-dismissible fade show" role="alert"><i class="bi bi-check-circle me-2"></i><span class="info" id="sys_messages">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div></div>'), $res->output_response);
+        $this->assertEquals(array('<div class="d-none position-fixed top-0 end-0 mt-3 me-3 sys_messages logged_out"><div class="alert alert-danger alert-dismissible fade show" role="alert"><i class="bi bi-exclamation-triangle me-2"></i><span class="danger">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div><div class="alert alert-success alert-dismissible fade show" role="alert"><i class="bi bi-check-circle me-2"></i><span class="info">foo</span><button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div></div>'), $res->output_response);
     }
     /**
      * @preserveGlobalState disabled
diff --git a/tests/selenium/login.py b/tests/selenium/login.py
index 26533a1e19..33e1742296 100644
--- a/tests/selenium/login.py
+++ b/tests/selenium/login.py
@@ -44,10 +44,9 @@ def good_login(self):
         assert self.by_class('content_title') != None
 
     def good_logout(self):
-        self.wait(By.CLASS_NAME, "logout_link")
-        self.logout_no_save()
+        self.logout()
         self.wait()
-        assert self.by_id('sys_messages').text == 'Session destroyed on logout'
+        assert 'Session destroyed on logout' in self.by_class('sys_messages').text
 
 
 
@@ -61,5 +60,5 @@ def good_logout(self):
         'missing_username_and_password',
         'bad_login_key',
         'good_login',
-        # 'good_logout'
+        'good_logout'
     ])