From a361b693ed9b4c87f258f28f84fe881a574b33f3 Mon Sep 17 00:00:00 2001 From: Bob Robison Date: Mon, 19 Feb 2024 07:54:12 -0600 Subject: [PATCH] Handle adjusting BasePath, utilizing discovered rootPath --- src/api/index.php | 3 ++- src/external/index.php | 3 ++- src/kiosk/index.php | 3 ++- src/session/index.php | 3 ++- src/setup/index.php | 4 ++-- src/v2/index.php | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/api/index.php b/src/api/index.php index 92b4de5e82..64e35b5489 100644 --- a/src/api/index.php +++ b/src/api/index.php @@ -4,6 +4,7 @@ require_once __DIR__ . '/../vendor/autoload.php'; +$rootPath = str_replace('/api/index.php', '', $_SERVER['SCRIPT_NAME']); use ChurchCRM\Slim\Middleware\AuthMiddleware; use ChurchCRM\Slim\Middleware\VersionMiddleware; use Slim\Factory\AppFactory; @@ -14,7 +15,7 @@ $container->compile(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/api'); +$app->setBasePath($rootPath . '/api'); $app->add(VersionMiddleware::class); $app->add(AuthMiddleware::class); diff --git a/src/external/index.php b/src/external/index.php index 05c5478052..0563fa5632 100644 --- a/src/external/index.php +++ b/src/external/index.php @@ -11,11 +11,12 @@ // This file is generated by Composer require_once __DIR__ . '/../vendor/autoload.php'; +$rootPath = str_replace('/external/index.php', '', $_SERVER['SCRIPT_NAME']); $container = new ContainerBuilder(); $container->compile(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/external'); +$app->setBasePath($rootPath . '/external'); $app->add(VersionMiddleware::class); $app->addRoutingMiddleware(); diff --git a/src/kiosk/index.php b/src/kiosk/index.php index d04085bbf0..bbe40da360 100644 --- a/src/kiosk/index.php +++ b/src/kiosk/index.php @@ -5,6 +5,7 @@ // This file is generated by Composer require_once __DIR__ . '/../vendor/autoload.php'; +$rootPath = str_replace('/kiosk/index.php', '', $_SERVER['SCRIPT_NAME']); use ChurchCRM\dto\SystemConfig; use ChurchCRM\model\ChurchCRM\KioskDevice; use ChurchCRM\model\ChurchCRM\KioskDeviceQuery; @@ -14,7 +15,7 @@ $container = new ContainerBuilder(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/kiosk'); +$app->setBasePath($rootPath . '/kiosk'); if (SystemConfig::debugEnabled()) { $app->addErrorMiddleware(true, true, true); diff --git a/src/session/index.php b/src/session/index.php index b96b90dced..fd46b88e12 100644 --- a/src/session/index.php +++ b/src/session/index.php @@ -15,11 +15,12 @@ require_once __DIR__ . '/../vendor/autoload.php'; +$rootPath = str_replace('/session/index.php', '', $_SERVER['SCRIPT_NAME']); $container = new ContainerBuilder(); $container->compile(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/session'); +$app->setBasePath($rootPath . '/session'); require __DIR__ . '/../Include/slim/error-handler.php'; diff --git a/src/setup/index.php b/src/setup/index.php index 7759007c07..77af67fa8f 100644 --- a/src/setup/index.php +++ b/src/setup/index.php @@ -12,8 +12,8 @@ } require_once __DIR__ . '/../vendor/autoload.php'; - $rootPath = str_replace('/setup/index.php', '', $_SERVER['SCRIPT_NAME']); + SystemURLs::init($rootPath, '', __DIR__ . '/../'); SystemConfig::init(); @@ -21,7 +21,7 @@ $container->compile(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/setup'); +$app->setBasePath($rootPath . '/setup'); require __DIR__ . '/../Include/slim/error-handler.php'; diff --git a/src/v2/index.php b/src/v2/index.php index 9f69b8d266..0728ceaf88 100644 --- a/src/v2/index.php +++ b/src/v2/index.php @@ -5,6 +5,7 @@ require_once __DIR__ . '/../vendor/autoload.php'; +$rootPath = str_replace('/v2/index.php', '', $_SERVER['SCRIPT_NAME']); use ChurchCRM\Slim\Middleware\AuthMiddleware; use ChurchCRM\Slim\Middleware\VersionMiddleware; use Slim\Factory\AppFactory; @@ -13,7 +14,7 @@ $container = new ContainerBuilder(); AppFactory::setContainer($container); $app = AppFactory::create(); -$app->setBasePath('/v2'); +$app->setBasePath($rootPath . '/v2'); $app->add(VersionMiddleware::class); $app->add(AuthMiddleware::class);