kroepelin-projekte
diff --git a/‎Modules/Blog/classes/class.ilObjBlogGUI.php‎
Lines changed: 5 additions & 3 deletions b/‎Modules/Blog/classes/class.ilObjBlogGUI.php‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎Modules/Chatroom/README.md‎
Lines changed: 30 additions & 24 deletions b/‎Modules/Chatroom/README.md‎
Lines changed: 30 additions & 24 deletions
diff --git a/‎Modules/Course/classes/Objectives/class.ilLOTestAssignments.php‎
Lines changed: 4 additions & 3 deletions b/‎Modules/Course/classes/Objectives/class.ilLOTestAssignments.php‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎Modules/Course/classes/class.ilCourseMembershipGUI.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/Course/classes/class.ilCourseMembershipGUI.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/DataCollection/classes/Content/class.ilDclContentExporter.php‎
Lines changed: 1 addition & 0 deletions b/‎Modules/DataCollection/classes/Content/class.ilDclContentExporter.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Modules/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/DataCollection/classes/Fields/Formula/FormulaParser/Result/MathResultResolver.php‎
Lines changed: 1 addition & 3 deletions b/‎Modules/DataCollection/classes/Fields/Formula/FormulaParser/Result/MathResultResolver.php‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎Modules/DataCollection/classes/Fields/Mob/class.ilDclMobRecordFieldModel.php‎
Lines changed: 1 addition & 0 deletions b/‎Modules/DataCollection/classes/Fields/Mob/class.ilDclMobRecordFieldModel.php‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordRepresentation.php‎
Lines changed: 1 addition & 1 deletion b/‎Modules/DataCollection/classes/Fields/Text/class.ilDclTextRecordRepresentation.php‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Modules/DataCollection/classes/Table/class.ilDclTable.php‎
Lines changed: 0 additions & 3 deletions b/‎Modules/DataCollection/classes/Table/class.ilDclTable.php‎
Lines changed: 0 additions & 3 deletions
@@ -1558,11 +1558,13 @@ public function renderList(
             }
 
             // permanent link
