From 91501af59d5ac099b0177413101ce0974f6e639d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Sch=C3=BCttl=C3=B6ffel?= Date: Thu, 6 Mar 2025 08:03:13 +0000 Subject: Resolve "Diverse Warnings im Ilias Interface" Closes #5344 Merge request studip/studip!4014 --- lib/ilias_interface/ConnectedIlias.class.php | 11 ++++++++--- lib/ilias_interface/IliasSoap.class.php | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/ilias_interface/ConnectedIlias.class.php b/lib/ilias_interface/ConnectedIlias.class.php index 7ef71b8..09bc52f 100644 --- a/lib/ilias_interface/ConnectedIlias.class.php +++ b/lib/ilias_interface/ConnectedIlias.class.php @@ -89,8 +89,8 @@ class ConnectedIlias $this->ilias_int_version, $this->ilias_config['admin'], $this->ilias_config['admin_pw'], - $this->ilias_config['http_connection_timeout'], - $this->ilias_config['http_request_timeout'] + $this->ilias_config['http_connection_timeout'] ?? 1, + $this->ilias_config['http_request_timeout'] ?? 3 ); $this->soap_client->setCachingStatus($this->ilias_interface_config['cache']); @@ -130,7 +130,12 @@ class ConnectedIlias public static function getIntVersion($version) { $version_array = explode('.', $version); - return ((int)$version_array[0]*10000) + ((int)$version_array[1]*100) + ((int)$version_array[2]); + + $major = (int) ($version_array[0] ?? 0); + $minor = (int) ($version_array[1] ?? 0); + $patch = (int) ($version_array[2] ?? 0); + + return $major * 10000 + $minor * 100 + $patch; } /** diff --git a/lib/ilias_interface/IliasSoap.class.php b/lib/ilias_interface/IliasSoap.class.php index 7d2c3d9..9ae6f85 100644 --- a/lib/ilias_interface/IliasSoap.class.php +++ b/lib/ilias_interface/IliasSoap.class.php @@ -131,7 +131,7 @@ class IliasSoap extends StudipSoapClient return false; } - $cache_index = md5($method . ':' . implode('-', $params)); + $cache_index = md5($method . ':' . json_encode($params)); if ($this->caching_active && isset($this->soap_cache[$cache_index]) && $method !== 'login') { $result = $this->soap_cache[$cache_index]; } else { @@ -162,7 +162,7 @@ class IliasSoap extends StudipSoapClient */ function loadCacheData() { - $this->soap_cache = (array)$_SESSION["cache_data"][$this->index]; + $this->soap_cache = (array) ($_SESSION['cache_data'][$this->index] ?? []); } /** -- cgit v1.0