Merge branch 'main' into issue-3911issue-3911

1 files changed, 35 insertions, 20 deletions

diff --git a/public/install.php b/public/install.php
index 6d71969..9922f84 100644
--- a/public/install.php
+++ b/public/install.php
@@ -15,22 +15,37 @@ if (file_exists($GLOBALS['STUDIP_BASE_PATH'] . '/config/config_local.inc.php')
 
 set_include_path($GLOBALS['STUDIP_BASE_PATH']);
 
-require_once 'composer/autoload.php';
-require_once 'lib/visual.inc.php';
-require_once 'vendor/trails/trails.php';
-require_once 'vendor/flexi/flexi.php';
-require_once 'lib/classes/URLHelper.php';
-require_once 'lib/classes/LayoutMessage.interface.php';
-require_once 'lib/classes/MessageBox.class.php';
-require_once 'lib/classes/Request.class.php';
-require_once 'lib/classes/Interactable.class.php';
-require_once 'lib/classes/Button.class.php';
-require_once 'lib/classes/LinkButton.class.php';
-require_once 'lib/classes/StudipInstaller.php';
-require_once 'lib/classes/SystemChecker.php';
-require_once 'lib/classes/Markup.class.php';
-require_once 'lib/exceptions/AccessDeniedException.php';
-require_once 'vendor/phpass/PasswordHash.php';
+require 'composer/autoload.php';
+require 'lib/visual.inc.php';
+require 'lib/functions.php';
+require 'lib/classes/URLHelper.php';
+require 'lib/classes/LayoutMessage.php';
+require 'lib/classes/MessageBox.php';
+require 'lib/classes/Request.php';
+require 'lib/classes/Interactable.php';
+require 'lib/classes/Button.php';
+require 'lib/classes/LinkButton.php';
+require 'lib/classes/StudipInstaller.php';
+require 'lib/classes/SystemChecker.php';
+require 'lib/classes/Markup.php';
+require 'lib/exceptions/AccessDeniedException.php';
+require 'lib/flexi/Factory.php';
+require 'lib/flexi/Template.php';
+require 'lib/flexi/PhpTemplate.php';
+require 'lib/flexi/TemplateNotFoundException.php';
+require 'lib/trails/Controller.php';
+require 'lib/trails/Dispatcher.php';
+require 'lib/trails/Exception.php';
+require 'lib/trails/Flash.php';
+require 'lib/trails/Inflector.php';
+require 'lib/trails/Response.php';
+require 'lib/trails/Exceptions/DoubleRenderError.php';
+require 'lib/trails/Exceptions/MissingFile.php';
+require 'lib/trails/Exceptions/RoutingError.php';
+require 'lib/trails/Exceptions/SessionRequiredException.php';
+require 'lib/trails/Exceptions/UnknownAction.php';
+require 'lib/trails/Exceptions/UnknownController.php';
+require 'vendor/phpass/PasswordHash.php';
 
 // Mock gettext functions if extension is not available
 if (!function_exists('_')) {
@@ -40,8 +55,8 @@ if (!function_exists('_')) {
 } else {
     require_once 'lib/language.inc.php';
 
-    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']) as $lang) {
-        list($lang, ) = explode(';', $lang);
+    foreach (explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE'] ?? '') as $lang) {
+        [$lang, ] = explode(';', $lang);
         $lang = substr($lang, 0, 2);
 
         if (!in_array($lang, ['de', 'en'])) {
@@ -53,10 +68,10 @@ if (!function_exists('_')) {
     }
 }
 
-$GLOBALS['template_factory'] = new Flexi_TemplateFactory('../templates/');
+$GLOBALS['template_factory'] = new Flexi\Factory('../templates/');
 
 # get plugin class from request
 $dispatch_to = ltrim(Request::pathInfo(), '/');
 
-$dispatcher = new Trails_Dispatcher( '../app', $_SERVER['SCRIPT_NAME'], 'admin/install');
+$dispatcher = new Trails\Dispatcher( '../app', $_SERVER['SCRIPT_NAME'], 'admin/install');
 $dispatcher->dispatch("admin/install/{$dispatch_to}");