diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/SiteCredentialController.php | 38 |
1 files changed, 28 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php b/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php index 0bacafb7..98781dab 100644 --- a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php +++ b/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php | |||
@@ -26,9 +26,9 @@ class SiteCredentialController extends Controller | |||
26 | { | 26 | { |
27 | $credentials = $this->get('wallabag_core.site_credential_repository')->findByUser($this->getUser()); | 27 | $credentials = $this->get('wallabag_core.site_credential_repository')->findByUser($this->getUser()); |
28 | 28 | ||
29 | return $this->render('WallabagCoreBundle:SiteCredential:index.html.twig', array( | 29 | return $this->render('WallabagCoreBundle:SiteCredential:index.html.twig', [ |
30 | 'credentials' => $credentials, | 30 | 'credentials' => $credentials, |
31 | )); | 31 | ]); |
32 | } | 32 | } |
33 | 33 | ||
34 | /** | 34 | /** |
@@ -36,6 +36,10 @@ class SiteCredentialController extends Controller | |||
36 | * | 36 | * |
37 | * @Route("/new", name="site_credentials_new") | 37 | * @Route("/new", name="site_credentials_new") |
38 | * @Method({"GET", "POST"}) | 38 | * @Method({"GET", "POST"}) |
39 | * | ||
40 | * @param Request $request | ||
41 | * | ||
42 | * @return \Symfony\Component\HttpFoundation\Response | ||
39 | */ | 43 | */ |
40 | public function newAction(Request $request) | 44 | public function newAction(Request $request) |
41 | { | 45 | { |
@@ -45,24 +49,25 @@ class SiteCredentialController extends Controller | |||
45 | $form->handleRequest($request); | 49 | $form->handleRequest($request); |
46 | 50 | ||
47 | if ($form->isSubmitted() && $form->isValid()) { | 51 | if ($form->isSubmitted() && $form->isValid()) { |
52 | $credential->setUsername($this->get('wallabag_core.helper.crypto_proxy')->crypt($credential->getUsername())); | ||
48 | $credential->setPassword($this->get('wallabag_core.helper.crypto_proxy')->crypt($credential->getPassword())); | 53 | $credential->setPassword($this->get('wallabag_core.helper.crypto_proxy')->crypt($credential->getPassword())); |
49 | 54 | ||
50 | $em = $this->getDoctrine()->getManager(); | 55 | $em = $this->getDoctrine()->getManager(); |
51 | $em->persist($credential); | 56 | $em->persist($credential); |
52 | $em->flush($credential); | 57 | $em->flush(); |
53 | 58 | ||
54 | $this->get('session')->getFlashBag()->add( | 59 | $this->get('session')->getFlashBag()->add( |
55 | 'notice', | 60 | 'notice', |
56 | $this->get('translator')->trans('flashes.site_credential.notice.added', ['%host%' => $credential->getHost()]) | 61 | $this->get('translator')->trans('flashes.site_credential.notice.added', ['%host%' => $credential->getHost()]) |
57 | ); | 62 | ); |
58 | 63 | ||
59 | return $this->redirectToRoute('site_credentials_edit', array('id' => $credential->getId())); | 64 | return $this->redirectToRoute('site_credentials_index'); |
60 | } | 65 | } |
61 | 66 | ||
62 | return $this->render('WallabagCoreBundle:SiteCredential:new.html.twig', array( | 67 | return $this->render('WallabagCoreBundle:SiteCredential:new.html.twig', [ |
63 | 'credential' => $credential, | 68 | 'credential' => $credential, |
64 | 'form' => $form->createView(), | 69 | 'form' => $form->createView(), |
65 | )); | 70 | ]); |
66 | } | 71 | } |
67 | 72 | ||
68 | /** | 73 | /** |
@@ -70,6 +75,11 @@ class SiteCredentialController extends Controller | |||
70 | * | 75 | * |
71 | * @Route("/{id}/edit", name="site_credentials_edit") | 76 | * @Route("/{id}/edit", name="site_credentials_edit") |
72 | * @Method({"GET", "POST"}) | 77 | * @Method({"GET", "POST"}) |
78 | * | ||
79 | * @param Request $request | ||
80 | * @param SiteCredential $siteCredential | ||
81 | * | ||
82 | * @return \Symfony\Component\HttpFoundation\Response | ||
73 | */ | 83 | */ |
74 | public function editAction(Request $request, SiteCredential $siteCredential) | 84 | public function editAction(Request $request, SiteCredential $siteCredential) |
75 | { | 85 | { |
@@ -80,6 +90,9 @@ class SiteCredentialController extends Controller | |||
80 | $editForm->handleRequest($request); | 90 | $editForm->handleRequest($request); |
81 | 91 | ||
82 | if ($editForm->isSubmitted() && $editForm->isValid()) { | 92 | if ($editForm->isSubmitted() && $editForm->isValid()) { |
93 | $siteCredential->setUsername($this->get('wallabag_core.helper.crypto_proxy')->crypt($siteCredential->getUsername())); | ||
94 | $siteCredential->setPassword($this->get('wallabag_core.helper.crypto_proxy')->crypt($siteCredential->getPassword())); | ||
95 | |||
83 | $em = $this->getDoctrine()->getManager(); | 96 | $em = $this->getDoctrine()->getManager(); |
84 | $em->persist($siteCredential); | 97 | $em->persist($siteCredential); |
85 | $em->flush(); | 98 | $em->flush(); |
@@ -89,14 +102,14 @@ class SiteCredentialController extends Controller | |||
89 | $this->get('translator')->trans('flashes.site_credential.notice.updated', ['%host%' => $siteCredential->getHost()]) | 102 | $this->get('translator')->trans('flashes.site_credential.notice.updated', ['%host%' => $siteCredential->getHost()]) |
90 | ); | 103 | ); |
91 | 104 | ||
92 | return $this->redirectToRoute('site_credentials_edit', array('id' => $siteCredential->getId())); | 105 | return $this->redirectToRoute('site_credentials_index'); |
93 | } | 106 | } |
94 | 107 | ||
95 | return $this->render('WallabagCoreBundle:SiteCredential:edit.html.twig', array( | 108 | return $this->render('WallabagCoreBundle:SiteCredential:edit.html.twig', [ |
96 | 'credential' => $siteCredential, | 109 | 'credential' => $siteCredential, |
97 | 'edit_form' => $editForm->createView(), | 110 | 'edit_form' => $editForm->createView(), |
98 | 'delete_form' => $deleteForm->createView(), | 111 | 'delete_form' => $deleteForm->createView(), |
99 | )); | 112 | ]); |
100 | } | 113 | } |
101 | 114 | ||
102 | /** | 115 | /** |
@@ -104,6 +117,11 @@ class SiteCredentialController extends Controller | |||
104 | * | 117 | * |
105 | * @Route("/{id}", name="site_credentials_delete") | 118 | * @Route("/{id}", name="site_credentials_delete") |
106 | * @Method("DELETE") | 119 | * @Method("DELETE") |
120 | * | ||
121 | * @param Request $request | ||
122 | * @param SiteCredential $siteCredential | ||
123 | * | ||
124 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | ||
107 | */ | 125 | */ |
108 | public function deleteAction(Request $request, SiteCredential $siteCredential) | 126 | public function deleteAction(Request $request, SiteCredential $siteCredential) |
109 | { | 127 | { |
@@ -136,7 +154,7 @@ class SiteCredentialController extends Controller | |||
136 | private function createDeleteForm(SiteCredential $siteCredential) | 154 | private function createDeleteForm(SiteCredential $siteCredential) |
137 | { | 155 | { |
138 | return $this->createFormBuilder() | 156 | return $this->createFormBuilder() |
139 | ->setAction($this->generateUrl('site_credentials_delete', array('id' => $siteCredential->getId()))) | 157 | ->setAction($this->generateUrl('site_credentials_delete', ['id' => $siteCredential->getId()])) |
140 | ->setMethod('DELETE') | 158 | ->setMethod('DELETE') |
141 | ->getForm() | 159 | ->getForm() |
142 | ; | 160 | ; |