Merge pull request #1644 from wallabag/v2-enable-confirmation-parameter

Fix #1622: parameter for FosUser confirmation

6 files changed, 14 insertions, 2 deletions

diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index b5385dc3..6d86eab6 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -9,7 +9,7 @@ export_json: Enable JSON export
 export_txt: Enable TXT export
 export_xml: Enable XML export
 pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
-shaarli_url: URL de Shaarli, if the service is enabled
+shaarli_url: Shaarli URL, if the service is enabled
 share_diaspora: Enable share to Diaspora
 share_mail: Enable share by email
 share_shaarli: Enable share to Shaarli
diff --git a/app/config/config.yml b/app/config/config.yml
index dc6bccee..7dac4d3b 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -168,7 +168,7 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: true
+            enabled: %fosuser_confirmation%
     from_email:
         address:        %from_email%
         sender_name:    wallabag
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 79654e9e..7c7413fb 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -41,4 +41,7 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
+    # fosuser stuff
+    fosuser_confirmation: true
+
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index dceb5dea..1951f021 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -31,4 +31,7 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
+    # fosuser stuff
+    fosuser_confirmation: true
+
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index e07db610..36ad6cde 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -31,4 +31,7 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
+    # fosuser stuff
+    fosuser_confirmation: true
+
     from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 01589d28..6564014a 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -31,4 +31,7 @@ parameters:
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
+    # fosuser stuff
+    fosuser_confirmation: true
+
     from_email: no-reply@wallabag.org