Piou-piou / RibsAdminBundle

Service/UserLog.php

Indentation +44 added lines, -44 removed lines

@@ -9,48 +9,48 @@
 
 class UserLog
 {
-    /**
-     * @var TokenStorageInterface
-     */
-    private $token_storage;
-
-    /**
-     * @var EntityManagerInterface a
-     */
-    private $em;
-
-    public function __construct(TokenStorageInterface $token_storage, EntityManagerInterface $em)
-    {
-        $this->token_storage = $token_storage;
-        $this->em = $em;
-    }
-
-    /**
-     * @param RequestEvent $request_event
-     */
-    public function onKernelRequest(RequestEvent $request_event)
-    {
-        if ($request_event->isMasterRequest()) {
-            $user = null;
-            if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
-                $user = $this->token_storage->getToken()->getUser()->getUser();
-            }
-            $request = $request_event->getRequest();
-            $route = $request->get("_route");
-
-            if (in_array($route, ["_profiler", "_profiler_search_bar", "_wdt", "ribsadmin_userlogs", "ribsadmin_userlogs_show"])) {
-                return;
-            }
-
-            if ($user) {
-                $user_log = new UserLogs();
-                $user_log->setMethod($request->getMethod());
-                $user_log->setUser($user);
-                $user_log->setUrl($request->get("_route"));
-                $user_log->setRequestParameters($request->request->all());
-                $this->em->persist($user_log);
-                $this->em->flush();
-            }
-        }
-    }
+				/**
+				 * @var TokenStorageInterface
+				 */
+				private $token_storage;
+
+				/**
+				 * @var EntityManagerInterface a
+				 */
+				private $em;
+
+				public function __construct(TokenStorageInterface $token_storage, EntityManagerInterface $em)
+				{
+								$this->token_storage = $token_storage;
+								$this->em = $em;
+				}
+
+				/**
+				 * @param RequestEvent $request_event
+				 */
+				public function onKernelRequest(RequestEvent $request_event)
+				{
+								if ($request_event->isMasterRequest()) {
+												$user = null;
+												if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
+																$user = $this->token_storage->getToken()->getUser()->getUser();
+												}
+												$request = $request_event->getRequest();
+												$route = $request->get("_route");
+
+												if (in_array($route, ["_profiler", "_profiler_search_bar", "_wdt", "ribsadmin_userlogs", "ribsadmin_userlogs_show"])) {
+																return;
+												}
+
+												if ($user) {
+																$user_log = new UserLogs();
+																$user_log->setMethod($request->getMethod());
+																$user_log->setUser($user);
+																$user_log->setUrl($request->get("_route"));
+																$user_log->setRequestParameters($request->request->all());
+																$this->em->persist($user_log);
+																$this->em->flush();
+												}
+								}
+				}
 }

DependencyInjection/RibsAdminExtension.php

Indentation +8 added lines, -8 removed lines

@@ -9,12 +9,12 @@
 
 class RibsAdminExtension extends Extension
 {
-    public function load(array $configs, ContainerBuilder $container)
-    {
-        $loader = new YamlFileLoader(
-            $container,
-            new FileLocator(__DIR__ . '/../Resources/config')
-        );
-        $loader->load('services.yml');
-    }
+				public function load(array $configs, ContainerBuilder $container)
+				{
+								$loader = new YamlFileLoader(
+												$container,
+												new FileLocator(__DIR__ . '/../Resources/config')
+								);
+								$loader->load('services.yml');
+				}
 }

EventListener/CreateUpdateAwareListener.php

Indentation +36 added lines, -36 removed lines

@@ -7,43 +7,43 @@
 
 class CreateUpdateAwareListener
 {
-    /**
-     * @var User
-     */
-    private $user;
+				/**
+				 * @var User
+				 */
+				private $user;
 
-    /**
-     * CreateUpdateAwareListener constructor.
-     * @param TokenStorage $tokenStorage
-     */
-    public function __construct(TokenStorage $tokenStorage)
-    {
-        if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
-            $this->user = $tokenStorage->getToken()->getUser()->getUser();
-        } else {
-            $this->user = null;
-        }
-    }
+				/**
+				 * CreateUpdateAwareListener constructor.
+				 * @param TokenStorage $tokenStorage
+				 */
+				public function __construct(TokenStorage $tokenStorage)
+				{
+								if ($tokenStorage->getToken() && is_object($tokenStorage->getToken()->getUser()) && $tokenStorage->getToken()->getUser()->getUser()) {
+												$this->user = $tokenStorage->getToken()->getUser()->getUser();
+								} else {
+												$this->user = null;
+								}
+				}
 
