Piou-piou / RibsAdminBundle

Form/Type/AutocompleteType.php

Indentation +30 added lines, -30 removed lines

@@ -10,35 +10,35 @@
 
 class AutocompleteType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add($options["autocomplete_name"], TextType::class, [
-                "label" => false,
-                "attr" => [
-                    "class" => "input-autocomplete",
-                    "data-url" => $options["data_url"],
-                    "autocomplete" => "off"
-                ],
-                "mapped" => false
-            ])
-            ->add($options["autocomplete_name"] . "_id", HiddenType::class, [
-                "mapped" => false
-            ]);
-    }
+				/**
+				 * @param FormBuilderInterface $builder
+				 * @param array $options
+				 */
+				public function buildForm(FormBuilderInterface $builder, array $options)
+				{
+								$builder
+												->add($options["autocomplete_name"], TextType::class, [
+																"label" => false,
+																"attr" => [
+																				"class" => "input-autocomplete",
+																				"data-url" => $options["data_url"],
+																				"autocomplete" => "off"
+																],
+																"mapped" => false
+												])
+												->add($options["autocomplete_name"] . "_id", HiddenType::class, [
+																"mapped" => false
+												]);
+				}
 
-    /**
-     * @param OptionsResolver $resolver
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            "autocomplete_name" => null,
-            "data_url" => null,
-        ]);
-    }
+				/**
+				 * @param OptionsResolver $resolver
+				 */
+				public function configureOptions(OptionsResolver $resolver)
+				{
+								$resolver->setDefaults([
+												"autocomplete_name" => null,
+												"data_url" => null,
+								]);
+				}
 }

Form/User.php

Indentation +7 added lines, -7 removed lines

@@ -34,10 +34,10 @@ 
 		$this->tokenStorage = $tokenStorage;
 	}
 
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+				/**
+				 * @param FormBuilderInterface $builder
+				 * @param array $options
+				 */
 	public function buildForm(FormBuilderInterface $builder, array $options)
 	{
 		$access_rights_lists = $this->em->getRepository(\PiouPiou\RibsAdminBundle\Entity\AccessRight::class)->findAll();
@@ -70,9 +70,9 @@ 
 			]);
 	}
 
