System: v23.0.01 post-release fixes

GibbonEdu · Feb 16, 2022 · 2c64c36 · 2c64c36
1 parent bd37783
commit 2c64c36
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -29,7 +29,9 @@ v23.0.01
         System Admin: improved login logs to include login method and user id
 
     Bug Fixes
+        System: fixed user's personal language and theme not set after login
         System: fixed string replacements with {} placeholders not working
+        System Admin: fixed HTML being stripped out of the privacy policy
         System Admin: fixed invalid password field in user imports in Import From File
         System Admin: fixed custom field headings not working for non-english locales
         System Admin: fixed blank User column for logins listed in View Logs

diff --git a/modules/System Admin/privacySettingsProcess.php b/modules/System Admin/privacySettingsProcess.php
@@ -22,7 +22,7 @@
 
 require_once '../../gibbon.php';
 
-$_POST = $container->get(Validator::class)->sanitize($_POST, ['cookieConsentText' => 'HTML']);
+$_POST = $container->get(Validator::class)->sanitize($_POST, ['cookieConsentText' => 'HTML', 'privacyPolicy' => 'HTML']);
 
 // Module includes
 include './moduleFunctions.php';

diff --git a/src/Auth/Adapter/AuthenticationAdapter.php b/src/Auth/Adapter/AuthenticationAdapter.php
@@ -291,8 +291,11 @@ protected function updateUserData($userData)
             );
         }
 
-        // Update user language
-        $languageSelected = $_POST['gibboni18nID'] ?? $this->session->get('gibboni18nIDPersonal') ?? null;
+        // Update user language, using login option, then personal language, then system default
+        $languageSelected = !empty($_POST['gibboni18nID'] && $_POST['gibboni18nID'] != $this->session->get('i18n')['gibboni18nID']) 
+            ? $_POST['gibboni18nID'] : 
+            $userData['gibboni18nIDPersonal'] ?? null;
+
         if (!empty($languageSelected)) {
             if ($i18n = $this->getContainer()->get(I18nGateway::class)->getByID($languageSelected)) {
                 $this->session->set('i18n', $i18n);

diff --git a/src/Domain/User/UserGateway.php b/src/Domain/User/UserGateway.php
@@ -93,7 +93,9 @@ public function selectLoginDetailsByUsername($username)
                     gibbonRole.futureYearsLogin,
                     gibbonRole.pastYearsLogin,
                     gibbonRole.name as roleName,
-                    gibbonRole.category as roleCategory
+                    gibbonRole.category as roleCategory,
+                    gibbonPerson.gibboni18nIDPersonal,
+                    gibbonPerson.gibbonThemeIDPersonal
                 FROM gibbonPerson 
                 LEFT JOIN gibbonRole ON (gibbonPerson.gibbonRoleIDPrimary=gibbonRole.gibbonRoleID) 
                 WHERE (