Merge branch 'ILIAS-eLearning:release_10' into ilias10_survey_language_thresholds

Author: abrahammordev

components/ILIAS/Accordion/resources/accordion.js

@@ -1,4 +1,18 @@
-/* */
+/**
+ * This file is part of ILIAS, a powerful learning management system
+ * published by ILIAS open source e-Learning e.V.
+ *
+ * ILIAS is licensed with the GPL-3.0,
+ * see https://www.gnu.org/licenses/gpl-3.0.en.html
+ * You should have received a copy of said license along with the
+ * source code, too.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ ******************************************************************** */
 
 il.Accordion = {
 
@@ -474,10 +488,7 @@ il.Accordion = {
 	rerenderContent: function(acc_el) {
 
 		// rerender mathjax
-		if (typeof MathJax != "undefined" && typeof MathJax.Hub != "undefined") {
-			MathJax.Hub.Queue(["Reprocess",MathJax.Hub, acc_el[0]]);
-		}
-		// see http://docs.mathjax.org/en/latest/typeset.html
+		il.Util.renderMathJax([acc_el[0]], true);
 
 		// rerender google maps
 		if (typeof ilMapRerender != "undefined") {

components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontend.php

@@ -282,8 +282,8 @@ protected function handleAuthenticationSuccess(ilAuthProviderInterface $provider
             return false;
         }
 
-        // check simultaneos logins
-        $this->logger->debug('Check simutaneous login');
+        // check simultaneous logins
+        $this->logger->debug('Check simultaneous login');
         if (!$this->checkSimultaneousLogins($user)) {
             $this->logger->info('Authentication failed: simultaneous logins forbidden for user: ' . $this->getStatus()->getAuthenticatedUserId());
             $this->getStatus()->setStatus(ilAuthStatus::STATUS_AUTHENTICATION_FAILED);

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/COPage/templates/default/tpl.question_export.html

@@ -19,9 +19,8 @@
 		jQuery('div#container{VAL_ID}').autoRender(questions[{VAL_ID}]);
 		{HANDLE_IMAGES}
 
-		if (typeof MathJax != "undefined" && typeof MathJax.Hub != "undefined") {
-			MathJax.Hub.Queue(["Typeset",MathJax.Hub, "container{VAL_ID}"]);
-		}
+		const el = document.getElementById("container{VAL_ID}");
+		il.Util.renderMathJax([el]);
 	}
 </script>
 <!-- END singlechoice -->
@@ -54,9 +53,8 @@
 
 	question.init();
 
-	if (typeof MathJax != "undefined" && typeof MathJax.Hub != "undefined") {
-		MathJax.Hub.Queue(["Typeset", MathJax.Hub, "container{VAL_ID}"]);
-	}
+	const el = document.getElementById("container{VAL_ID}");
+	il.Util.renderMathJax([el]);
 };
 </script>
 <!-- END multiplechoice -->
@@ -107,9 +105,8 @@
 
 		{HANDLE_IMAGES}
 
-		if (typeof MathJax != "undefined") {
-			MathJax.Hub.Queue(["Typeset", MathJax.Hub, "container{VAL_ID}"]);
-		}
+		const el = document.getElementById("container{VAL_ID}");
+		il.Util.renderMathJax([el]);
 
 	})(questions[{VAL_ID}]);
 };
@@ -134,10 +131,9 @@
 	ilias.questions.shuffle(questions[{VAL_ID}]);
 	jQuery('div#container{VAL_ID}').autoRender(questions[{VAL_ID}]);
 	{HANDLE_IMAGES}
-	if (typeof MathJax != "undefined") {
-		MathJax.Hub.Queue(["Typeset", MathJax.Hub, "container{VAL_ID}"]);
-	}
-    il.test.orderingvertical.init(document.querySelector('#container{VAL_ID}'));
+	const el = document.getElementById("#container{VAL_ID}");
+	il.Util.renderMathJax([el]);
+  	il.test.orderingvertical.init(document.querySelector('#container{VAL_ID}'));
 }
 </script>
 <!-- END orderingquestion -->
@@ -287,10 +283,9 @@
 
 		$(document).ready(
             function () {
-                if (typeof MathJax != "undefined" && typeof MathJax.Hub != "undefined") {
-                    MathJax.Hub.Queue(["Typeset", MathJax.Hub, "container{VAL_ID}"]);
-                }
-                il.test.matching.init(document.querySelector('#ilMatchingQuestionContainer_{VAL_ID}'), questionData.matching_mode);
+              const el = document.getElementById("container{VAL_ID}");
+              il.Util.renderMathJax([el]);
+              il.test.matching.init(document.querySelector('#ilMatchingQuestionContainer_{VAL_ID}'), questionData.matching_mode);
             }
 		);
 

components/ILIAS/Cache/README.md

