Merge pull request from GHSA-jrqg-mpwv-pxpv

[galette.git] / galette / includes / main.inc.php

diff --git a/galette/includes/main.inc.php b/galette/includes/main.inc.php
index 9ee31b98ef18e90331bcb28321f3c91ce90330f9..0609aca80fd32614fa7ac91d01f5d4b8b76dd508 100644 (file)
--- a/galette/includes/main.inc.php
+++ b/galette/includes/main.inc.php
@@ -134,32 +134,8 @@ if ($needs_update) {
  */
 $authenticate = new Authenticate($container);
 
-/**
- * Show public pages middleware
- *
- * @param $request
- * @param $response
- * @param $next
- * @return mixed
- */
-$showPublicPages = function (Request $request, RequestHandler $handler) use ($container) {
-    $response = $handler->handle($request);
-    $login = $container->get('login');
-    $preferences = $container->get('preferences');
-
-    if (!$preferences->showPublicPages($login)) {
-        $this->get('flash')->addMessage('error', _T("Unauthorized"));
-
-        return $response
-            ->withStatus(403)
-            ->withHeader(
-                'Location',
-                $this->get(RouteParser::class)->urlFor('slash')
-            );
-    }
-
-    return $response;
-};
+//FIXME: remove in 1.1.0; routes/groups should call middleware directly
+$showPublicPages = new \Galette\Middleware\PublicPages($container);
 
 //Maintenance middleware
 if (Galette::MODE_MAINT === GALETTE_MODE && !$container->get('login')->isSuperAdmin()) {