-    public function prePersist($entity)
-    {
-        if ($this->user) {
-            if ($entity->getCreatedBy() === null) {
-                $entity->setCreatedAt(new \DateTime());
-                $entity->setCreatedBy($this->user);
-            }
-            if ($entity->getUpdatedBy() === null) {
-                $entity->setUpdatedAt(new \DateTime());
-                $entity->setUpdatedBy($this->user);
-            }
-        }
-    }
+				public function prePersist($entity)
+				{
+								if ($this->user) {
+												if ($entity->getCreatedBy() === null) {
+																$entity->setCreatedAt(new \DateTime());
+																$entity->setCreatedBy($this->user);
+												}
+												if ($entity->getUpdatedBy() === null) {
+																$entity->setUpdatedAt(new \DateTime());
+																$entity->setUpdatedBy($this->user);
+												}
+								}
+				}
 
-    public function preUpdate($entity)
-    {
-        if ($this->user) {
-            $entity->setUpdatedAt(new \DateTime());
-            $entity->setUpdatedBy($this->user);
-        }
-    }
+				public function preUpdate($entity)
+				{
+								if ($this->user) {
+												$entity->setUpdatedAt(new \DateTime());
+												$entity->setUpdatedBy($this->user);
+								}
+				}
 }

EventListener/GuidAwareListener.php

Indentation +18 added lines, -18 removed lines

@@ -7,24 +7,24 @@
 
 class GuidAwareListener
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
+				/**
+				 * @var ContainerInterface
+				 */
+				private $container;
 
-    /**
-     * GuidAwareListener constructor.
-     * @param ContainerInterface $container
-     */
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
-    }
+				/**
+				 * GuidAwareListener constructor.
+				 * @param ContainerInterface $container
+				 */
+				public function __construct(ContainerInterface $container)
+				{
+								$this->container = $container;
+				}
 
-    public function prePersist($entity)
-    {
-        if ($entity->getGuid() === null) {
-            $entity->setGuid((string)Uuid::uuid4());
-        }
-    }
+				public function prePersist($entity)
+				{
+								if ($entity->getGuid() === null) {
+												$entity->setGuid((string)Uuid::uuid4());
+								}
+				}
 }

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
     public function prePersist($entity)
     {
         if ($entity->getGuid() === null) {
-            $entity->setGuid((string)Uuid::uuid4());
+            $entity->setGuid((string) Uuid::uuid4());
         }
     }
 }

Controller/LoginController.php

Indentation +40 added lines, -40 removed lines

@@ -10,44 +10,44 @@
 
 class LoginController extends AbstractController
 {
-    /**
-     * @Route("/login/", name="ribsadmin_login")
-     * @param AuthenticationUtils $auth_utils
-     * @return Response
-     */
-    public function loginAction(AuthenticationUtils $auth_utils): Response
-    {
-        $csrf_token = $this->has('security.csrf.token_manager')
-            ? $this->get('security.csrf.token_manager')->getToken('authenticate')->getValue()
-            : null;
-
-        if ($auth_utils->getLastAuthenticationError()) {
-            $this->addFlash("error-flash", "Your login or password are incorrect");
-        }
-
-        // last username entered by the user
-        $last_username = $auth_utils->getLastUsername();
-
-        return $this->render('@RibsAdmin/login/login.html.twig', array(
-            'last_username' => $last_username,
-            'csrf_token' => $csrf_token,
-        ));
-    }
-
-    /**
-     * @param array $data
-     * @return Response
-     */
-    protected function renderLogin(array $data): Response
-    {
-        $securityContext = $this->get('security.authorization_checker');
-
-        if ($securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED') || $securityContext->isGranted('IS_AUTHENTICATED_FULLY')) {
-            $this->addFlash("info-flash", "You were connected with success");
-
-            return new RedirectResponse($this->generateUrl("ribsadmin_index"), 303);
-        }
-
-        return $this->render("@RibsAdmin/login/login.html.twig", $data);
-    }
+				/**
+				 * @Route("/login/", name="ribsadmin_login")
+				 * @param AuthenticationUtils $auth_utils
+				 * @return Response
+				 */
+				public function loginAction(AuthenticationUtils $auth_utils): Response
+				{
+								$csrf_token = $this->has('security.csrf.token_manager')
+												? $this->get('security.csrf.token_manager')->getToken('authenticate')->getValue()
+												: null;
+
+								if ($auth_utils->getLastAuthenticationError()) {
+												$this->addFlash("error-flash", "Your login or password are incorrect");
+								}
+
+								// last username entered by the user
+								$last_username = $auth_utils->getLastUsername();
+
+								return $this->render('@RibsAdmin/login/login.html.twig', array(
+												'last_username' => $last_username,
+												'csrf_token' => $csrf_token,
+								));
+				}
+
+				/**
+				 * @param array $data
+				 * @return Response
+				 */
+				protected function renderLogin(array $data): Response
+				{
+								$securityContext = $this->get('security.authorization_checker');
+
+								if ($securityContext->isGranted('IS_AUTHENTICATED_REMEMBERED') || $securityContext->isGranted('IS_AUTHENTICATED_FULLY')) {
+												$this->addFlash("info-flash", "You were connected with success");
+
+												return new RedirectResponse($this->generateUrl("ribsadmin_index"), 303);
+								}
+
+								return $this->render("@RibsAdmin/login/login.html.twig", $data);
+				}
 }

