Local merge release 9

Modules/BookingManager/BookingProcess/class.ProcessUtilGUI.php

@@ -60,6 +60,8 @@ public function back(): void
         if ($retCmd !== "") {
             $this->ctrl->redirectByClass(get_class($this->parent_gui), $retCmd);
         } else {
+            //var_dump(get_class($this->parent_gui));
+            //exit;
             $this->ctrl->returnToParent($this->parent_gui);
         }
     }

Modules/BookingManager/BookingProcess/class.ilBookingProcessWithoutScheduleGUI.php

@@ -150,7 +150,7 @@ public function book(): void // ok
 
         $this->lng->loadLanguageModule("dateplaner");
         $this->ctrl->setParameter($this, 'object_id', $obj->getId());
-        $this->ctrl->setParameter($this, 'returnCmd', "book");
+        $this->ctrl->setParameter($this, 'returnCmd', "back");
 
         if ($this->user_id_to_book !== $this->user_id_assigner) {
             $this->ctrl->setParameter($this, 'bkusr', $this->user_id_to_book);
@@ -360,6 +360,6 @@ public function deliverPostFile(): void
 
     public function back(): void
     {
-        $this->util_gui->back();
+        $this->ctrl->redirectByClass(\ilObjBookingPoolGUI::class, 'render');
     }
 }

Modules/Chatroom/classes/class.ilChatroom.php

@@ -823,8 +823,8 @@ public function getLastMessages(int $number, ilChatroomUser $chatuser): array
         }
 
         usort($results, static function (stdClass $a, stdClass $b): int {
-            $a_timestamp = strlen((string) $a->timestamp) === 13 ? ((int) substr($a->timestamp, 0, -3)) : $a->timestamp;
-            $b_timestamp = strlen((string) $b->timestamp) === 13 ? ((int) substr($b->timestamp, 0, -3)) : $b->timestamp;
+            $a_timestamp = strlen((string) $a->timestamp) === 13 ? ((int) substr((string) $a->timestamp, 0, -3)) : $a->timestamp;
+            $b_timestamp = strlen((string) $b->timestamp) === 13 ? ((int) substr((string) $b->timestamp, 0, -3)) : $b->timestamp;
 
             return $b_timestamp - $a_timestamp;
         });

Modules/Chatroom/classes/gui/class.ilChatroomSettingsGUI.php

@@ -67,7 +67,11 @@ public function saveGeneral(): void
         }
 
         foreach ($mutated_settings as $setting => &$value) {
-            if (array_key_exists($setting, $values)) {
+            if ($setting === ilChatroomFormFactory::PROP_ALLOW_CUSTOM_NAMES) {
+                $value = is_array($values[$setting] ?? null);
+            } elseif ($setting === ilChatroomFormFactory::PROP_AUTOGEN_USERNAMES) {
+                $value = $values[ilChatroomFormFactory::PROP_ALLOW_CUSTOM_NAMES][ilChatroomFormFactory::PROP_AUTOGEN_USERNAMES] ?? '';
+            } elseif (array_key_exists($setting, $values)) {
                 $value = $values[$setting];
             }
         }

Modules/CmiXapi/classes/XapiResults/class.ilXapiStatementEvaluation.php

@@ -75,23 +75,27 @@ public function evaluateReport(ilCmiXapiStatementsReport $report): void
             $xapiStatement = json_decode(json_encode($xapiStatement));
             $cmixUser = $this->getCmixUser($xapiStatement);
 
-            $this->evaluateStatement($xapiStatement, $cmixUser->getUsrId());
+            if ($cmixUser != null) {
+                $this->evaluateStatement($xapiStatement, $cmixUser->getUsrId());
 
-            $this->log->debug('update lp for object (' . $this->object->getId() . ')');
-            if ($cmixUser->getUsrId() != ANONYMOUS_USER_ID) {
-                ilLPStatusWrapper::_updateStatus($this->object->getId(), $cmixUser->getUsrId());
+                $this->log->debug('update lp for object (' . $this->object->getId() . ')');
+                if ($cmixUser->getUsrId() != ANONYMOUS_USER_ID) {
+                    ilLPStatusWrapper::_updateStatus($this->object->getId(), $cmixUser->getUsrId());
+                }
             }
         }
     }
 
