Merge pull request #6881 from ChurchCRM/6880-bug-initial-setup-does-n…

…ot-work-if-churchcrm-not-at-root-of-website Handle adjusting BasePath, utilizing discovered rootPath
ChurchCRM · Feb 19, 2024 · 1d39439 · 1d39439
2 parents b090a4a + a361b69
commit 1d39439
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -12,16 +12,16 @@
 }
 
 require_once __DIR__ . '/../vendor/autoload.php';
-
 $rootPath = str_replace('/setup/index.php', '', $_SERVER['SCRIPT_NAME']);
+
 SystemURLs::init($rootPath, '', __DIR__ . '/../');
 SystemConfig::init();
 
 $container = new ContainerBuilder();
 $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
@@ -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);