Controller/AccessRightsController.php

Indentation +113 added lines, -113 removed lines

@@ -13,117 +13,117 @@
 
 class AccessRightsController extends AbstractController
 {
-    /**
-     * @Route("/access-rights-management/", name="ribsadmin_access_rights")
-     * @return Response
-     */
-    public function list(): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $acces_right = $em->getRepository("RibsAdminBundle:AccessRight")->findAll();
-
-        return $this->render("@RibsAdmin/access-rights/list.html.twig", [
-            "access_right" => $acces_right
-        ]);
-    }
-
-    /**
-     * @Route("/access-rights-management/create/", name="ribsadmin_access_rights_create")
-     * @Route("/access-rights-management/edit/{guid}", name="ribsadmin_access_rights_edit")
-     * @param Request $request
-     * @param Globals $globals
-     * @param ModuleService $module
-     * @param string|null $guid
-     * @return Response
-     */
-    public function edit(Request $request, Globals $globals, ModuleService $module, string $guid = null): Response
-    {
-        $em = $this->getDoctrine()->getManager();
-        $list_rights_user = [];
-
-        if ($guid === null) {
-            $access_right = new AccessRight();
-        } else {
-            $access_right = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
-            $list_rights_user = explode(",", $access_right->getAccessRights());
-        }
-
-        $admins = $em->getRepository("RibsAdminBundle:User")->findBy(["admin" => true, "archived" => false]);
-
-        $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\AccessRight", $access_right);
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-            return $this->handleEditForm($request, $access_right);
-        }
-
-        return $this->render("@RibsAdmin/access-rights/edit.html.twig", [
-            "access_right" => $access_right,
-            "form" => $form->createView(),
-            "form_errors" => $form->getErrors(),
-            "list_rights_user" => $list_rights_user,
-            "admins" => $admins,
-            "ribs_admin_rights" => json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")),
-            "modules" => $module->getAllInfosModules()
-        ]);
-    }
-
-    /**
-     * @Route("/access-rights-management/delete/{guid}", name="ribsadmin_access_rights_delete")
-     * @param string $guid
-     * @return RedirectResponse function that delete an access right list
-     */
-    public function delete(string $guid): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-        $list = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
-
-        if ($list) {
-            foreach ($list->getUsers() as $user) {
-                $user->setAccessRightList(null);
-            }
-
-            $em->remove($list);
-            $em->flush();
-
-            $this->addFlash("success-flash", "The right list was deleted");
-        } else {
-            $this->addFlash("error-flash", "The right list wasn't found");
-        }
-
-        return $this->redirectToRoute("ribsadmin_access_rights");
-    }
-
-    /**
-     * @param Request $request
-     * @param AccessRight $access_right
-     * @return RedirectResponse function that handle the form request
-     */
-    private function handleEditForm(Request $request, AccessRight $access_right): RedirectResponse
-    {
-        $em = $this->getDoctrine()->getManager();
-
-        if ($request->get("right") === null) {
-            $rights = "";
-        } else {
-            $rights = implode(",", $request->get("right"));
-        }
-
-        $access_right->setAccessRights($rights);
-        $em->persist($access_right);
-        $em->flush();
-
-        $em->getRepository("RibsAdminBundle:AccessRight")->deleteAllUsersList($access_right);
-        $admins = $request->get("admins");
-
-        if ($admins !== null) {
-            foreach ($admins as $admin) {
-                $em->getRepository("RibsAdminBundle:AccessRight")->setAccessRightListUser($access_right->getId(), $admin);
-            }
-        }
-
-        $this->addFlash("success-flash", "The right list was correctly edited");
-
-        return $this->redirectToRoute("ribsadmin_access_rights");
-    }
+				/**
+				 * @Route("/access-rights-management/", name="ribsadmin_access_rights")
+				 * @return Response
+				 */
+				public function list(): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$acces_right = $em->getRepository("RibsAdminBundle:AccessRight")->findAll();
+
+								return $this->render("@RibsAdmin/access-rights/list.html.twig", [
+												"access_right" => $acces_right
+								]);
+				}
+
+				/**
+				 * @Route("/access-rights-management/create/", name="ribsadmin_access_rights_create")
+				 * @Route("/access-rights-management/edit/{guid}", name="ribsadmin_access_rights_edit")
+				 * @param Request $request
+				 * @param Globals $globals
+				 * @param ModuleService $module
+				 * @param string|null $guid
+				 * @return Response
+				 */
+				public function edit(Request $request, Globals $globals, ModuleService $module, string $guid = null): Response
+				{
+								$em = $this->getDoctrine()->getManager();
+								$list_rights_user = [];
+
+								if ($guid === null) {
+												$access_right = new AccessRight();
+								} else {
+												$access_right = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
+												$list_rights_user = explode(",", $access_right->getAccessRights());
+								}
+
+								$admins = $em->getRepository("RibsAdminBundle:User")->findBy(["admin" => true, "archived" => false]);
+
+								$form = $this->createForm("PiouPiou\RibsAdminBundle\Form\AccessRight", $access_right);
+								$form->handleRequest($request);
+
+								if ($form->isSubmitted() && $form->isValid()) {
+												return $this->handleEditForm($request, $access_right);
+								}
+
+								return $this->render("@RibsAdmin/access-rights/edit.html.twig", [
+												"access_right" => $access_right,
+												"form" => $form->createView(),
+												"form_errors" => $form->getErrors(),
+												"list_rights_user" => $list_rights_user,
+												"admins" => $admins,
+												"ribs_admin_rights" => json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json")),
+												"modules" => $module->getAllInfosModules()
+								]);
+				}
+
+				/**
+				 * @Route("/access-rights-management/delete/{guid}", name="ribsadmin_access_rights_delete")
+				 * @param string $guid
+				 * @return RedirectResponse function that delete an access right list
+				 */
+				public function delete(string $guid): RedirectResponse
+				{
+								$em = $this->getDoctrine()->getManager();
+								$list = $em->getRepository("RibsAdminBundle:AccessRight")->findOneBy(["guid" => $guid]);
+
+								if ($list) {
+												foreach ($list->getUsers() as $user) {
+																$user->setAccessRightList(null);
+												}
+
+												$em->remove($list);
+												$em->flush();
+
+												$this->addFlash("success-flash", "The right list was deleted");
+								} else {
+												$this->addFlash("error-flash", "The right list wasn't found");
+								}
+
+								return $this->redirectToRoute("ribsadmin_access_rights");
+				}
+
+				/**
+				 * @param Request $request
+				 * @param AccessRight $access_right
+				 * @return RedirectResponse function that handle the form request
+				 */
+				private function handleEditForm(Request $request, AccessRight $access_right): RedirectResponse
+				{
+								$em = $this->getDoctrine()->getManager();
+
+								if ($request->get("right") === null) {
+												$rights = "";
+								} else {
+												$rights = implode(",", $request->get("right"));
+								}
+
+								$access_right->setAccessRights($rights);
+								$em->persist($access_right);
+								$em->flush();
+
+								$em->getRepository("RibsAdminBundle:AccessRight")->deleteAllUsersList($access_right);
+								$admins = $request->get("admins");
+
+								if ($admins !== null) {
+												foreach ($admins as $admin) {
+																$em->getRepository("RibsAdminBundle:AccessRight")->setAccessRightListUser($access_right->getId(), $admin);
+												}
+								}
+
+								$this->addFlash("success-flash", "The right list was correctly edited");
+
+								return $this->redirectToRoute("ribsadmin_access_rights");
+				}
 }

