From cee656fd5cc9d51eebd53a4629bb74f002461f97 Mon Sep 17 00:00:00 2001
From: CodeHat <dev@codehat.de>
Date: Thu, 8 Mar 2018 16:21:55 +0100
Subject: [PATCH] Feature/PTDL-1030 (#1033)

* Swap reCAPTCHA secret key position with website key
---
 CHANGELOG.md                                         |  1 +
 .../pterodactyl/admin/settings/advanced.blade.php    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac930b8c..80160f95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Changed
 * Panel now throws proper 504: Gateway Timeout errors on server listing when daemon is offline.
 * Sessions handled through redis now use a seperate database (default `1`) to store session database to avoid logging users out when flushing the cache.
+* reCAPTCHA's secret key position swapped with website key in advanced panel settings to be consistent with Google's reCAPTCHA dashboard.
 
 ## v0.7.5 (Derelict Dermodactylus)
 ### Fixed
diff --git a/resources/themes/pterodactyl/admin/settings/advanced.blade.php b/resources/themes/pterodactyl/admin/settings/advanced.blade.php
index 5a7b4d72..7a1d616c 100644
--- a/resources/themes/pterodactyl/admin/settings/advanced.blade.php
+++ b/resources/themes/pterodactyl/admin/settings/advanced.blade.php
@@ -34,6 +34,12 @@
                                     <p class="text-muted small">If enabled, login forms and password reset forms will do a silent captcha check and display a visible captcha if needed.</p>
                                 </div>
                             </div>
+                            <div class="form-group col-md-4">
+                                <label class="control-label">Site Key</label>
+                                <div>
+                                    <input type="text" required class="form-control" name="recaptcha:website_key" value="{{ old('recaptcha:website_key', config('recaptcha.website_key')) }}">
+                                </div>
+                            </div>
                             <div class="form-group col-md-4">
                                 <label class="control-label">Secret Key</label>
                                 <div>
@@ -41,12 +47,6 @@
                                     <p class="text-muted small">Used for communication between your site and Google. Be sure to keep it a secret.</p>
                                 </div>
                             </div>
-                            <div class="form-group col-md-4">
-                                <label class="control-label">Website Key</label>
-                                <div>
-                                    <input type="text" required class="form-control" name="recaptcha:website_key" value="{{ old('recaptcha:website_key', config('recaptcha.website_key')) }}">
-                                </div>
-                            </div>
                         </div>
                         @if($showRecaptchaWarning)
                             <div class="row">