Development (#799)

app/Http/Controllers/TicketsController.php

@@ -39,6 +39,7 @@ class TicketsController extends Controller
                 'ticketcategory' => 'required',
                 'priority' => 'required',
                 'message' => 'required',
+                'g-recaptcha-response' => ['required', 'recaptcha'],
             ]
         );
         $ticket = new Ticket(

database/settings/2023_02_01_182158_create_website_settings.php

@@ -14,10 +14,10 @@ class CreateWebsiteSettings extends SettingsMigration
         $this->migrator->add(
             'website.motd_message',
             $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:MOTD_MESSAGE") :
-                '<h1 style="text-align: center;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://ctrlpanel.gg/img/controlpanel.png" alt="" width="200" height="200"><span style="font-size: 36pt;">CtrlPanel.gg</span></h1>
-            <p><span style="font-size: 18pt;">Thank you for using our Software</span></p>
-            <p><span style="font-size: 18pt;">If you have any questions, make sure to join our <a href="https://discord.com/invite/4Y6HjD2uyU" target="_blank" rel="noopener">Discord</a></span></p>
-            <p><span style="font-size: 10pt;">(you can change this message in the <a href="admin/settings#system">Settings</a> )</span></p>'
+                '<h1 style="text-align: center;"><img style="display: block; margin-left: auto; margin-right: auto;" src="https://ctrlpanel.gg/img/controlpanel.png" alt="" width="200" height="200"><span style="font-size: 36pt;">Controlpanel.gg</span></h1>
+ <p><span style="font-size: 18pt;">Thank you for using our Software</span></p>
+ <p><span style="font-size: 18pt;">If you have any questions, make sure to join our <a href="https://discord.com/invite/4Y6HjD2uyU" target="_blank" rel="noopener">Discord</a></span></p>
+ <p><span style="font-size: 10pt;">(you can change this message in the <a href="admin/settings#system">Settings</a> )</span></p>'
         );
         $this->migrator->add('website.show_imprint', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SHOW_IMPRINT") : false);
         $this->migrator->add('website.show_privacy', $table_exists ? $this->getOldValue("SETTINGS::SYSTEM:SHOW_PRIVACY") : false);

public/install/index.php

@@ -327,7 +327,7 @@ function cardStart($title, $subtitle = null)
                             <div class="flex flex-col mb-3">
 
                                 <label for="url">Pterodactyl URL</label>
-                                <input id="url" name="url" type="text" required value="https://ptero.example.com" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
+                                <input id="url" name="url" type="text" required placeholder="https://ptero.example.com" class="px-2 py-1 bg-[#1D2125] border-2 focus:border-sky-500 box-border rounded-md border-transparent outline-none">
                             </div>
                         </div>
                         <div class="form-group">

themes/default/views/admin/settings/index.blade.php

@@ -159,6 +159,28 @@
                                                     </div>
                                                 </div>
                                             @endforeach
+                                            <div class="row">
+                                                <div class="col-4 d-flex align-items-center">
+                                                    <label for="recaptcha_preview">{{__("ReCAPTCHA Preview")}}</label>
+                                                </div>
+
+                                                <div class="col-8">
+
+                                                        <div class="w-100">
+                                                <div class="input-group mb-3">
+                                                    {!! htmlScriptTagJsApi() !!}
+                                                    {!! htmlFormSnippet() !!}
+                                                    @error('g-recaptcha-response')
+                                                    <span class="text-danger" role="alert">
+                                                                                <small><strong>{{ $message }}</strong></small>
+                                                                                </span>
+                                                    @enderror
+                                                </div>
+                                                        </div>
+                                                </div>
+                                            </div>
+
+
                                             <div class="row">
                                                 <div class="col-12 d-flex align-items-center justify-content-end">
                                                     <button type="submit"

themes/default/views/ticket/create.blade.php

@@ -90,6 +90,17 @@
                                     </span>
                                     @endif
                                 </div>
+                                @if (app(App\Settings\GeneralSettings::class)->recaptcha_enabled)
+                                    <div class="input-group mb-3">
+                                        {!! htmlScriptTagJsApi() !!}
+                                        {!! htmlFormSnippet() !!}
+                                        @error('g-recaptcha-response')
+                                        <span class="text-danger" role="alert">
+                                            <small><strong>{{ $message }}</strong></small>
+                                        </span>
+                                        @enderror
+                                    </div>
+                                @endif
                             </div>
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary ticket-once">