Controller/ApiController.php

Indentation +58 added lines, -58 removed lines

@@ -13,69 +13,69 @@
 
 class ApiController extends AbstractController
 {
-    /**
-     * this method is user to authenticate a user by an api request
-     * if success it return a token api that expire in 20 minutes
-     * @Route("/api/users/authenticate", name="ribsadmin_api_login", methods={"POST"})
-     * @param Request $request
-     * @param Api $api
-     * @param EncoderFactoryInterface $encoder
-     * @return JsonResponse
-     * @throws \Exception
-     */
-    public function login(Request $request, Api $api, EncoderFactoryInterface $encoder): JsonResponse
-    {
-        $em = $this->getDoctrine()->getManager();
+				/**
+				 * this method is user to authenticate a user by an api request
+				 * if success it return a token api that expire in 20 minutes
+				 * @Route("/api/users/authenticate", name="ribsadmin_api_login", methods={"POST"})
+				 * @param Request $request
+				 * @param Api $api
+				 * @param EncoderFactoryInterface $encoder
+				 * @return JsonResponse
+				 * @throws \Exception
+				 */
+				public function login(Request $request, Api $api, EncoderFactoryInterface $encoder): JsonResponse
+				{
+								$em = $this->getDoctrine()->getManager();
 
-        $account = $em->getRepository(Account::class)->findOneBy([
-            "username" => $request->get("username"),
-        ]);
+								$account = $em->getRepository(Account::class)->findOneBy([
+												"username" => $request->get("username"),
+								]);
 
-        if ($account) {
-            if ($encoder->getEncoder($account)->isPasswordValid($account->getPassword(), $request->get("password"), '') === true) {
-                if ($account->getisActive() == false) {
-                    return new JsonResponse([
-                        "success" => false,
-                        "error_message" => "You account is disabled"
-                    ]);
-                }
+								if ($account) {
+												if ($encoder->getEncoder($account)->isPasswordValid($account->getPassword(), $request->get("password"), '') === true) {
+																if ($account->getisActive() == false) {
+																				return new JsonResponse([
+																								"success" => false,
+																								"error_message" => "You account is disabled"
+																				]);
+																}
 
-                return new JsonResponse([
-                    "success" => true,
-                    "token" => $api->getToken($account)
-                ]);
-            }
-        }
+																return new JsonResponse([
+																				"success" => true,
+																				"token" => $api->getToken($account)
+																]);
+												}
+								}
 
-        return new JsonResponse([
-            "success" => false,
-            "error_message" => "bad identifiant and/or password"
-        ]);
-    }
+								return new JsonResponse([
+												"success" => false,
+												"error_message" => "bad identifiant and/or password"
+								]);
+				}
 
-    /**
-     * method that test if user steel logged and send token or new token if it was expired
-     * @Route("/api/users/test-token", name="ribsadmin_api_test_token", methods={"POST"})
-     * @param Request $request
-     * @param Api $api
-     * @param Session $session
-     * @return JsonResponse
-     * @throws \Exception
-     */
-    public function testUserToken(Request $request, Api $api, Session $session): JsonResponse
-    {
-        $test_logged = $api->userIslogged($request->get("infos"), $request->get("token"));
+				/**
+				 * method that test if user steel logged and send token or new token if it was expired
+				 * @Route("/api/users/test-token", name="ribsadmin_api_test_token", methods={"POST"})
+				 * @param Request $request
+				 * @param Api $api
+				 * @param Session $session
+				 * @return JsonResponse
+				 * @throws \Exception
+				 */
+				public function testUserToken(Request $request, Api $api, Session $session): JsonResponse
+				{
+								$test_logged = $api->userIslogged($request->get("infos"), $request->get("token"));
 
-        if ($test_logged === false) {
-            return new JsonResponse([
-                "success" => $test_logged,
-                "error_message" => "Votre compte a été archivé, vous ne pouvez plus vous connecter",
-            ]);
-        }
+								if ($test_logged === false) {
+												return new JsonResponse([
+																"success" => $test_logged,
+																"error_message" => "Votre compte a été archivé, vous ne pouvez plus vous connecter",
+												]);
+								}
 
-        return new JsonResponse([
-            "success" => $test_logged,
-            "token" => $api->getToken($session->get("account")),
-        ]);
-    }
+								return new JsonResponse([
+												"success" => $test_logged,
+												"token" => $api->getToken($session->get("account")),
+								]);
+				}
 }

