Skip to content

Commit

Permalink
Add missed files
Browse files Browse the repository at this point in the history
  • Loading branch information
DariusIII committed Aug 6, 2019
1 parent 8f78472 commit 909599a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
13 changes: 5 additions & 8 deletions app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
use App\Models\User;
use App\Models\Settings;
use App\Models\Invitation;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use Blacklight\utility\Utility;
use Illuminate\Validation\ValidationException;
use Junaidnasir\Larainvite\Facades\Invite;
use Illuminate\Routing\Redirector;
use Spatie\Permission\Models\Role;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Facades\Validator;
use Junaidnasir\Larainvite\Facades\Invite;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Validation\ValidationException;
use Jrean\UserVerification\Traits\VerifiesUsers;

class RegisterController extends Controller
Expand Down Expand Up @@ -114,7 +114,6 @@ public function register(Request $request)
return $this->showRegistrationForm($request, $error, $showRegister);
}*/


$action = $request->input('action') ?? 'view';

switch ($action) {
Expand All @@ -131,8 +130,7 @@ public function register(Request $request)
return $this->showRegistrationForm($request, $error);
}

if( Invite::isAllowed($inviteCode,$email) || Settings::settingValue('..registerstatus') !== Settings::REGISTER_STATUS_INVITE ){

if (Invite::isAllowed($inviteCode, $email) || Settings::settingValue('..registerstatus') !== Settings::REGISTER_STATUS_INVITE) {
$user = $this->create(
[
'username' => $userName,
Expand All @@ -147,7 +145,6 @@ public function register(Request $request)
Invite::consume($inviteCode);

return $this->registered($request, $user) ?: redirect($this->redirectPath());

}
break;
case 'view': {
Expand Down
4 changes: 2 additions & 2 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
use Illuminate\Http\Request;
use App\Jobs\SendInviteEmail;
use Illuminate\Support\Carbon;
use Junaidnasir\Larainvite\Facades\Invite;
use Junaidnasir\Larainvite\InviteTrait;
use Spatie\Permission\Models\Role;
use Illuminate\Support\Facades\Hash;
use App\Jobs\SendAccountExpiredEmail;
use Spatie\Permission\Traits\HasRoles;
use Junaidnasir\Larainvite\InviteTrait;
use App\Jobs\SendAccountWillExpireEmail;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Password;
use Illuminate\Support\Facades\Validator;
use Junaidnasir\Larainvite\Facades\Invite;
use Jrean\UserVerification\Traits\UserVerification;
use Illuminate\Foundation\Auth\User as Authenticatable;

Expand Down
3 changes: 2 additions & 1 deletion config/larainvite.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

return [

/*
Expand All @@ -24,5 +25,5 @@
| Invitation Model
|--------------------------------------------------------------------------
*/
'InvitationModel' => 'Junaidnasir\Larainvite\Models\LaraInviteModel'
'InvitationModel' => 'Junaidnasir\Larainvite\Models\LaraInviteModel',
];

0 comments on commit 909599a

Please sign in to comment.