-    /**
-     * @param OptionsResolver $resolver
-     */
+				/**
+				 * @param OptionsResolver $resolver
+				 */
 	public function configureOptions(OptionsResolver $resolver)
 	{
 		$resolver->setDefaults([

Form/AccessRight.php

Indentation +7 added lines, -7 removed lines

@@ -10,10 +10,10 @@ 
 
 class AccessRight extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
+				/**
+				 * @param FormBuilderInterface $builder
+				 * @param array $options
+				 */
 	public function buildForm(FormBuilderInterface $builder, array $options)
 	{
 		$builder
@@ -28,9 +28,9 @@ 
 			]);
 	}
 
-    /**
-     * @param OptionsResolver $resolver
-     */
+				/**
+				 * @param OptionsResolver $resolver
+				 */
 	public function configureOptions(OptionsResolver $resolver)
 	{
 		$resolver->setDefaults([

Repository/AccountRepository.php

Indentation +13 added lines, -13 removed lines

@@ -7,21 +7,21 @@
 
 class AccountRepository extends EntityRepository
 {
-    /**
-     * function that return a list of all users that are not archived and different of current account
-     * @param User $current_account
-     * @param bool $archived
-     * @return array
-     */
-    public function findAllUserArchived(User $current_account, bool $archived = false): array
-    {
-        $query = $this->getEntityManager()->createQuery("SELECT fu FROM RibsAdminBundle:Account fu
+				/**
+				 * function that return a list of all users that are not archived and different of current account
+				 * @param User $current_account
+				 * @param bool $archived
+				 * @return array
+				 */
+				public function findAllUserArchived(User $current_account, bool $archived = false): array
+				{
+								$query = $this->getEntityManager()->createQuery("SELECT fu FROM RibsAdminBundle:Account fu
 			  JOIN RibsAdminBundle:User u  WITH fu.user = u
 			  WHERE u.archived = :archived and u != :current_account
 			")
-            ->setParameter("archived", $archived)
-            ->setParameter("current_account", $current_account);
+												->setParameter("archived", $archived)
+												->setParameter("current_account", $current_account);
 
-        return $query->getResult();
-    }
+								return $query->getResult();
+				}
 }

Repository/NavigationRepository.php

Indentation +22 added lines, -22 removed lines

@@ -7,38 +7,38 @@
 
 class NavigationRepository extends EntityRepository
 {
-    /**
-     * function that return all navigation links of pages and modules
-     * @return array
-     * @throws DBALException
-     */
-    public function findAllNavigation(): array
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
+				/**
+				 * function that return all navigation links of pages and modules
+				 * @return array
+				 * @throws DBALException
+				 */
+				public function findAllNavigation(): array
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
 			LEFT JOIN page p ON n.id_page = p.id AND p.displayed = 1
 			LEFT JOIN module m ON n.id_module = m.id AND m.displayed = 1
 		  	ORDER BY n.order ASC
  		");
 
-        $query->execute();
+								$query->execute();
 
-        return $query->fetchAll(\PDO::FETCH_ASSOC);
-    }
+								return $query->fetchAll(\PDO::FETCH_ASSOC);
+				}
 
-    /**
-     * function that return all navigation links of pages
-     * @return array
-     * @throws DBALException
-     */
-    public function findAllNavigationPage(): array
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
+				/**
+				 * function that return all navigation links of pages
+				 * @return array
+				 * @throws DBALException
+				 */
+				public function findAllNavigationPage(): array
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("SELECT p.url, p.title, p.title_tag FROM navigation n
 			INNER JOIN page p ON n.id_page = p.id AND p.displayed = 1
 		  	ORDER BY n.order ASC
  		");
 
-        $query->execute();
+								$query->execute();
 
-        return $query->fetchAll(\PDO::FETCH_ASSOC);
-    }
+								return $query->fetchAll(\PDO::FETCH_ASSOC);
+				}
 }

Repository/AccessRightRepository.php

Indentation +24 added lines, -24 removed lines

@@ -8,33 +8,33 @@
 
 class AccessRightRepository extends EntityRepository
 {
-    /**
-     * function that delete all user which are in a list of rights
-     * @param AccessRight $access_right
-     * @throws DBALException
-     */
-    public function deleteAllUsersList(AccessRight $access_right)
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = NULL WHERE
+				/**
+				 * function that delete all user which are in a list of rights
+				 * @param AccessRight $access_right
+				 * @throws DBALException
+				 */
+				public function deleteAllUsersList(AccessRight $access_right)
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = NULL WHERE
  			id_access_right = :id_access_right
  		");
-        $query->bindValue("id_access_right", $access_right->getId());
-        $query->execute();
-    }
+								$query->bindValue("id_access_right", $access_right->getId());
+								$query->execute();
+				}
 
-    /**
-     * function that add a user in an access right list
-     * @param int $access_right_id
-     * @param string $guid_admin
-     * @throws DBALException
-     */
-    public function setAccessRightListUser(int $access_right_id, string $guid_admin)
-    {
-        $query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = :id_access_right WHERE
+				/**
+				 * function that add a user in an access right list
+				 * @param int $access_right_id
+				 * @param string $guid_admin
+				 * @throws DBALException
+				 */
+				public function setAccessRightListUser(int $access_right_id, string $guid_admin)
+				{
+								$query = $this->getEntityManager()->getConnection()->prepare("UPDATE user SET id_access_right = :id_access_right WHERE
  			guid = :guid_user
  		");
-        $query->bindValue("id_access_right", $access_right_id, \PDO::PARAM_INT);
-        $query->bindValue("guid_user", $guid_admin, \PDO::PARAM_STR);
-        $query->execute();
-    }
+								$query->bindValue("id_access_right", $access_right_id, \PDO::PARAM_INT);
+								$query->bindValue("guid_user", $guid_admin, \PDO::PARAM_STR);
+								$query->execute();
+				}
 }

Entity/AccountToken.php

Indentation +152 added lines, -152 removed lines

@@ -16,156 +16,156 @@
  */
 class AccountToken
 {
-    use GuidTrait;
-
-    /**
-     * @ORM\Id
-     * @ORM\Column(type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $token;
-
-    /**
-     * @ORM\Column(type="datetime", nullable=true)
-     */
-    protected $endToken;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $userAgent;
-
-    /**
-     * @ORM\Column(type="string", length=200)
-     */
-    protected $ip;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
-     * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
-     */
-    protected $account;
-
-    /**
-     * @return mixed
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * @param mixed $id
-     * @return AccountToken
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getToken()
-    {
-        return $this->token;
-    }
-
-    /**
-     * @param mixed $token
-     * @return AccountToken
-     */
-    public function setToken($token)
-    {
-        $this->token = $token;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getEndToken()
-    {
-        return $this->endToken;
-    }
-
-    /**
-     * @param mixed $endToken
-     * @return AccountToken
-     */
-    public function setEndToken($endToken)
-    {
-        $this->endToken = $endToken;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * @param mixed $userAgent
-     * @return AccountToken
-     */
-    public function setUserAgent($userAgent)
-    {
-        $this->userAgent = $userAgent;
-
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getIp()
-    {
-        return $this->ip;
-    }
-
-    /**
-     * @param mixed $ip
-     * @return AccountToken
-     */
-    public function setIp($ip)
-    {
-        $this->ip = $ip;
-
-        return $this;
-    }
-
-    /**
-     * Set Account entity (many to one).
-     *
-     * @param Account $account
-     * @return AccountToken
-     */
-    public function setAccount(Account $account = null)
-    {
-        $this->account = $account;
-
-        return $this;
-    }
-
-    /**
-     * Get Account entity (many to one).
-     *
-     * @return Account
-     */
-    public function getAccount()
-    {
-        return $this->account;
-    }
+				use GuidTrait;
+
+				/**
+				 * @ORM\Id
+				 * @ORM\Column(type="integer")
+				 * @ORM\GeneratedValue(strategy="AUTO")
+				 */
+				protected $id;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $token;
+
+				/**
+				 * @ORM\Column(type="datetime", nullable=true)
+				 */
+				protected $endToken;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $userAgent;
+
+				/**
+				 * @ORM\Column(type="string", length=200)
+				 */
+				protected $ip;
+
+				/**
+				 * @ORM\ManyToOne(targetEntity="Account", inversedBy="tokens")
+				 * @ORM\JoinColumn(name="account_id", referencedColumnName="id", nullable=false)
+				 */
+				protected $account;
+
+				/**
+				 * @return mixed
+				 */
+				public function getId()
+				{
+								return $this->id;
+				}
+
+				/**
+				 * @param mixed $id
+				 * @return AccountToken
+				 */
+				public function setId($id)
+				{
+								$this->id = $id;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getToken()
+				{
+								return $this->token;
+				}
+
+				/**
+				 * @param mixed $token
+				 * @return AccountToken
+				 */
+				public function setToken($token)
+				{
+								$this->token = $token;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getEndToken()
+				{
+								return $this->endToken;
+				}
+
+				/**
+				 * @param mixed $endToken
+				 * @return AccountToken
+				 */
+				public function setEndToken($endToken)
+				{
+								$this->endToken = $endToken;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getUserAgent()
+				{
+								return $this->userAgent;
+				}
+
+				/**
+				 * @param mixed $userAgent
+				 * @return AccountToken
+				 */
+				public function setUserAgent($userAgent)
+				{
+								$this->userAgent = $userAgent;
+
+								return $this;
+				}
+
+				/**
+				 * @return mixed
+				 */
+				public function getIp()
+				{
+								return $this->ip;
+				}
+
+				/**
+				 * @param mixed $ip
+				 * @return AccountToken
+				 */
+				public function setIp($ip)
+				{
+								$this->ip = $ip;
+
+								return $this;
+				}
+
+				/**
+				 * Set Account entity (many to one).
+				 *
+				 * @param Account $account
+				 * @return AccountToken
+				 */
+				public function setAccount(Account $account = null)
+				{
+								$this->account = $account;
+
+								return $this;
+				}
+
+				/**
+				 * Get Account entity (many to one).
+				 *
+				 * @return Account
+				 */
+				public function getAccount()
+				{
+								return $this->account;
+				}
 }

Service/AccessRights.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		
 		$ribs_admin_rights = json_decode(file_get_contents($this->globals->getBaseBundlePath() . "/Resources/json/ribsadmin_rights.json"));
 		$modules_rights = $this->module->getModuleRights();
-		$ribs_admin_rights = (object)array_merge((array)$ribs_admin_rights, (array)$modules_rights);
+		$ribs_admin_rights = (object) array_merge((array) $ribs_admin_rights, (array) $modules_rights);
 		
 		if ($admin_page == "ribsadmin" && !$api && strpos($route, "login") === false && strpos($route, "register") === false) {
 			//redirection if user not connected

Indentation +31 added lines, -31 removed lines

@@ -43,10 +43,10 @@ 
 	 */
 	private $module;
 
-    /**
-     * @var Api
-     */
-    private $api;
+				/**
+				 * @var Api
+				 */
+				private $api;
 	
 	/**
 	 * @var User
@@ -56,17 +56,17 @@ 
 	/** @var TokenStorageInterface */
 	private $token_storage;
 
-    /**
-     * AccessRights constructor.
-     * @param ContainerInterface $container
-     * @param RouterInterface $router
-     * @param SessionInterface $session
-     * @param RequestStack $request
-     * @param TokenStorageInterface $tokenStorage
-     * @param Globals $globals
-     * @param ModuleService $module
-     * @param Api $api
-     */
+				/**
+				 * AccessRights constructor.
+				 * @param ContainerInterface $container
+				 * @param RouterInterface $router
+				 * @param SessionInterface $session
+				 * @param RequestStack $request
+				 * @param TokenStorageInterface $tokenStorage
+				 * @param Globals $globals
+				 * @param ModuleService $module
+				 * @param Api $api
+				 */
 	public function __construct(ContainerInterface $container, RouterInterface $router, SessionInterface $session, RequestStack $request, TokenStorageInterface $tokenStorage, Globals $globals, ModuleService $module, Api $api)
 	{
 		$this->container = $container;
@@ -78,8 +78,8 @@ 
 		$this->api = $api;
 		$this->token_storage = $tokenStorage;
 		if ($this->token_storage->getToken() && is_object($this->token_storage->getToken()->getUser()) && $this->token_storage->getToken()->getUser()->getUser()) {
-            $this->user = $this->token_storage->getToken()->getUser()->getUser();
-        }
+												$this->user = $this->token_storage->getToken()->getUser()->getUser();
+								}
 	}
 	
 	public function onKernelController()
@@ -120,14 +120,14 @@ 
 			
 			throw new AccessDeniedException("No access");
 		} else if ($api && strpos($route, "login") === false && strpos($route, "register") === false) {
-            if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
-                throw new AccessDeniedException("User is not connected");
-            }
-        }
+												if ($this->api->userIslogged($this->request->getCurrentRequest()->get("infos"), $this->request->getCurrentRequest()->get("token")) === false) {
+																throw new AccessDeniedException("User is not connected");
+												}
+								}
 	}
 	
 	/**
-     * function that allow to test a right directly in the view
+	 * function that allow to test a right directly in the view
 	 * @param string $right
 	 * @return bool
 	 */
@@ -138,9 +138,9 @@ 
 		
 		$all_rights = array_merge($user_rights, $list_rights);
 
-        if (in_array("*", $all_rights)) {
-            return true;
-        }
+								if (in_array("*", $all_rights)) {
+												return true;
+								}
 
 		if (in_array($right, $all_rights)) {
 			return true;
@@ -150,7 +150,7 @@ 
 	}
 	
 	/**
-     * test if route_right is found in users rights
+	 * test if route_right is found in users rights
 	 * @param array $route_right
 	 * @return bool
 	 */
@@ -162,8 +162,8 @@ 
 		$all_rights = array_merge($user_rights, $list_rights);
 
 		if (in_array("*", $all_rights)) {
-		    return true;
-        }
+						return true;
+								}
 
 		foreach ($all_rights as $right) {
 			if (in_array($right, $route_right)) {
@@ -175,7 +175,7 @@ 
 	}
 	
 	/**
-     * function that search if the right contain an url or more
+	 * function that search if the right contain an url or more
 	 * @param $needle
 	 * @param $haystack
 	 * @return bool|mixed
@@ -199,7 +199,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all user rights or empty array if no right found
+	 * function that retun a array that contain all user rights or empty array if no right found
 	 * @return array
 	 */
 	private function getUserRights(): array
@@ -214,7 +214,7 @@ 
 	}
 	
 	/**
-     * function that retun a array that contain all rights of rattached list right of the current user
+	 * function that retun a array that contain all rights of rattached list right of the current user
 	 * @return array
 	 */
 	private function getRightsListOfUser(): array

Service/UserLog.php

Indentation +47 added lines, -47 removed lines

@@ -9,51 +9,51 @@
 
 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->setRoute($request->get("_route"));
-                $user_log->setUrl($request->getRequestUri());
-                $user_log->setFullUrl($request->getUri());
-                $user_log->setRequestFormat($request->getRequestFormat());
-                $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->setRoute($request->get("_route"));
+																$user_log->setUrl($request->getRequestUri());
+																$user_log->setFullUrl($request->getUri());
+																$user_log->setRequestFormat($request->getRequestFormat());
+																$user_log->setRequestParameters($request->request->all());
+																$this->em->persist($user_log);
+																$this->em->flush();
+												}
+								}
+				}
 }