diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2024-04-19 13:15:41 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+github@gmail.com> | 2024-04-22 10:24:45 +0200 |
| commit | 367ff17ff717a53ccfd5a587af3e1e2c5499cd0f (patch) | |
| tree | 9c36375e14fff1115971501d155a38e0c8e44e44 | |
| parent | 42d35dfc0ed4a6f315fb2a5cdfed67013372bc7b (diff) | |
fixes #4034
Closes #4034
Merge request studip/studip!2889
| -rw-r--r-- | lib/bootstrap.php | 18 | ||||
| -rw-r--r-- | lib/classes/StudipFileloader.php | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/lib/bootstrap.php b/lib/bootstrap.php index eb1d9e3..27efeaa 100644 --- a/lib/bootstrap.php +++ b/lib/bootstrap.php @@ -64,6 +64,16 @@ if (isset($_SERVER['SERVER_NAME'])) { // default ASSETS_URL, customize if required $GLOBALS['ASSETS_URL'] = $ABSOLUTE_URI_STUDIP . 'assets/'; +// Check if instance is configured; redirect to install script if not +if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') { + require_once __DIR__ . '/classes/URLHelper.php'; + + URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']); + header('Location: ' . URLHelper::getURL('install.php')); + die; +} + +// Load configuration require __DIR__ . '/classes/StudipFileloader.php'; $added = StudipFileloader::load('config_defaults.inc.php config_local.inc.php', $GLOBALS, compact('STUDIP_BASE_PATH', 'ABSOLUTE_URI_STUDIP', 'ASSETS_URL', 'CANONICAL_RELATIVE_PATH_STUDIP'), true); @@ -97,14 +107,6 @@ if (Studip\ENV === 'development' && !in_array('ASSETS_URL', $added) && function_ } } -if (!file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php') && php_sapi_name() !== 'cli') { - require_once __DIR__ . '/classes/URLHelper.php'; - - URLHelper::setBaseUrl($GLOBALS['ABSOLUTE_URI_STUDIP']); - header('Location: ' . URLHelper::getURL('install.php')); - die; -} - require __DIR__ . '/bootstrap-autoload.php'; // construct absolute URL for ASSETS_URL diff --git a/lib/classes/StudipFileloader.php b/lib/classes/StudipFileloader.php index f499b68..661c062 100644 --- a/lib/classes/StudipFileloader.php +++ b/lib/classes/StudipFileloader.php @@ -27,6 +27,12 @@ class StudipFileloader $_oldVariableNames = array_keys(get_defined_vars()); foreach (preg_split('/ /', $_filename, -1, PREG_SPLIT_NO_EMPTY) as $file) { + if ( + !file_exists($file) + && !stream_resolve_include_path($file) + ) { + continue; + } include $file; } unset($file); |