Merge pull request #5444 from ChurchCRM/bug/slim-settings

Fix SLIM displayErrorDetails setting
ChurchCRM · Oct 17, 2020 · 8838522 · 8838522
2 parents a8e198d + b6c0e13
commit 8838522
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 25 deletions.
diff --git a/src/Include/slim/settings.php b/src/Include/slim/settings.php
diff --git a/src/api/index.php b/src/api/index.php
@@ -4,19 +4,22 @@
 // This file is generated by Composer
 require_once dirname(__FILE__) . '/../vendor/autoload.php';
 
+use ChurchCRM\dto\SystemConfig;
 use ChurchCRM\Slim\Middleware\AuthMiddleware;
 use ChurchCRM\Slim\Middleware\VersionMiddleware;
+use Monolog\Logger;
 use Slim\App;
 use Slim\Container;
 use Slim\HttpCache\CacheProvider;
 
 // Instantiate the app
-$settings = require __DIR__ . '/../Include/slim/settings.php';
-
 $container = new Container;
 $container['cache'] = function () {
     return new CacheProvider();
 };
+if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+    $container["settings"]['displayErrorDetails'] = true;
+}
 
 // Add middleware to the application
 $app = new App($container);

diff --git a/src/external/index.php b/src/external/index.php
@@ -1,20 +1,24 @@
 <?php
 
+use ChurchCRM\dto\SystemConfig;
+use Monolog\Logger;
+
 require '../Include/Config.php';
 //require '../Include/Functions.php';
 
 // This file is generated by Composer
 require_once dirname(__FILE__) . '/../vendor/autoload.php';
 
 // Instantiate the app
-//$settings = require __DIR__ . '/settings.php';
 $app = new \Slim\App();
 $container = $app->getContainer();
+if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+    $container["settings"]['displayErrorDetails'] = true;
+}
 
 // Set up
 require __DIR__.'/dependencies.php';
 require __DIR__ . '/../Include/slim/error-handler.php';
-$settings = require __DIR__ . '/../Include/slim/settings.php';
 
 // routes
 require __DIR__ . '/routes/register.php';

diff --git a/src/kiosk/index.php b/src/kiosk/index.php
@@ -1,22 +1,22 @@
 <?php
 
 require '../Include/Config.php';
-//require '../Include/Functions.php';
 
 // This file is generated by Composer
 require_once dirname(__FILE__) . '/../vendor/autoload.php';
 
 use ChurchCRM\dto\SystemConfig;
-use \ChurchCRM\Utils\MiscUtils;
+use Monolog\Logger;
 
 // Instantiate the app
-//$settings = require __DIR__ . '/settings.php';
-$app = new \Slim\App();
+$app = new App();
 $container = $app->getContainer();
+if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+    $container["settings"]['displayErrorDetails'] = true;
+}
 
 // Set up
 require __DIR__ . '/../Include/slim/error-handler.php';
-$settings = require __DIR__ . '/../Include/slim/settings.php';
 
 // routes
 require __DIR__ . '/routes/kiosk.php';

diff --git a/src/session/index.php b/src/session/index.php
@@ -14,12 +14,14 @@
 use Slim\Views\PhpRenderer;
 use ChurchCRM\dto\SystemURLs;
 use ChurchCRM\Slim\Middleware\VersionMiddleware;
+use ChurchCRM\dto\SystemConfig;
+use Monolog\Logger;
 
 // Instantiate the app
-$settings = require __DIR__.'/../Include/slim/settings.php';
-
 $container = new Container;
-
+if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+    $container["settings"]['displayErrorDetails'] = true;
+}
 // Add middleware to the application
 $app = new App($container);
 
@@ -45,7 +47,7 @@ function processTwoFactorGet(Request $request, Response $response, array $args)
         'sRootPath' => SystemURLs::getRootPath(),
         'user' => $curUser,
     ];
-    
+
     return $renderer->render($response, 'two-factor.php', $pageArgs);
 }
 
@@ -79,7 +81,7 @@ function beginSession(Request $request, Response $response, array $args)
     }
 
     $renderer = new PhpRenderer('templates/');
-    
+
     $pageArgs['prefilledUserName'] = "";
     # Defermine if approprirate to pre-fill the username field
     if (isset($_GET['username'])) {

diff --git a/src/setup/index.php b/src/setup/index.php
@@ -2,6 +2,7 @@
 
 use ChurchCRM\dto\SystemURLs;
 use ChurchCRM\dto\SystemConfig;
+use Monolog\Logger;
 
 error_reporting(E_ALL);
 ini_set('log_errors', 1);
@@ -18,9 +19,11 @@
 
     $app = new \Slim\App();
     $container = $app->getContainer();
+    if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+        $container["settings"]['displayErrorDetails'] = true;
+    }
 
     require __DIR__ . '/../Include/slim/error-handler.php';
-    $settings = require __DIR__ . '/../Include/slim/settings.php';
 
     require __DIR__ . '/routes/setup.php';
 

diff --git a/src/v2/index.php b/src/v2/index.php
@@ -9,11 +9,13 @@
 use Slim\App;
 use ChurchCRM\Slim\Middleware\VersionMiddleware;
 use ChurchCRM\Slim\Middleware\AuthMiddleware;
-
-// Instantiate the app
-$settings = require __DIR__.'/../Include/slim/settings.php';
+use ChurchCRM\dto\SystemConfig;
+use Monolog\Logger;
 
 $container = new Container;
+if (SystemConfig::getValue("sLogLevel") == Logger::DEBUG) {
+    $container["settings"]['displayErrorDetails'] = true;
+}
 
 // Add middleware to the application
 $app = new App($container);