@@ -1 +1,107 @@
-# Cache
+ILIAS Caching Service
+=====================
+
+The ILIAS Caching Service replaces the old GlobalCache Service with ILIAS 9.
+Internally, the GlobalCache service currently also uses the new cache service,
+but will be removed in the medium term.
+
+# Cache data
+
+## When does it make sense to cache data?
+
+Data caching should be used when simple data does not change between two
+requests and is not user-independent. It must also be clear when the data in the
+cache becomes invalid and needs to be updated. Caching must also always include
+reading the data from a persistence layer (database, file system) as a fallback.
+
+## Differentiation from artifacts
+
+Artifacts are always suitable when the data not only does not change between two
+requests, but is always the same depending on the exact version of the ILIAS
+source code. Artifacts are generated when ILIAS is built, cache is filled at
+runtime. This can be easily explained using the following example:
+
+The translations in ILIAS (Language Service) would be a candidate for artifacts
+under the following circumstances:
+
+> The exact content of the translations in ILIAS is only available in the form
+> of language files. In this case, this content could be built as an Artifact
+> and
+> thus be available with high performance.
+
+But then why are translations not in Artifacts?
+
+> ILIAS offers administration in the GUI for the translations, i.e. the exact
+> translations do not necessarily have to come from the language files, but can
+> change through customization.
+
+Would the translations be a candidate for the cache?
+
+> Yes, under the following circumstances: It is known exactly when the content
+> of the translations changes (e.g. through changes to the language files
+> through
+> an ILIAS update or through manual adjustments in the administration. If these
+> situations are known, the language service can invalidate the cache at the
+> right
+> moment, read the correct content and rebuild the cache.
+
+## How to use the cache service
+
+The data is stored in a cache container. To obtain such a container, a cache
+container request is implemented. This is very simple and can also be
+implemented on existing classes, for example, which is often useful for
+repositories.
+
+```php
+use ILIAS\Cache\Container\Request;
+ 
+class MyRepository implements Request {
+    public function getContainerKey() : string{
+        return 'my_repository';
+    }
+    public function isForced() : bool{
+        return true;
+    } 
+}
+```
+
+The two methods to be implemented can be described as follows:
+
+`getContainerKey`: This is the namespace for your container. ILIAS will
+check that two components are not using the same namespace and can therefore
+overwrite each other's cache.
+
+`isForced`: Individual containers can be activated via the setup, see the README
+for the setup. However, this can be overwritten with isForces if the cotnaienr
+is to be active in any case. This should not be used in the core but only in
+plugins.
+
+The container can then be obtained via the cache service:
+
+```php
+global DIC;
+
+$container = $DIC->chache()->get(new MyRepository());
+```
+The following methods are then available in the container:
+
+```php
+use ILIAS\Cache\Container\Container;
+/** @var Container $container */
+$container = $DIC->globalCache()->get(new MyRepository());
+
+$container->has('key'); // Check if a key exists
+$container->get('key'); // Get a value
+$container->set('key', 'value'); // Set a value
+$container->delete('key'); // Delete a value
+$container->flush(); // Delete all values
+$container->lock(3.5); // Lock the container, see below
+```
+
+## Storable Values
+The service only supports simple scalar values for storage, e.g. no objects
+can be stored. The values can be stored individually or as an array.
+
+## Locking
+The COntainer can be locked for a certain period of time, i.e. `has` always  
+returns false during this time, `get` always returns null.

components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php

@@ -18,7 +18,11 @@
 
 declare(strict_types=1);
 
+use ILIAS\Filesystem\Stream\Streams;
+use ILIAS\HTTP\Response\ResponseHeader;
 use ILIAS\HTTP\Services;
+use ILIAS\UI\Factory as UIFactory;
+use ILIAS\UI\Renderer as UIRenderer;
 
 /**
  * Class ilBuddySystemGUI
@@ -39,6 +43,8 @@ class ilBuddySystemGUI
     protected ilLanguage $lng;
     protected Services $http;
     private readonly ilGlobalTemplateInterface $main_tpl;
+    private UIFactory $ui_factory;
+    private UIRenderer $ui_renderer;
 
     public function __construct()
     {
@@ -49,6 +55,8 @@ public function __construct()
         $this->ctrl = $DIC['ilCtrl'];
         $this->user = $DIC['ilUser'];
         $this->lng = $DIC['lng'];
+        $this->ui_factory = $DIC->ui()->factory();
+        $this->ui_renderer = $DIC->ui()->renderer();
 
         $this->buddyList = ilBuddyList::getInstanceByGlobalUser();
         $this->stateFactory = ilBuddySystemRelationStateFactory::getInstance();
@@ -68,8 +76,14 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void
             $DIC->language()->loadLanguageModule('buddysystem');
 
             $page->addJavaScript('./assets/js/buddy_system.js');
+            $page->addJavaScript('./assets/js/modal.min.js');
 
             $config = new stdClass();
+            $config->async_get_unlink_modal_confirmation_html = $DIC->ctrl()->getLinkTargetByClass([
+                ilUIPluginRouterGUI::class,
+                self::class
+            ], 'asyncGetUnlinkModalConfirmationHtml', '', true, false);
+
             $config->http_post_url = $DIC->ctrl()->getFormActionByClass([
                 ilUIPluginRouterGUI::class,
                 self::class
@@ -87,6 +101,40 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void
         }
     }
 
+    public function asyncGetUnlinkModalConfirmationHtmlCommand(): never
+    {
+        $modal_id = null;
+        $confirmation_modal = $this
+            ->ui_factory
+            ->modal()
+            ->interruptive(
+                $this->lng->txt('confirmation'),
+                $this->lng->txt('buddy_confirm_unlink'),
+                ''
+            )
+            ->withActionButtonLabel($this->lng->txt('confirm'))
+            ->withAdditionalOnLoadCode(function ($id) use (&$modal_id) {
+                $modal_id = $id;
+                return '';
+            });
+
+        $this->http->saveResponse(
+            $this->http->response()->withBody(
+                Streams::ofString(
+                    json_encode([
+                        'html' => $this->ui_renderer->renderAsync($confirmation_modal),
+                        'signals' => [
+                            'close' => $confirmation_modal->getCloseSignal()->getId()
+                        ],
+                        'modalId' => $modal_id
+                    ], JSON_THROW_ON_ERROR)
+                )
+            )->withHeader(ResponseHeader::CONTENT_TYPE, 'application/json')
+        );
+        $this->http->sendResponse();
+        $this->http->close();
+    }
+
     /**
      * @throws RuntimeException
      */