From e41c589225ffb0ae093f02e7d10baed7e7d661fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Wed, 5 Apr 2017 02:01:20 +0200
Subject: [PATCH] FEATURE: move recaptcha config into core application

---
 app/Providers/AppServiceProvider.php           |  1 +
 .../Providers/ContactFormServiceProvider.php   |  2 --
 .../Resources/lang/cs/admin/settings.php       |  5 -----
 .../Resources/lang/en/admin/settings.php       |  5 -----
 .../Resources/lang/sk/admin/settings.php       |  5 -----
 .../views/admin/settings/form.blade.php        | 13 -------------
 resources/lang/cs/admin/settings.php           |  4 ++++
 .../admin/settings/parts/recaptcha.blade.php   | 18 ++++++++++++++++++
 8 files changed, 23 insertions(+), 30 deletions(-)
 delete mode 100644 modules/ContactForm/Resources/lang/cs/admin/settings.php
 delete mode 100644 modules/ContactForm/Resources/lang/en/admin/settings.php
 delete mode 100644 modules/ContactForm/Resources/lang/sk/admin/settings.php
 delete mode 100644 modules/ContactForm/Resources/views/admin/settings/form.blade.php
 create mode 100644 resources/views/admin/settings/parts/recaptcha.blade.php

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index e25b2de4..8e8fa143 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -122,6 +122,7 @@ class AppServiceProvider extends ServiceProvider
         $registrator->register('basic', 'admin/settings.basic', 'admin.settings.parts.basic');
         $registrator->register('meta', 'admin/settings.meta', 'admin.settings.parts.meta');
         $registrator->register('social', 'admin/settings.socialSites', 'admin.settings.parts.social');
+        $registrator->register('recaptcha', 'admin/settings.recaptcha', 'admin.settings.parts.recaptcha');
     }
 
     /**
diff --git a/modules/ContactForm/Providers/ContactFormServiceProvider.php b/modules/ContactForm/Providers/ContactFormServiceProvider.php
index a04f0762..92df7029 100644
--- a/modules/ContactForm/Providers/ContactFormServiceProvider.php
+++ b/modules/ContactForm/Providers/ContactFormServiceProvider.php
@@ -28,8 +28,6 @@ class ContactFormServiceProvider extends ModuleServiceProvider
      */
     public function register()
     {
-        $registrator = $this->app->make('registerSettingsExtension');
-        $registrator->register('contactForm', 'contactform::module.name', 'contactform::admin.settings.form');
     }
 
     private function registerWidgets()
diff --git a/modules/ContactForm/Resources/lang/cs/admin/settings.php b/modules/ContactForm/Resources/lang/cs/admin/settings.php
deleted file mode 100644
index aee9fa69..00000000
--- a/modules/ContactForm/Resources/lang/cs/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
-"recaptchaSecret" => "Application secret kez pro reCaptcha",
-"recaptchaSiteKey" => "Site key pro reCaptcha",
-];
diff --git a/modules/ContactForm/Resources/lang/en/admin/settings.php b/modules/ContactForm/Resources/lang/en/admin/settings.php
deleted file mode 100644
index 7bd1d2f4..00000000
--- a/modules/ContactForm/Resources/lang/en/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
-    'recaptchaSiteKey' => 'reCAPTCHA site key',
-    'recaptchaSecret' => 'reCAPTCHA application secret key',
-];
\ No newline at end of file
diff --git a/modules/ContactForm/Resources/lang/sk/admin/settings.php b/modules/ContactForm/Resources/lang/sk/admin/settings.php
deleted file mode 100644
index fa9eddd4..00000000
--- a/modules/ContactForm/Resources/lang/sk/admin/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-return [
-    "recaptchaSecret" => "Application secret key pre reCaptcha",
-    "recaptchaSiteKey" => "Site key pre reCaptcha",
-];
diff --git a/modules/ContactForm/Resources/views/admin/settings/form.blade.php b/modules/ContactForm/Resources/views/admin/settings/form.blade.php
deleted file mode 100644
index a79ea856..00000000
--- a/modules/ContactForm/Resources/views/admin/settings/form.blade.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<label class="control-label">
-    @lang('contactform::admin/settings.recaptchaSiteKey')
-</label>
-
-    <input class="form-control" type="text" name="recaptchaSiteKey" value="{{old('recaptchaSiteKey', isset($settings->recaptchaSiteKey) ? $settings->recaptchaSiteKey['val'] : '')}}" />
-
-<label class="control-label">
-    @lang('contactform::admin/settings.recaptchaSecret')
-</label>
-
-    <input class="form-control" type="text" name="recaptchaSecret" value="{{old('recaptchaSecret', isset($settings->recaptchaSecret) ? $settings->recaptchaSecret['val'] : '')}}" />
-
-<em><a href="https://www.google.com/recaptcha/admin#list" target="_blank">reCAPTCHA</a></em>
\ No newline at end of file
diff --git a/resources/lang/cs/admin/settings.php b/resources/lang/cs/admin/settings.php
index 4e1ed5ab..dbd8b46d 100644
--- a/resources/lang/cs/admin/settings.php
+++ b/resources/lang/cs/admin/settings.php
@@ -21,4 +21,8 @@ return [
     ],
     "socialSites"         => "Sociální sítě",
     "successfullySaved"   => "Nastavení úspěšně změněno",
+    'recaptcha'           => 'reCaptcha',
+    "recaptchaSecret"     => "Application secret key",
+    "recaptchaSiteKey"    => "Site key",
+    'useInvisibleRecaptcha' => 'Neviditelná reCAPTCHA'
 ];
diff --git a/resources/views/admin/settings/parts/recaptcha.blade.php b/resources/views/admin/settings/parts/recaptcha.blade.php
new file mode 100644
index 00000000..95efc5ab
--- /dev/null
+++ b/resources/views/admin/settings/parts/recaptcha.blade.php
@@ -0,0 +1,18 @@
+<label class="control-label">
+    @lang('admin/settings.recaptchaSiteKey')
+</label>
+
+<input class="form-control" type="text" name="recaptchaSiteKey" value="{{old('recaptchaSiteKey', isset($settings->recaptchaSiteKey) ? $settings->recaptchaSiteKey['val'] : '')}}" />
+
+<label class="control-label">
+    @lang('admin/settings.recaptchaSecret')
+</label>
+
+<input class="form-control" type="text" name="recaptchaSecret" value="{{old('recaptchaSecret', isset($settings->recaptchaSecret) ? $settings->recaptchaSecret['val'] : '')}}" />
+
+<label>
+    <input class="checkbox" value="1"
+           @if(old('useInvisibleRecaptcha', setting('useInvisibleRecaptcha'))) checked @endif name="useInvisibleRecaptcha" type="checkbox">
+    <span>@lang('admin/settings.useInvisibleRecaptcha')</span>
+</label>
+