From a8c19ffe2c3be88196c93c2cebe91823cfb93932 Mon Sep 17 00:00:00 2001 From: IceToast Date: Fri, 14 Jan 2022 21:17:36 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20Added=20ReCaptcha=20to=20Se?= =?UTF-8?q?ttings=20&=20Added=20option=20to=20dis/enable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Classes/Settings/System.php | 25 ++++++++----- database/seeders/Seeds/SettingsSeeder.php | 10 ++++- .../views/admin/settings/tabs/misc.blade.php | 37 +++++++++++++++++++ 3 files changed, 60 insertions(+), 12 deletions(-) diff --git a/app/Classes/Settings/System.php b/app/Classes/Settings/System.php index 0a9c3672..c458ebad 100644 --- a/app/Classes/Settings/System.php +++ b/app/Classes/Settings/System.php @@ -5,7 +5,6 @@ namespace App\Classes\Settings; use App\Models\Settings; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Facades\Config; class System { @@ -20,17 +19,23 @@ class System public function updateSettings(Request $request) { - $request->validate([ - 'icon' => 'nullable|max:10000|mimes:jpg,png,jpeg', - 'favicon' => 'nullable|max:10000|mimes:ico', - ]); - - $values = [ - //SETTINGS::VALUE => REQUEST-VALUE (coming from the html-form) + "SETTINGS::SYSTEM:REGISTER_IP_CHECK" => "register-ip-check", + "SETTINGS::SYSTEM:SERVER_CREATE_CHARGE_FIRST_HOUR" => "server-create-charge-first-hour", + "SETTINGS::SYSTEM:CREDITS_DISPLAY_NAME" => "credits-display-name", + "SETTINGS::SERVER:ALLOCATION_LIMIT" => "allocation-limit", + "SETTINGS::USER:FORCE_DISCORD_VERIFICATION" => "force-discord-verification", + "SETTINGS::USER:FORCE_EMAIL_VERIFICATION" => "force-email-verification", + "SETTINGS::USER:INITIAL_CREDITS" => "initial-credits", + "SETTINGS::USER:INITIAL_SERVER_LIMIT" => "initial-server-limit", + "SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_DISCORD" => "credits-reward-amount-discord", + "SETTINGS::USER:CREDITS_REWARD_AFTER_VERIFY_EMAIL" => "credits-reward-amount-email", + "SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_DISCORD" => "server-limit-discord", + "SETTINGS::USER:SERVER_LIMIT_REWARD_AFTER_VERIFY_EMAIL" => "server-limit-email", "SETTINGS::MISC:PHPMYADMIN:URL" => "phpmyadmin-url", - - + "SETTINGS::RECAPTCHA:SITE_KEY" => "recaptcha-site-key", + "SETTINGS::RECAPTCHA:SECRET_KEY" => "recaptcha-secret-key", + "SETTINGS::RECAPTCHA:ENABLED" => "recaptcha-enabled", ]; diff --git a/database/seeders/Seeds/SettingsSeeder.php b/database/seeders/Seeds/SettingsSeeder.php index c7010de2..4b3fc001 100644 --- a/database/seeders/Seeds/SettingsSeeder.php +++ b/database/seeders/Seeds/SettingsSeeder.php @@ -380,7 +380,7 @@ class SettingsSeeder extends Seeder ]); Settings::firstOrCreate([ - 'key' => 'SETTINGS::SYSTEM:RECAPTCHA_SITE_KEY', + 'key' => 'SETTINGS::RECAPTCHA:SITE_KEY', ], [ 'value' => '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI', 'type' => 'string', @@ -388,11 +388,17 @@ class SettingsSeeder extends Seeder ]); Settings::firstOrCreate([ - 'key' => 'SETTINGS::SYSTEM:RECAPTCHA_SECRET_KEY', + 'key' => 'SETTINGS::RECAPTCHA:SECRET_KEY', ], [ 'value' => '6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe', 'type' => 'string', 'description' => 'Google Recaptcha API Credentials - https://www.google.com/recaptcha/admin - reCaptcha V2 (not v3)' ]); + Settings::firstOrCreate([ + 'key' => 'SETTINGS::RECAPTCHA:ENABLED', + ], [ + 'value' => 'true', + 'type' => 'boolean', + ]); } } diff --git a/resources/views/admin/settings/tabs/misc.blade.php b/resources/views/admin/settings/tabs/misc.blade.php index f0d65a6c..74ba7aee 100644 --- a/resources/views/admin/settings/tabs/misc.blade.php +++ b/resources/views/admin/settings/tabs/misc.blade.php @@ -68,6 +68,43 @@ +
+
+
+

ReCaptcha

+
+
+ +
+
+
+ + +
+
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+