From de3d716ae4e8ca98dabdcb2ec9c18219e05856f7 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 2 Jul 2016 14:35:52 +0200
Subject: Add option to disable registration

---
 .../UserBundle/Controller/RegistrationController.php | 20 ++++++++++++++++++++
 .../UserBundle/Controller/SecurityController.php     | 18 ++++++++++++++++++
 .../UserBundle/DependencyInjection/Configuration.php |  8 ++++++++
 .../DependencyInjection/WallabagUserExtension.php    |  1 +
 .../Resources/views/Security/login.html.twig         |  4 +++-
 5 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/Wallabag/UserBundle/Controller/RegistrationController.php
 create mode 100644 src/Wallabag/UserBundle/Controller/SecurityController.php

(limited to 'src')

diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php
new file mode 100644
index 00000000..bba27cfb
--- /dev/null
+++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Wallabag\UserBundle\Controller;
+
+use FOS\UserBundle\Controller\RegistrationController as FOSRegistrationController;
+use Symfony\Component\HttpFoundation\Request;
+
+class RegistrationController extends FOSRegistrationController
+{
+    public function registerAction(Request $request)
+    {
+        if ($this->container->getParameter('wallabag_user.registration_enabled')) {
+            parent::registerAction($request);
+        }
+        else
+        {
+            return $this->redirectToRoute('fos_user_security_login', array(), 301);
+        }
+    }
+}
diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php
new file mode 100644
index 00000000..a5f93763
--- /dev/null
+++ b/src/Wallabag/UserBundle/Controller/SecurityController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Wallabag\UserBundle\Controller;
+
+use FOS\UserBundle\Controller\SecurityController as FOSSecurityController;
+
+class SecurityController extends FOSSecurityController
+{
+    protected function renderLogin(array $data)
+    {
+        return $this->render('FOSUserBundle:Security:login.html.twig',
+            array_merge(
+                $data,
+                array('registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled'))
+            )
+        );
+    }
+}
diff --git a/src/Wallabag/UserBundle/DependencyInjection/Configuration.php b/src/Wallabag/UserBundle/DependencyInjection/Configuration.php
index 4223f8db..971ce1a0 100644
--- a/src/Wallabag/UserBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/UserBundle/DependencyInjection/Configuration.php
@@ -12,6 +12,14 @@ class Configuration implements ConfigurationInterface
         $treeBuilder = new TreeBuilder();
         $rootNode = $treeBuilder->root('wallabag_user');
 
+        $rootNode
+            ->children()
+                ->booleanNode('registration_enabled')
+                    ->defaultValue(true)
+                ->end()
+            ->end()
+        ;
+
         return $treeBuilder;
     }
 }
diff --git a/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php b/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php
index c12a8937..99040f69 100644
--- a/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php
+++ b/src/Wallabag/UserBundle/DependencyInjection/WallabagUserExtension.php
@@ -16,6 +16,7 @@ class WallabagUserExtension extends Extension
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
+        $container->setParameter('wallabag_user.registration_enabled', $config['registration_enabled']);
     }
 
     public function getAlias()
diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
index 8474b497..13a903ab 100644
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
@@ -33,7 +33,9 @@
     </div>
     <div class="card-action center">
         <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
-        <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
+        {% if registration_enabled %}
+            <a href="{{ path('fos_user_registration_register') }}" class="waves-effect waves-light grey btn">{{ 'security.login.register'|trans }}</a>
+        {% endif %}
         <button class="btn waves-effect waves-light" type="submit" name="send">
             {{ 'security.login.submit'|trans }}
             <i class="material-icons right">send</i>
-- 
cgit v1.2.3


From 7149aa57814a9d6151f4fe049126e3cb5d86a254 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 24 Jul 2016 11:41:04 +0200
Subject: Proper parameter name, simplify logic & phpdoc

---
 src/Wallabag/UserBundle/Controller/RegistrationController.php | 8 +++-----
 src/Wallabag/UserBundle/Controller/SecurityController.php     | 3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php
index bba27cfb..d6d0fda1 100644
--- a/src/Wallabag/UserBundle/Controller/RegistrationController.php
+++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php
@@ -10,11 +10,9 @@ class RegistrationController extends FOSRegistrationController
     public function registerAction(Request $request)
     {
         if ($this->container->getParameter('wallabag_user.registration_enabled')) {
-            parent::registerAction($request);
-        }
-        else
-        {
-            return $this->redirectToRoute('fos_user_security_login', array(), 301);
+            return parent::registerAction($request);
         }
+
+        return $this->redirectToRoute('fos_user_security_login', array(), 301);
     }
 }
diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php
index a5f93763..1e752b6d 100644
--- a/src/Wallabag/UserBundle/Controller/SecurityController.php
+++ b/src/Wallabag/UserBundle/Controller/SecurityController.php
@@ -4,6 +4,9 @@ namespace Wallabag\UserBundle\Controller;
 
 use FOS\UserBundle\Controller\SecurityController as FOSSecurityController;
 
+/**
+ * Extends login form in order to pass the registration_enabled parameter.
+ */
 class SecurityController extends FOSSecurityController
 {
     protected function renderLogin(array $data)
-- 
cgit v1.2.3


From ee4442f42a36d2cfd7add334983a8e126718a788 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 24 Jul 2016 12:14:52 +0200
Subject: CS

---
 src/Wallabag/UserBundle/Controller/RegistrationController.php | 2 +-
 src/Wallabag/UserBundle/Controller/SecurityController.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Wallabag/UserBundle/Controller/RegistrationController.php b/src/Wallabag/UserBundle/Controller/RegistrationController.php
index d6d0fda1..f81f3a7b 100644
--- a/src/Wallabag/UserBundle/Controller/RegistrationController.php
+++ b/src/Wallabag/UserBundle/Controller/RegistrationController.php
@@ -13,6 +13,6 @@ class RegistrationController extends FOSRegistrationController
             return parent::registerAction($request);
         }
 
-        return $this->redirectToRoute('fos_user_security_login', array(), 301);
+        return $this->redirectToRoute('fos_user_security_login', [], 301);
     }
 }
diff --git a/src/Wallabag/UserBundle/Controller/SecurityController.php b/src/Wallabag/UserBundle/Controller/SecurityController.php
index 1e752b6d..83fa0b20 100644
--- a/src/Wallabag/UserBundle/Controller/SecurityController.php
+++ b/src/Wallabag/UserBundle/Controller/SecurityController.php
@@ -14,7 +14,7 @@ class SecurityController extends FOSSecurityController
         return $this->render('FOSUserBundle:Security:login.html.twig',
             array_merge(
                 $data,
-                array('registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled'))
+                ['registration_enabled' => $this->container->getParameter('wallabag_user.registration_enabled')]
             )
         );
     }
-- 
cgit v1.2.3