@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | ]); |
34 | 34 | } |
35 | 35 | |
36 | - /** |
|
37 | - * @Route("/accounts/create/", name="ribsadmin_accounts_create") |
|
38 | - * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit") |
|
39 | - * @param Request $request |
|
40 | - * @param string|null $guid |
|
41 | - * @return Response |
|
42 | - */ |
|
36 | + /** |
|
37 | + * @Route("/accounts/create/", name="ribsadmin_accounts_create") |
|
38 | + * @Route("/accounts/edit/{guid}", name="ribsadmin_accounts_edit") |
|
39 | + * @param Request $request |
|
40 | + * @param string|null $guid |
|
41 | + * @return Response |
|
42 | + */ |
|
43 | 43 | public function editUserAction(Request $request, string $guid = null): Response |
44 | 44 | { |
45 | 45 | $em = $this->getDoctrine()->getManager(); |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | if ($guid === null) { |
48 | 48 | $account = new Account(); |
49 | 49 | $old_password = null; |
50 | - $user = null; |
|
50 | + $user = null; |
|
51 | 51 | } else { |
52 | 52 | $user = $em->getRepository(User::class)->findOneBy(["guid" => $guid]); |
53 | 53 | $account = $em->getRepository(Account::class)->findOneBy(["user" => $user->getId()]); |
54 | - $old_password = $account->getPassword(); |
|
54 | + $old_password = $account->getPassword(); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | $form = $this->createForm("PiouPiou\RibsAdminBundle\Form\Account", $account); |
@@ -71,15 +71,15 @@ discard block |
||
71 | 71 | } |
72 | 72 | |
73 | 73 | if (!$account_exist) { |
74 | - if ($guid === null) { |
|
75 | - $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData()); |
|
76 | - $data->setPassword($temp_password); |
|
77 | - } else if ($form->get("password")->getData()) { |
|
78 | - $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData()); |
|
79 | - $data->setPassword($temp_password); |
|
80 | - } else { |
|
81 | - $data->setPassword($old_password); |
|
82 | - } |
|
74 | + if ($guid === null) { |
|
75 | + $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData()); |
|
76 | + $data->setPassword($temp_password); |
|
77 | + } else if ($form->get("password")->getData()) { |
|
78 | + $temp_password = $this->get("security.password_encoder")->encodePassword($data, $form->get("password")->getData()); |
|
79 | + $data->setPassword($temp_password); |
|
80 | + } else { |
|
81 | + $data->setPassword($old_password); |
|
82 | + } |
|
83 | 83 | |
84 | 84 | $em->persist($data); |
85 | 85 | $em->flush(); |
@@ -101,8 +101,8 @@ discard block |
||
101 | 101 | |
102 | 102 | return $this->render("@RibsAdmin/accounts/edit.html.twig", [ |
103 | 103 | "form" => $form->createView(), |
104 | - "form_errors" => $form->getErrors(), |
|
105 | - "user" => $user |
|
104 | + "form_errors" => $form->getErrors(), |
|
105 | + "user" => $user |
|
106 | 106 | ]); |
107 | 107 | } |
108 | 108 | //-------------------------------------------- END DISPLAY VIEWS -----------------------------------------------------------// |