starred/newznab-tmux-NNTmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-08-29 03:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invite related code

Browse Source
This commit is contained in:
DariusIII
2019-08-05 22:50:35 +00:00
parent c286a1ba21
commit 02b1c15d5a
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Auth/RegisterController.php
+11 -7
View File
@@ -75,6 +75,7 @@ class RegisterController extends Controller
/**
* @param \Illuminate\Http\Request $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void
* @throws \Illuminate\Validation\ValidationException
*/
public function register(Request $request)
@@ -82,6 +83,11 @@ class RegisterController extends Controller
$error = $userName = $password = $confirmPassword = $email = $inviteCode = $inviteCodeQuery = '';
$showRegister = 1;
if ($request->has('invitecode')) {
$inviteCode = $request->input('invitecode');
}
$validator = Validator::make($request->all(), [
'username' => ['required', 'string', 'min:5', 'max:255', 'unique:users'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users', 'indisposable'],
@@ -115,9 +121,6 @@ class RegisterController extends Controller
$password = $request->input('password');
$confirmPassword = $request->input('password_confirmation');
$email = $request->input('email');
if ($request->has('invitecode')) {
$inviteCode = $request->input('invitecode');
}
// Get the default user role.
$userDefault = Role::query()->where('isdefault', '=', 1)->first();
@@ -134,6 +137,7 @@ class RegisterController extends Controller
break;
}
}
if (! empty($error)) {
return $this->showRegistrationForm($error);
}
@@ -154,7 +158,6 @@ class RegisterController extends Controller
break;
case 'view': {
$inviteCode = $request->input('invitecode') ?? null;
if ($inviteCode !== null) {
// See if it is a valid invite.
$invite = Invitation::getInvite($inviteCode);
@@ -181,20 +184,21 @@ class RegisterController extends Controller
]
);
return $this->showRegistrationForm($error);
return $this->showRegistrationForm($error, $inviteCode);
}
/**
* @param string $error
* @param string $inviteCode
*/
public function showRegistrationForm($error = '')
public function showRegistrationForm($error = '', $inviteCode = '')
{
$showRegister = 1;
if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_CLOSED) {
$error = 'Registrations are currently disabled.';
$showRegister = 0;
}
if ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE) {
if (empty($inviteCode) && ((int) Settings::settingValue('..registerstatus') === Settings::REGISTER_STATUS_INVITE)) {
$error = 'Registrations are currently invite only.';
$showRegister = 0;
}