Merge branch 'ILIAS-eLearning:release_10' into release_10

Author: abrahammordev

components/ILIAS/Authentication/classes/class.ilSessionReminder.php

@@ -109,7 +109,7 @@ public function getMaxPossibleLeadTime(): int
     {
         $expires = ilSession::getSessionExpireValue();
 
-        return max(self::MIN_LEAD_TIME, ($expires / 60) - 1);
+        return max(self::MIN_LEAD_TIME, (int) (floor($expires / 60) - 1));
     }
 
     private function init(): void

components/ILIAS/Forum/classes/Purifier/class.ilHtmlForumPostPurifier.php

@@ -28,7 +28,7 @@ protected function getPurifierConfigInstance(): HTMLPurifier_Config
     {
         $config = HTMLPurifier_Config::createDefault();
         $config->set('HTML.DefinitionID', 'ilias forum post');
-        $config->set('HTML.DefinitionRev', 2);
+        $config->set('HTML.DefinitionRev', 3);
         $config->set('Cache.SerializerPath', ilHtmlPurifierAbstractLibWrapper::_getCacheDirectory());
         $config->set('HTML.Doctype', 'XHTML 1.0 Strict');
 
@@ -37,6 +37,16 @@ protected function getPurifierConfigInstance(): HTMLPurifier_Config
         $config->set('HTML.AllowedElements', $this->removeUnsupportedElements($tags));
         $config->set('HTML.ForbiddenAttributes', 'div@style');
 
+        $config->autoFinalize = false;
+        $config->set(
+            'URI.AllowedSchemes',
+            array_merge(
+                $config->get('URI.AllowedSchemes'),
+                ['data' => true]
+            )
+        );
+        $config->autoFinalize = true;
+
         if (($def = $config->maybeGetRawHTMLDefinition()) !== null) {
             $def->addAttribute('img', 'data-id', 'Number');
             $def->addAttribute('a', 'target', 'Enum#_blank,_self,_target,_top');

components/ILIAS/Logging/classes/public/class.ilLoggerFactory.php

@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -18,6 +16,7 @@
  *
  *********************************************************************/
 
+declare(strict_types=1);
 
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
@@ -127,31 +126,31 @@ public function initUser(string $a_login): void
      */
     protected function isConsoleAvailable(): bool
     {
-        if (ilContext::getType() != ilContext::CONTEXT_WEB) {
+        if (ilContext::getType() !== ilContext::CONTEXT_WEB) {
             return false;
         }
-        if (
-            $this->dic->isDependencyAvailable('ctrl') && $this->dic->ctrl()->isAsynch() ||
+
+        if (($this->dic->isDependencyAvailable('ctrl') && $this->dic->ctrl()->isAsynch()) ||
             (
                 $this->dic->isDependencyAvailable('http') &&
-                strtolower($this->dic->http()->request()->getServerParams()['HTTP_X_REQUESTED_WITH'] ?? '') === 'xmlhttprequest'
+                strtolower(
+                    $this->dic->http()->request()->getServerParams()['HTTP_X_REQUESTED_WITH'] ?? ''
+                ) === 'xmlhttprequest'
             )
         ) {
             return false;
         }
 
-        if (
-            $this->dic->isDependencyAvailable('http') &&
-            strpos($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT'], 'text/html') !== false
-        ) {
+        if ($this->dic->isDependencyAvailable('http') &&
+            str_contains($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT'] ?? '', 'text/html')) {
             return true;
         }
-        if (
-            $this->dic->isDependencyAvailable('http') &&
-            strpos($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT'], 'application/json') !== false
-        ) {
+
+        if ($this->dic->isDependencyAvailable('http') &&
+            str_contains($this->dic->http()->request()->getServerParams()['HTTP_ACCEPT'] ?? '', 'application/json')) {
             return false;
         }
+
         return true;
     }