devol/wallabag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper parameter name, simplify logic & phpdoc

Browse Source
This commit is contained in:
Thomas Citharel 2016-07-24 11:41:04 +02:00 committed by Jeremy Benoist
parent de3d716ae4
commit 7149aa5781
No known key found for this signature in database
GPG Key ID: BCA73962457ACC3C
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/config.yml
View File

@ -51,7 +51,7 @@ wallabag_core:
reading_speed: 1 reading_speed: 1
wallabag_user: wallabag_user:
registration_enabled: "%registration_enabled%" registration_enabled: "%fosuser_registration%"
wallabag_import: wallabag_import:
allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']

8
src/Wallabag/UserBundle/Controller/RegistrationController.php
View File

@ -10,11 +10,9 @@ class RegistrationController extends FOSRegistrationController
public function registerAction(Request $request) public function registerAction(Request $request)
{ {
if ($this->container->getParameter('wallabag_user.registration_enabled')) { if ($this->container->getParameter('wallabag_user.registration_enabled')) {
parent::registerAction($request); return parent::registerAction($request);
}
else
{
return $this->redirectToRoute('fos_user_security_login', array(), 301);
} }
return $this->redirectToRoute('fos_user_security_login', array(), 301);
} }
} }

3
src/Wallabag/UserBundle/Controller/SecurityController.php
View File

@ -4,6 +4,9 @@ namespace Wallabag\UserBundle\Controller;
use FOS\UserBundle\Controller\SecurityController as FOSSecurityController; use FOS\UserBundle\Controller\SecurityController as FOSSecurityController;
/**
* Extends login form in order to pass the registration_enabled parameter.
*/
class SecurityController extends FOSSecurityController class SecurityController extends FOSSecurityController
{ {
protected function renderLogin(array $data) protected function renderLogin(array $data)