aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/admin/ilias_interface.php
diff options
context:
space:
mode:
authorPhilipp Schüttlöffel <schuettloeffel@zqs.uni-hannover.de>2025-01-13 13:50:36 +0000
committerArne Schröder <schroeder@data-quest.de>2025-01-22 12:11:47 +0000
commit4ed825d8951a5afa45a5c5fd52782528c224d362 (patch)
treea432c0b8a33905a05b479ea6735496b6ac5c0d99 /app/controllers/admin/ilias_interface.php
parent66d5620578e993ab92e9927e6fad7a7a2af5bcae (diff)
Resolve "Timeout für HTTP Requests in Ilias-Schnittstelle implementieren"
Closes #5014 Merge request studip/studip!3768
Diffstat (limited to 'app/controllers/admin/ilias_interface.php')
-rw-r--r--app/controllers/admin/ilias_interface.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/controllers/admin/ilias_interface.php b/app/controllers/admin/ilias_interface.php
index 9517567..dfb8f0a 100644
--- a/app/controllers/admin/ilias_interface.php
+++ b/app/controllers/admin/ilias_interface.php
@@ -130,6 +130,8 @@ class Admin_IliasInterfaceController extends AuthenticatedController
'name' => '',
'version' => '',
'url' => _('https://<URL zur ILIAS-Installation>'),
+ 'http_connection_timeout' => 1,
+ 'http_request_timeout' => 3,
'client' => '',
'ldap_enable' => '',
'reconnect_accounts' => false,
@@ -171,6 +173,8 @@ class Admin_IliasInterfaceController extends AuthenticatedController
if (is_array($info) && count($info)) {
$this->valid_url = true;
$this->ilias_config['url'] = Request::get('ilias_url');
+ $this->ilias_config['http_connection_timeout'] = (int) Request::get('ilias_http_connection_timeout');
+ $this->ilias_config['http_request_timeout'] = (int) Request::get('ilias_http_request_timeout');
if ($info['version']) {
$this->ilias_version = $info['version'];
$this->ilias_version_date = $info['version_date'];
@@ -220,6 +224,8 @@ class Admin_IliasInterfaceController extends AuthenticatedController
if (Request::get('ilias_name')) {
$this->ilias_config['name'] = Request::get('ilias_name');
$this->ilias_config['url'] = Request::get('ilias_url');
+ $this->ilias_config['http_connection_timeout'] = (int) Request::get('ilias_http_connection_timeout');
+ $this->ilias_config['http_request_timeout'] = (int) Request::get('ilias_http_request_timeout');
}
$info = ConnectedIlias::getIliasInfo($this->ilias_config['url']);
if (count($info)) {
@@ -299,6 +305,8 @@ class Admin_IliasInterfaceController extends AuthenticatedController
$this->ilias_configs[$index]['version'] = Request::get('ilias_version');
}
$this->ilias_configs[$index]['url'] = Request::get('ilias_url');
+ $this->ilias_configs[$index]['http_connection_timeout'] = (int) Request::get('ilias_http_connection_timeout');
+ $this->ilias_configs[$index]['http_request_timeout'] = (int) Request::get('ilias_http_request_timeout');
if (Request::getInstance()->offsetExists('ilias_client')) {
$this->ilias_configs[$index]['client'] = Request::get('ilias_client');
}