From bef855ea1dfa0d749afa1e61b7274770fcc5e0f9 Mon Sep 17 00:00:00 2001
From: noackorama <noackorama@gmail.com>
Date: Mon, 27 Dec 2021 14:31:33 +0100
Subject: [PATCH] remove obsolete libray_config from installer re #495
---
app/controllers/admin/install.php | 3 +--
config/studip-requirements.php | 2 +-
lib/classes/StudipInstaller.php | 8 --------
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/app/controllers/admin/install.php b/app/controllers/admin/install.php
index 283ddf8ac12..4d1f63d429f 100644
--- a/app/controllers/admin/install.php
+++ b/app/controllers/admin/install.php
@@ -326,7 +326,7 @@ class Admin_InstallController extends Trails_Controller
}
}
- // COPY config.inc.php / config_local.inc.php / library_config.inc.php
+ // COPY config.inc.php / config_local.inc.php
if ($this->basic || $what === 'config') {
$local_inc = $this->installer->createConfigLocalInc(
$_SESSION['STUDIP_INSTALLATION']['database']['host'],
@@ -341,7 +341,6 @@ class Admin_InstallController extends Trails_Controller
$_SESSION['STUDIP_INSTALLATION']['system']['UNI_URL'],
$_SESSION['STUDIP_INSTALLATION']['system']['UNI_CONTACT']
);
- $this->installer->createLibraryConfigInc();
// Update config entries
$this->installer->updateConfigInDatabase(
diff --git a/config/studip-requirements.php b/config/studip-requirements.php
index 7db5e910e5d..947151ba328 100644
--- a/config/studip-requirements.php
+++ b/config/studip-requirements.php
@@ -11,7 +11,7 @@ return [
'gd' => true,
'mbstring' => true,
'json' => true,
- 'ftp' => true,
+ 'ftp' => 'ftp proxy Dateibereich',
'zip' => true,
'xsl' => 'Export',
'xml' => 'Export',
diff --git a/lib/classes/StudipInstaller.php b/lib/classes/StudipInstaller.php
index 9235e865a43..4b2f341df1c 100644
--- a/lib/classes/StudipInstaller.php
+++ b/lib/classes/StudipInstaller.php
@@ -63,14 +63,6 @@ final class StudipInstaller
return $template;
}
- public function createLibraryConfigInc()
- {
- file_put_contents(
- $this->base_path . '/config/library_config.inc.php',
- file_get_contents($this->base_path . '/config/library_config.inc.php.dist')
- );
- }
-
private function replaceVariable($variable, $replacement, $subject)
{
return preg_replace(
--
GitLab