Skip to content

Commit

Permalink
Merge branch 'update_9' into 'release_9'
Browse files Browse the repository at this point in the history 
Update to ILIAS 9.3 (12.08.2024)

See merge request ilias-hosting/ilias!6
  • Loading branch information
@iszmais
iszmais committed Aug 12, 2024
2 parents 354aa3a + 0ad3270 commit 628b7ee
Show file tree
Hide file tree
Showing 90 changed files with 1,525 additions and 868 deletions.
113 changes: 58 additions & 55 deletions Modules/Chatroom/classes/Setup/class.ilChatroomMetricsCollectedObjective.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ protected function getTentativePreconditions(Setup\Environment $environment): ar
return [
new ilIniFilesLoadedObjective(),
new ilDatabaseInitializedObjective(),
new ilFileSystemComponentDataDirectoryCreatedObjective("chatroom")
new ilFileSystemComponentDataDirectoryCreatedObjective('chatroom')
];
}

Expand All @@ -40,10 +40,10 @@ protected function collectFrom(Setup\Environment $environment, Setup\Metrics\Sto
// sub components of the various readers to run. This is a memento to the
// fact, that dependency injection is something we want. Currently, every
// component could just service locate the whole world via the global $DIC.
$DIC = $GLOBALS["DIC"];
$GLOBALS["DIC"] = new DI\Container();
$GLOBALS["DIC"]["ilDB"] = $db;
$GLOBALS["DIC"]["ilBench"] = null;
$DIC = $GLOBALS['DIC'];
$GLOBALS['DIC'] = new DI\Container();
$GLOBALS['DIC']['ilDB'] = $db;
$GLOBALS['DIC']['ilBench'] = null;

$chatAdministrations = ilObject::_getObjectsByType('chta');
$chatAdministration = current($chatAdministrations);
Expand All @@ -53,123 +53,123 @@ protected function collectFrom(Setup\Environment $environment, Setup\Metrics\Sto

if (count($settings) > 0) {
$storage->storeConfigText(
"address",
$settings['address'] ?? "",
"IP-Address/FQN of Chat Server."
'address',
$settings['address'] ?? '',
'IP-Address/FQN of Chat Server.'
);
$storage->storeConfigText(
"port",
(string) ($settings['port'] ?? ""),
"Port of the chat server."
'port',
(string) ($settings['port'] ?? ''),
'Port of the chat server.'
);
$storage->storeConfigText(
"sub_directory",
$settings['sub_directory'] ?? "",
"http(s)://[IP/Domain]/[SUB_DIRECTORY]"
'sub_directory',
$settings['sub_directory'] ?? '',
'http(s)://[IP/Domain]/[SUB_DIRECTORY]'
);

$storage->storeConfigText(
"protocol",
$settings['protocol'] ?? "",
"Protocol used for connection (http/https)."
'protocol',
$settings['protocol'] ?? '',
'Protocol used for connection (http/https).'
);

if ($settings['protocol'] === 'https') {
if (isset($settings['protocol']) && $settings['protocol'] === 'https') {
$cert = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['cert'] ?? ""
$settings['cert'] ?? ''
);
$key = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['key'] ?? ""
$settings['key'] ?? ''
);
$dhparam = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['dhparam'] ?? ""
$settings['dhparam'] ?? ''
);
$https = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_COLLECTION,
[
"cert" => $cert,
"key" => $key,
"dhparam" => $dhparam,
'cert' => $cert,
'key' => $key,
'dhparam' => $dhparam,
],
"Holds parameters for https."
'Holds parameters for https.'
);
$storage->store("https", $https);
$storage->store('https', $https);
}

$storage->storeConfigText(
"log",
'log',
(string) ($settings['log'] ?? ''),
"Absolute server path to the chat server's log file."
);
$storage->storeConfigText(
"log_level",
$settings['log_level'] ?? "",
"Possible values are emerg, alert, crit error, warning, notice, info, debug, silly."
'log_level',
$settings['log_level'] ?? '',
'Possible values are emerg, alert, crit error, warning, notice, info, debug, silly.'
);
$storage->storeConfigText(
"error_log",
$settings['error_log'] ?? "",
'error_log',
$settings['error_log'] ?? '',
"Absolute server path to the chat server's error log file."
);

