From 15aa9429a9e5a495cafdc2e2ddd9e13ad1aef760 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Wed, 7 Aug 2019 14:39:57 +0200
Subject: [PATCH] Fix invite code usage issue

---
 app/Http/Controllers/Auth/RegisterController.php | 9 +++++++++
 resources/views/themes/Gentele/register.tpl      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index bac0ddb5d..7939637eb 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -43,6 +43,11 @@ class RegisterController extends Controller
      */
     protected $redirectTo = '/';
 
+    /**
+     * @var string
+     */
+    private $inviteCodeQuery;
+
     /**
      * Create a new controller instance.
      *
@@ -87,6 +92,7 @@ class RegisterController extends Controller
 
         if ($request->has('invitecode')) {
             $inviteCode = $request->input('invitecode');
+            $this->inviteCodeQuery = '&invitecode='.$inviteCode;
         }
 
         $validator = Validator::make($request->all(), [
@@ -158,6 +164,7 @@ class RegisterController extends Controller
                 'password_confirmation'   => Utility::htmlfmt($confirmPassword),
                 'email'             => Utility::htmlfmt($email),
                 'invitecode'        => Utility::htmlfmt($inviteCode),
+                'invite_code_query' => Utility::htmlfmt($this->inviteCodeQuery),
                 'showregister'      => $showRegister,
             ]
         );
@@ -175,6 +182,7 @@ class RegisterController extends Controller
         $inviteCode = '';
         if ($request->has('invitecode')) {
             $inviteCode = $request->input('invitecode');
+            $this->inviteCodeQuery = '&invitecode='.$inviteCode;
         }
 
         if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE) {
@@ -199,6 +207,7 @@ class RegisterController extends Controller
 
         app('smarty.view')->assign('showregister', $showRegister);
         app('smarty.view')->assign('error', $error);
+        app('smarty.view')->assign('invite_code_query', $this->inviteCodeQuery);
         $theme = Settings::settingValue('site.main.style');
 
         $nocaptcha = env('NOCAPTCHA_ENABLED');
diff --git a/resources/views/themes/Gentele/register.tpl b/resources/views/themes/Gentele/register.tpl
index 5bfb8badf..076c60355 100755
--- a/resources/views/themes/Gentele/register.tpl
+++ b/resources/views/themes/Gentele/register.tpl
@@ -15,7 +15,7 @@
 			</div>
 			<div class="register-box-body">
 				<p class="login-box-msg">Register a new membership</p>
-                {{Form::open(['url' => "register?action=submit"])}}
+                {{Form::open(['url' => "register?action=submit{$invite_code_query}"])}}
 					<div class="form-group has-feedback">
 						<input autocomplete="off" id="username" name="username" value="{$username}" type="text"
 							   class="form-control" placeholder="Username"/>