devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Logout user before deleting it 

And add a smal description
This commit is contained in:
Jeremy Benoist 2016-10-08 19:39:12 +02:00
parent c3396c65ef
commit eed812afd0
No known key found for this signature in database
GPG Key ID: BCA73962457ACC3C
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -261,28 +261,31 @@ class ConfigController extends Controller
*
* @Route("/account/delete", name="delete_account")
*
* @param Request $request
*
* @throws AccessDeniedHttpException
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function deleteAccountAction()
{
$enabledUsers = $this->getDoctrine()
->getRepository('WallabagUserBundle:User')
->getSumEnabledUsers();
public function deleteAccountAction(Request $request)
{
$enabledUsers = $this->getDoctrine()
->getRepository('WallabagUserBundle:User')
->getSumEnabledUsers();
if ($enabledUsers <= 1) {
throw new AccessDeniedHttpException();
}
if ($enabledUsers <= 1) {
throw new AccessDeniedHttpException();
}
$em = $this->get('fos_user.user_manager');
$em->deleteUser($this->getUser());
$user = $this->getUser();
$this->get('session')->getFlashBag()->add(
'notice',
'flashes.account.notice.account_deleted'
);
// logout current user
$this->get('security.token_storage')->setToken(null);
$request->getSession()->invalidate();
return $this->redirect($this->generateUrl('fos_user_security_logout'));
}
$em = $this->get('fos_user.user_manager');
$em->deleteUser($user);
return $this->redirect($this->generateUrl('fos_user_security_login'));
}
}

10
src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
View File

@ -169,7 +169,15 @@
</form>
{% if enabled_users > 1 %}
<a class='btn red delete-account' href='{{ path('delete_account') }}'>{{ 'config.form_user.delete_account' | trans }}</a>
<br /><hr /><br />
<div class="row">
<h5>{{ 'config.delete.title'|trans }}</h5>
<p>{{ 'config.delete.description'|trans }}</p>
<a href="{{ path('delete_account') }}" onclick="return confirm('{{ 'config.delete.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red delete-account">
{{ 'config.form_user.delete_account' | trans }}
</a>
</div>
{% endif %}
</div>