w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

Hotfix for Layout 2 regarding display of sfw variable and other minor improvements and or changes

Browse Source
This commit is contained in:
noxy
2019-10-08 21:39:42 +00:00
parent 4682e65af9
commit 7ffef2472b
13 changed files with 111 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/UserController.php
View File

@@ -9,6 +9,8 @@ use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Models\ModeratorLog;
use App\Models\Banner;
use Illuminate\Support\Facades\Input;
use Illuminate\Support\Facades\Validator;
use Symfony\Component\HttpFoundation\Response;
use Toddish\Verify\Helpers\Verify;
@@ -131,8 +133,8 @@ class UserController extends Controller
$validator = \Validator::make($request->all(), [
'username' => 'required|unique:users|min:3|max:25|alpha_num',
'email' => 'required|email|unique:users|confirmed',
'password' => 'required|min:6|confirmed',
'g-recaptcha-response' => 'required|recaptcha'
'password' => 'required|min:6|confirmed'
//'g-recaptcha-response' => 'required|recaptcha'
]);
if($validator->fails()) {
@@ -140,7 +142,7 @@ class UserController extends Controller
->withInput($request->except(['password', 'password_confirmation']));
}
//$activation_token = str_random(8) . md5($request->get('email')) . str_random(10);
$activation_token = str_random(8) . md5($request->get('email')) . str_random(10);
$user = new User();
$user->username = $request->get('username');
@@ -148,7 +150,7 @@ class UserController extends Controller
$user->password = $request->get('password');
$user->activation_token = $activation_token;
$user->disabled = 0;
$user->verified = 1;
$user->verified = 0;
$user->categories = [];
if($user->save()) {
$data = [
@@ -162,7 +164,7 @@ class UserController extends Controller
$message->to($user->email, $user->username)->subject('Welcome to w0bm. Activate your account');
});
return redirect('/')->with('info', 'Congratulations! You can now login!');
return redirect('/login')->with('info', 'Congratulations! Your Account was successful created, please verify your email');
} else {
return redirect()->back()->with('error', 'Account could not be created')->withInput($request->except(['password', 'password_confirmation']));
}
@@ -413,5 +415,4 @@ class UserController extends Controller
//return Response::create("success mothafukka, you can now go back and fap your dick", 200);
return redirect()->back()->with('success', 'Jesus Scriptus is with you' );
}
}