Controller/DefaultController.php

Indentation +9 added lines, -9 removed lines

@@ -7,13 +7,13 @@
 
 class DefaultController extends AbstractController
 {
-    /**
-     * @Route("/", name="ribsadmin")
-     * @Route("/index", name="ribsadmin_index")
-     * @Route("/navigation", name="ribsadmin_navigation")
-     */
-    public function index()
-    {
-        return $this->render('@RibsAdmin/Default/index.html.twig');
-    }
+				/**
+				 * @Route("/", name="ribsadmin")
+				 * @Route("/index", name="ribsadmin_index")
+				 * @Route("/navigation", name="ribsadmin_navigation")
+				 */
+				public function index()
+				{
+								return $this->render('@RibsAdmin/Default/index.html.twig');
+				}
 }

Controller/NavigationBuilderController.php

Indentation +44 added lines, -44 removed lines

@@ -10,48 +10,48 @@
 
 class NavigationBuilderController extends AbstractController
 {
-    private $nav = [];
-
-    /**
-     * function that display the left navigation mapped by user rights
-     * @param Globals $globals
-     * @param AccessRights $access_rights
-     * @return Response
-     */
-    public function getLeftNavigation(Globals $globals, AccessRights $access_rights): Response
-    {
-        $navigation = json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/navigation.json"), true);
-
-        foreach ($navigation["items"] as $item) {
-            if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
-                $this->nav[] = $item;
-            }
-        }
-
-        $this->getModuleNavigation();
-
-        return $this->render("@RibsAdmin/navigation.html.twig", ["navigation" => $this->nav]);
-    }
-
-    /**
-     * to get all modules navigation and test right navigation
-     */
-    private function getModuleNavigation()
-    {
-        $modules = $this->getDoctrine()->getRepository(Module::class)->findBy([
-            "active" => true,
-            "displayed" => true
-        ]);
-
-        foreach ($modules as $module) {
-            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
-                ($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
-
-            foreach ($navigation["items"] as $item) {
-                if ($this->get("ribs_admin.acess_rights")->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
-                    $this->nav[] = $item;
-                }
-            }
-        }
-    }
+				private $nav = [];
+
+				/**
+				 * function that display the left navigation mapped by user rights
+				 * @param Globals $globals
+				 * @param AccessRights $access_rights
+				 * @return Response
+				 */
+				public function getLeftNavigation(Globals $globals, AccessRights $access_rights): Response
+				{
+								$navigation = json_decode(file_get_contents($globals->getBaseBundlePath() . "/Resources/json/navigation.json"), true);
+
+								foreach ($navigation["items"] as $item) {
+												if ($access_rights->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
+																$this->nav[] = $item;
+												}
+								}
+
+								$this->getModuleNavigation();
+
+								return $this->render("@RibsAdmin/navigation.html.twig", ["navigation" => $this->nav]);
+				}
+
+				/**
+				 * to get all modules navigation and test right navigation
+				 */
+				private function getModuleNavigation()
+				{
+								$modules = $this->getDoctrine()->getRepository(Module::class)->findBy([
+												"active" => true,
+												"displayed" => true
+								]);
+
+								foreach ($modules as $module) {
+												$navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
+																($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
+
+												foreach ($navigation["items"] as $item) {
+																if ($this->get("ribs_admin.acess_rights")->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {
+																				$this->nav[] = $item;
+																}
+												}
+								}
+				}
 }

Spacing +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         ]);
 
         foreach ($modules as $module) {
-            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath
-                ($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
+            $navigation = json_decode(file_get_contents($this->get("ribs_admin.globals")->getBaseBundlePath($module->getPackageName(), $module->getDevMode()) . "/Resources/json/navigation.json"), true);
 
             foreach ($navigation["items"] as $item) {
                 if ($this->get("ribs_admin.acess_rights")->testRight($item["right"]) && (!isset($item["position"]) || $item["position"] === "left")) {