-            if ($a_cmd !== "preview" && $a_cmd !== "previewEmbedded") {
+            if ($this->node_id !== null &&
+                $a_cmd !== "preview" &&
+                $a_cmd !== "previewEmbedded") {
                 if ($this->id_type === self::WORKSPACE_NODE_ID) {
-                    $goto = $this->gui->permanentLink(0, $this->node_id)->getPermanentLink((int) $item["id"]);
+                    $goto = $this->gui->permanentLink(0, (int) $this->node_id)->getPermanentLink((int) $item["id"]);
                 } else {
-                    $goto = $this->gui->permanentLink($this->node_id)->getPermanentLink((int) $item["id"]);
+                    $goto = $this->gui->permanentLink((int) $this->node_id)->getPermanentLink((int) $item["id"]);
                 }
                 $wtpl->setCurrentBlock("permalink");
                 $wtpl->setVariable("URL_PERMALINK", $goto);
 
@@ -8,6 +8,9 @@ interpreted as described in [RFC 2119](https://www.ietf.org/rfc/rfc2119.txt).
 <!-- TOC -->
 
   - [Requirement](#requirement)
+  - [Dependency Management](#dependency-management)
+    - [Development](#development) 
+    - [Production](#production)
   - [ILIAS configuration](#ilias-configuration)
     - [Chat Server Settings](#chat-server-settings)
       - [IP Address / FQDN](#ip-address--fqdn)
@@ -30,9 +33,6 @@ interpreted as described in [RFC 2119](https://www.ietf.org/rfc/rfc2119.txt).
   - [Proxy Configuration](#proxy-configuration)
       - [Proxy configuration via nginx](#proxy-configuration-via-nginx)
       - [Proxy configuration via apache2](#proxy-configuration-via-apache2)
-    - [Dependency Management](#dependency-management)
-      - [Development](#development) 
-      - [Production](#production)
 
 <!-- /TOC -->
 
@@ -53,6 +53,33 @@ Both files MUST be passed to start the Chat Server (see [Server Configuration](#
 
 **Note:** On all changes to the settings, the chat server MUST be restarted!
 
+## Dependency Management
+
+As of ILIAS 9 the node module dependencies for the ILIAS chat server are no longer included in the code repository and MUST be installed/managed locally.
+
+The node module dependencies should be managed by [npm](https://www.npmjs.com/):
+
+```bash
+cd [ILIAS_ROOT_DIRECTORY]/Modules/Chatroom/chat
+```
+
+### Development
+
+Dependencies can be installed by the following command:
+
+```bash
+npm clean-install --ignore-scripts
+```
+
+### Production
+
+Dependencies can be installed by the following command:
+
+```bash
+npm clean-install --omit=dev --ignore-scripts
+```
+In case you run the ILIAS chat server in a different directory, make sure you install/manage dependencies before copying the entire chat directory (`ILIAS / Modules / Chatroom / chat`) (see [Server Configuration](#server-configuration)).
+
 ## ILIAS Configuration
 
 ### Chat Server Settings
@@ -459,24 +486,3 @@ In the ILIAS configuration the proxy configurations are adjusted in the ***Chat
 Example:
 
     https://onscreenchat.domain.de
-
-
-### Dependency Management
-
-The node module dependencies should be managed by [npm](https://www.npmjs.com/).
-
-#### Development
-
-Dependencies can be installed by the following command:
-
-```bash
-npm clean-install --ignore-scripts
-```
-
-#### Production
-
-Dependencies can be installed by the following command:
-
-```bash
-npm clean-install --omit=dev --ignore-scripts
-```
 
@@ -1,6 +1,5 @@
 <?php
 
-declare(strict_types=0);
 /**
  * This file is part of ILIAS, a powerful learning management system
  * published by ILIAS open source e-Learning e.V.
@@ -17,6 +16,8 @@
  *
  *********************************************************************/
 
+declare(strict_types=0);
+
 /**
  * Settings for LO courses
  * @author Stefan Meyer <[email protected]>
@@ -176,7 +177,7 @@ public function getTypeByTest(int $a_test_ref_id): int
             }
         } elseif ($this->getSettings()->worksWithInitialTest()) {
             foreach ($this->assignments as $assignment) {
-                if ($assignment->getTestRefId() == $a_test_ref_id) {
+                if ($assignment->getTestRefId() == $a_test_ref_id && $assignment->getAssignmentType() == ilLOSettings::TYPE_TEST_INITIAL) {
                     return ilLOSettings::TYPE_TEST_INITIAL;
                 }
             }
@@ -187,7 +188,7 @@ public function getTypeByTest(int $a_test_ref_id): int
             }
         } else {
             foreach ($this->assignments as $assignment) {
-                if ($assignment->getTestRefId() == $a_test_ref_id) {
+                if ($assignment->getTestRefId() == $a_test_ref_id && $assignment->getAssignmentType() == ilLOSettings::TYPE_TEST_QUALIFIED) {
                     return ilLOSettings::TYPE_TEST_QUALIFIED;
                 }
             }
 
@@ -204,7 +204,7 @@ public function assignMembers(array $a_usr_ids, string $a_type): bool
             $this->tpl->setOnScreenMessage('success', $this->lng->txt("crs_users_added"), true);
             $this->ctrl->redirect($this, 'participants');
         }
-        $this->tpl->setOnScreenMessage('failure', $this->lng->txt("crs_users_already_assigned"), true);
+        $this->tpl->setOnScreenMessage('info', $this->lng->txt("crs_users_already_assigned"), true);
         return false;
     }
 
 
@@ -190,6 +190,7 @@ public function export(string $format = self::EXPORT_EXCEL, string $filepath = n
             return false;
         }
 
+        $this->main_tpl->setOnScreenMessage($this->main_tpl::MESSAGE_TYPE_SUCCESS, $this->lng->txt('exp_file_created'), true);
         if ($send) {
             $adapter->sendToClient($filename);
         } else {
 
@@ -168,7 +168,7 @@ public function renderRecord(bool $editComments = false): void
         $pageObj = new ilDclDetailedViewDefinitionGUI($this->tableview_id);
         $pageObj->setOutputMode($pageObj::PRESENTATION);
 
-        $html = $pageObj->getHTML();
+        $html = $pageObj->showPage();
         $rctpl->addCss("./Services/COPage/css/content.css");
         $rctpl->fillCssFiles();
         $table = ilDclCache::getTableCache($this->record_obj->getTableId());
 
@@ -156,9 +156,7 @@ protected function parseMath(array $tokens): array
         }
         // If one element is left on stack, we are done. Otherwise calculate
         if ($stack->count() === 1) {
-            $result = $stack->pop();
-
-            $value = (ctype_digit((string) $result)) ? $result : number_format($result, 2, '.', "'");
+            $value = (int) round((float) $stack->pop());
             return [$value, $last_operator ?? null];
         }
 
 
@@ -72,6 +72,7 @@ public function parseValue($value)
             }
 
             ilFileUtils::rename($move_file, $target_file_path);
+            chmod($target_file_path, 0640);
             ilFileUtils::renameExecutables($mob_dir);
 
             $format = ilObjMediaObject::getMimeType($target_file_path);
 
@@ -63,7 +63,7 @@ public function getHTML(bool $link = true, array $options = []): string
                 $tableview_id = $this->http->wrapper()->query()->retrieve('tableview_id', $this->refinery->kindlyTo()->int());
                 foreach ($views as $v) {
                     if ($v->getId() === $tableview_id) {
-                        $view = $tableview_id;
+                        $view = $v;
                         break;
                     }
                 }
 
@@ -359,9 +359,6 @@ public function getField(string $field_id): ?ilDclBaseFieldModel
         return $field;
     }
 
-    /**
-     * @return int[]
-     */
     public function getFieldIds(): array
     {
         $field_ids = [];
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-declare(strict_types=0);`
`4`	`3`	`/**`
`5`	`4`	`* This file is part of ILIAS, a powerful learning management system`
`6`	`5`	`* published by ILIAS open source e-Learning e.V.`
`@@ -17,6 +16,8 @@`
`17`	`16`	`*`
`18`	`17`	`*********************************************************************/`
`19`	`18`
	`19`	`+declare(strict_types=0);`
	`20`	`+`
`20`	`21`	`/**`
`21`	`22`	`* Settings for LO courses`
`22`	`23`	`* @author Stefan Meyer <[email protected]>`
`@@ -176,7 +177,7 @@ public function getTypeByTest(int $a_test_ref_id): int`
`176`	`177`	`}`
`177`	`178`	`} elseif ($this->getSettings()->worksWithInitialTest()) {`
`178`	`179`	`foreach ($this->assignments as $assignment) {`
`179`		`- if ($assignment->getTestRefId() == $a_test_ref_id) {`
	`180`	`+ if ($assignment->getTestRefId() == $a_test_ref_id && $assignment->getAssignmentType() == ilLOSettings::TYPE_TEST_INITIAL) {`
`180`	`181`	`return ilLOSettings::TYPE_TEST_INITIAL;`
`181`	`182`	`}`
`182`	`183`	`}`
`@@ -187,7 +188,7 @@ public function getTypeByTest(int $a_test_ref_id): int`
`187`	`188`	`}`
`188`	`189`	`} else {`
`189`	`190`	`foreach ($this->assignments as $assignment) {`
`190`		`- if ($assignment->getTestRefId() == $a_test_ref_id) {`
	`191`	`+ if ($assignment->getTestRefId() == $a_test_ref_id && $assignment->getAssignmentType() == ilLOSettings::TYPE_TEST_QUALIFIED) {`
`191`	`192`	`return ilLOSettings::TYPE_TEST_QUALIFIED;`
`192`	`193`	`}`
`193`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function assignMembers(array $a_usr_ids, string $a_type): bool`
`204`	`204`	`$this->tpl->setOnScreenMessage('success', $this->lng->txt("crs_users_added"), true);`
`205`	`205`	`$this->ctrl->redirect($this, 'participants');`
`206`	`206`	`}`
`207`		`- $this->tpl->setOnScreenMessage('failure', $this->lng->txt("crs_users_already_assigned"), true);`
	`207`	`+ $this->tpl->setOnScreenMessage('info', $this->lng->txt("crs_users_already_assigned"), true);`
`208`	`208`	`return false;`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,7 @@ public function export(string $format = self::EXPORT_EXCEL, string $filepath = n`
`190`	`190`	`return false;`
`191`	`191`	`}`
`192`	`192`
	`193`	`+ $this->main_tpl->setOnScreenMessage($this->main_tpl::MESSAGE_TYPE_SUCCESS, $this->lng->txt('exp_file_created'), true);`
`193`	`194`	`if ($send) {`
`194`	`195`	`$adapter->sendToClient($filename);`
`195`	`196`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,7 @@ protected function parseMath(array $tokens): array`
`156`	`156`	`}`
`157`	`157`	`// If one element is left on stack, we are done. Otherwise calculate`
`158`	`158`	`if ($stack->count() === 1) {`
`159`		`- $result = $stack->pop();`
`160`		`-`
`161`		`- $value = (ctype_digit((string) $result)) ? $result : number_format($result, 2, '.', "'");`
	`159`	`+ $value = (int) round((float) $stack->pop());`
`162`	`160`	`return [$value, $last_operator ?? null];`
`163`	`161`	`}`
`164`	`162`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@ public function parseValue($value)`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`ilFileUtils::rename($move_file, $target_file_path);`
	`75`	`+ chmod($target_file_path, 0640);`
`75`	`76`	`ilFileUtils::renameExecutables($mob_dir);`
`76`	`77`
`77`	`78`	`$format = ilObjMediaObject::getMimeType($target_file_path);`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function getHTML(bool $link = true, array $options = []): string`
`63`	`63`	`$tableview_id = $this->http->wrapper()->query()->retrieve('tableview_id', $this->refinery->kindlyTo()->int());`
`64`	`64`	`foreach ($views as $v) {`
`65`	`65`	`if ($v->getId() === $tableview_id) {`
`66`		`- $view = $tableview_id;`
	`66`	`+ $view = $v;`
`67`	`67`	`break;`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -359,9 +359,6 @@ public function getField(string $field_id): ?ilDclBaseFieldModel`
`359`	`359`	`return $field;`
`360`	`360`	`}`
`361`	`361`
`362`		`- /**`
`363`		`- * @return int[]`
`364`		`- */`
`365`	`362`	`public function getFieldIds(): array`
`366`	`363`	`{`
`367`	`364`	`$field_ids = [];`