if ($settings['ilias_proxy']) {
if (isset($settings['ilias_proxy']) && $settings['ilias_proxy']) {
$ilias_url = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['ilias_url'] ?? ""
$settings['ilias_url'] ?? ''
);
$ilias_proxy = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_COLLECTION,
[
"ilias_url" => $ilias_url
'ilias_url' => $ilias_url
],
"Holds proxy url if ILIAS proxy is enabled."
'Holds proxy url if ILIAS proxy is enabled.'
);
$storage->store("ilias_proxy", $ilias_proxy);
$storage->store('ilias_proxy', $ilias_proxy);
} else {
$storage->storeConfigBool(
"ilias_proxy",
'ilias_proxy',
false,
"Holds proxy url if ILIAS proxy is enabled."
'Holds proxy url if ILIAS proxy is enabled.'
);
}

if ($settings['client_proxy']) {
if (isset($settings['client_proxy']) && $settings['client_proxy']) {
$client_url = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['client_url'] ?? ""
$settings['client_url'] ?? ''
);
$client_proxy = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_COLLECTION,
[
"client_url" => $client_url
'client_url' => $client_url
],
"Holds proxy url if client proxy is enabled."
'Holds proxy url if client proxy is enabled.'
);
$storage->store("client_proxy", $client_proxy);
$storage->store('client_proxy', $client_proxy);
} else {
$storage->storeConfigBool(
"client_proxy",
'client_proxy',
false,
"Holds proxy url if client proxy is enabled."
'Holds proxy url if client proxy is enabled.'
);
}

if ($settings['deletion_mode']) {
if (isset($settings['deletion_mode']) && $settings['deletion_mode']) {
$deletion_unit = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['deletion_unit'] ?? ""
$settings['deletion_unit'] ?? ''
);
$deletion_value = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Expand All @@ -179,22 +179,25 @@ protected function collectFrom(Setup\Environment $environment, Setup\Metrics\Sto
$deletion_time = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_TEXT,
$settings['deletion_time'] ?? ""
$settings['deletion_time'] ?? ''
);
$deletion_mode = new Setup\Metrics\Metric(
Setup\Metrics\Metric::STABILITY_CONFIG,
Setup\Metrics\Metric::TYPE_COLLECTION,
[
"deletion_unit" => $deletion_unit,
"deletion_value" => $deletion_value,
"deletion_time" => $deletion_time,
'deletion_unit' => $deletion_unit,
'deletion_value' => $deletion_value,
'deletion_time' => $deletion_time,
],
"Holds information about deletion process."
'Holds information about deletion process.'
);
$storage->store(
'deletion_mode',
$deletion_mode
);
$storage->store("deletion_mode", $deletion_mode);
}
}

$GLOBALS["DIC"] = $DIC;
$GLOBALS['DIC'] = $DIC;
}
}
19 changes: 10 additions & 9 deletions Modules/CmiXapi/classes/XapiProxy/DataService.php
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -18,6 +16,8 @@
*
*********************************************************************/

declare(strict_types=1);

namespace XapiProxy;

class DataService
Expand Down Expand Up @@ -67,14 +67,15 @@ class ilInitialisation extends \ilInitialisation
/**
* Function; initGlobal($a_name, $a_class, $a_source_file)
* Derive from protected to public...
* @param string $a_class
* @param string|null $a_source_file
* @see \ilInitialisation::initGlobal($a_name, $a_class, $a_source_file)
* @see \ilInitialisation::initGlobal()
*/
// public static function initGlobal(string $a_name, string $a_class, ?string $a_source_file = null) : void
public static function initGlobal($a_name, $a_class, $a_source_file = null): void
{
parent::initGlobal($a_name, $a_class, $a_source_file);
public static function initGlobal(
string $a_name,
$a_class,
?string $a_source_file = null,
?bool $destroy_existing = false
): void {
parent::initGlobal($a_name, $a_class, $a_source_file, $destroy_existing);
}

/**
Expand Down
6 changes: 5 additions & 1 deletion Modules/ContentPage/classes/class.ilContentPageDataSet.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@ public function importRecord(
self::$style_map[(int) $a_rec['Style']][] = $newObject->getId();
}

if ($a_rec['style-id'] ?? false) {
self::$style_map[(int) $a_rec['style-id']][] = $newObject->getId();
}

ilContainer::_writeContainerSetting(
$newObject->getId(),
ilObjectServiceSettingsGUI::INFO_TAB_VISIBILITY,
Expand Down Expand Up @@ -171,7 +175,7 @@ public function getXmlRecord(

return $a_set;
}

return parent::getXmlRecord($a_entity, $a_version, $a_set);
}
}
Loading

0 comments on commit 628b7ee

Please sign in to comment.