-    public function getCmixUser(object $xapiStatement): \ilCmiXapiUser
+    public function getCmixUser(object $xapiStatement): ?\ilCmiXapiUser
     {
         $cmixUser = null;
         if ($this->object->getContentType() == ilObjCmiXapi::CONT_TYPE_CMI5) {
-            $cmixUser = ilCmiXapiUser::getInstanceByObjectIdAndUsrIdent(
-                $this->object->getId(),
-                $xapiStatement->actor->account->name
-            );
+            if (isset($xapiStatement->actor->account->name)) {
+                $cmixUser = ilCmiXapiUser::getInstanceByObjectIdAndUsrIdent(
+                    $this->object->getId(),
+                    $xapiStatement->actor->account->name
+                );
+            }
         } else {
             $cmixUser = ilCmiXapiUser::getInstanceByObjectIdAndUsrIdent(
                 $this->object->getId(),
@@ -135,9 +139,11 @@ public function evaluateStatement(object $xapiStatement, int $usrId): void
                     if (($xapiVerb == ilCmiXapiVerbList::COMPLETED || $xapiVerb == ilCmiXapiVerbList::PASSED) && $this->isLpModeInterestedInResultStatus($newResultStatus, false)) {
                         // it is possible to check against authToken usrId!
                         $cmixUser = $this->getCmixUser($xapiStatement);
-                        $cmixUser->setSatisfied(true);
-                        $cmixUser->save();
-                        $this->sendSatisfiedStatement($cmixUser);
+                        if ($cmixUser != null) {
+                            $cmixUser->setSatisfied(true);
+                            $cmixUser->save();
+                            $this->sendSatisfiedStatement($cmixUser);
+                        }
                     }
                 }
             }

Modules/CmiXapi/classes/class.ilCmiXapiResult.php

@@ -224,7 +224,7 @@ public static function getResultsForObject(int $objId): array
 
         $results = [];
 
-        if ($row = $DIC->database()->fetchAssoc($res)) {
+        while ($row = $DIC->database()->fetchAssoc($res)) {
             $result = new self();
             $result->assignFromDbRow($row);
 

Modules/DataCollection/classes/Content/class.ilDclRecordListTableGUI.php

@@ -261,13 +261,9 @@ protected function fillRow(array $a_set): void
 
         if ($a_set["_front"]) {
             $this->tpl->setCurrentBlock('view');
-            $this->tpl->setVariable("VIEW_IMAGE_LINK", $a_set["_front"]);
             $this->tpl->setVariable(
-                "VIEW_IMAGE_SRC",
-                ilUtil::img(
-                    ilUtil::getImagePath("media/enlarge.svg"),
-                    $this->lng->txt('dcl_display_record_alt')
-                )
+                "VIEW_DETAILS",
+                $this->ui->renderer()->render($this->ui->factory()->symbol()->glyph()->search($a_set["_front"]))
             );
             $this->tpl->parseCurrentBlock();
         }

Modules/DataCollection/classes/CreateView/class.ilDclCreateViewDefinitionGUI.php

@@ -16,172 +16,42 @@
  *
  *********************************************************************/
 
-
 declare(strict_types=1);
 
 /**
- * Class ilDclCreateViewDefinitionGUI
- * @ilCtrl_Calls ilDclCreateViewDefinitionGUI: ilPageEditorGUI, ilEditClipboardGUI, ilMediaPoolTargetSelector
- * @ilCtrl_Calls ilDclCreateViewDefinitionGUI: ilPublicUserProfileGUI, ilPageObjectGUI
+ * @ilCtrl_IsCalledBy ilDclCreateViewDefinitionGUI: ilDclTableViewEditGUI
  */
-class ilDclCreateViewDefinitionGUI extends ilPageObjectGUI
+class ilDclCreateViewDefinitionGUI
 {
     public ilDclTableView $tableview;
-    protected ilDclCreateViewTableGUI $table_gui;
     protected ilCtrl $ctrl;
-    protected int $tableview_id;
+    protected ilLanguage $lng;
     protected ILIAS\HTTP\Services $http;
     protected ILIAS\Refinery\Factory $refinery;
+    protected ilGlobalTemplateInterface $tpl;
 
     public function __construct(int $tableview_id)
     {
         global $DIC;
         $this->ctrl = $DIC->ctrl();
-        $this->tableview_id = $tableview_id;
+        $this->lng = $DIC->language();
         $this->http = $DIC->http();
         $this->refinery = $DIC->refinery();
-
+        $this->tpl = $DIC->ui()->mainTemplate();
         $this->tableview = ilDclTableView::findOrGetInstance($tableview_id);
-
-        // we always need a page object - create on demand
-        if (!ilPageObject::_exists('dclf', $tableview_id)) {
-            $ref_id = $this->http->wrapper()->query()->retrieve('ref_id', $this->refinery->kindlyTo()->int());
-
-            $viewdef = new ilDclCreateViewDefinition();
-            $viewdef->setId($tableview_id);
-            $viewdef->setParentId(ilObject2::_lookupObjectId($ref_id));
-            $viewdef->setActive(false);
-            $viewdef->create();
-        }
-
-        parent::__construct("dclf", $tableview_id);
-
-        $table = new ilDclCreateViewTableGUI($this);
-        $this->table_gui = $table;
-        $this->tpl->setContent($table->getHTML());
     }
 
     public function executeCommand(): string
     {
-        global $DIC;
-        $ilLocator = $DIC['ilLocator'];
-        $lng = $DIC['lng'];
-
-        $next_class = $this->ctrl->getNextClass($this);
-
-        $viewdef = $this->getPageObject();
-        $this->ctrl->setParameter($this, "dclv", $viewdef->getId());
-        $title = $lng->txt("dcl_view_viewdefinition");
-
-        switch ($next_class) {
-            case "ilpageobjectgui":
-                throw new ilCOPageException("Deprecated. ilDclDetailedViewDefinitionGUI gui forwarding to ilpageobject");
-            default:
-                $this->setPresentationTitle($title);
-                $ilLocator->addItem($title, $this->ctrl->getLinkTarget($this, "preview"));
-                return parent::executeCommand();
-        }
-    }
-
-    protected function activate(): void
-    {
-        $page = $this->getPageObject();
-        $page->setActive(true);
-        $page->update();
-        $this->ctrl->redirect($this, 'edit');
-    }
-
-    protected function deactivate(): void
-    {
-        $page = $this->getPageObject();
-        $page->setActive(false);
-        $page->update();
-        $this->ctrl->redirect($this, 'edit');
-    }
-
-    public function confirmDelete(): void
-    {
-        global $DIC;
-        $ilCtrl = $DIC['ilCtrl'];
-        $lng = $DIC['lng'];
-        $tpl = $DIC['tpl'];
-
-        $conf = new ilConfirmationGUI();
-        $conf->setFormAction($ilCtrl->getFormAction($this));
-        $conf->setHeaderText($lng->txt('dcl_confirm_delete_detailed_view_title'));
-
-        $conf->addItem('tableview', (string) $this->tableview_id, $lng->txt('dcl_confirm_delete_detailed_view_text'));
-
-        $conf->setConfirm($lng->txt('delete'), 'deleteView');
-        $conf->setCancel($lng->txt('cancel'), 'cancelDelete');
-
-        $tpl->setContent($conf->getHTML());
-    }
-
-    public function cancelDelete(): void
-    {
-        global $DIC;
-        $ilCtrl = $DIC['ilCtrl'];
-
-        $ilCtrl->redirect($this, "edit");
-    }
-
-    public function deleteView(): void
-    {
-        global $DIC;
-        $ilCtrl = $DIC['ilCtrl'];
-        $lng = $DIC['lng'];
-
-        if ($this->tableview_id && ilDclDetailedViewDefinition::exists($this->tableview_id)) {
-            $pageObject = new ilDclDetailedViewDefinition($this->tableview_id);
-            $pageObject->delete();
-        }
-
-        $this->tpl->setOnScreenMessage('success', $lng->txt("dcl_empty_detailed_view_success"), true);
-
-        // Bug fix for mantis 22537: Redirect to settings-tab instead of fields-tab. This solves the problem and is more intuitive.
-        $ilCtrl->redirectByClass("ilDclTableViewEditGUI", "editGeneralSettings");
-    }
-
-    /**
-     * Finalizing output processing
-     * @param string $a_output
-     * @return string
-     */
-    public function postOutputProcessing(string $a_output): string
-    {
-        // You can use this to parse placeholders and the like before outputting
-
-        if ($this->getOutputMode() == ilPageObjectGUI::PREVIEW) {
-            //page preview is not being used inside DataCollections - if you are here, something's probably wrong
-
-            //
-            //			// :TODO: find a suitable presentation for matched placeholders
-            //			$allp = ilDataCollectionRecordViewViewdefinition::getAvailablePlaceholders($this->table_id, true);
-            //			foreach ($allp as $id => $item) {
-            //				$parsed_item = new ilTextInputGUI("", "fields[" . $item->getId() . "]");
-            //				$parsed_item = $parsed_item->getToolbarHTML();
-            //
-            //				$a_output = str_replace($id, $item->getTitle() . ": " . $parsed_item, $a_output);
-            //			}
-        } // editor
-        else {
-            if ($this->getOutputMode() == ilPageObjectGUI::EDIT) {
-                $allp = $this->getPageObject()->getAvailablePlaceholders();
-
-                // :TODO: find a suitable markup for matched placeholders
-                foreach ($allp as $item) {
-                    $a_output = str_replace($item, "<span style=\"color:green\">" . $item . "</span>", $a_output);
-                }
-            }
+        if ($this->ctrl->getCmd() === 'saveTable') {
+            $this->saveTable();
         }
+        $table = new ilDclCreateViewTableGUI($this);
+        $this->tpl->setContent($table->getHTML());
+        return '';
 
-        return $a_output;
     }
 
-    /**
-     * Save table entries
-     */
     public function saveTable(): void
     {
         $f = new ilDclDefaultValueFactory();