mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-22 01:38:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

(Update) Refactor General and Staff Controllers

Browse Source 
- Remove all facades use besides mail
- Use Dependency Injection for Illuminate\Http\Request
- use helpers for auth, cache, validator, and more to rid of facades use
- use $request->input() over $request->get()
- use $request->isMethod('POST') over $request->getMethod('POST')
- general cleanup
This commit is contained in:
HDVinnie
2018-03-15 12:32:40 -04:00
parent eabf4a68ca
commit 2da7207d2b
51 changed files with 631 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Staff/UserController.php
+40 -41
View File
@@ -13,9 +13,7 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use App\Torrent;
use App\User;
@@ -40,11 +38,11 @@ class UserController extends Controller
*/
public function members()
{
$users = User::orderBy('created_at', 'DESC')->paginate(20);
$uploaders = User::where('group_id', '=', 7)->orderBy('created_at', 'DESC')->paginate(20);
$mods = User::where('group_id', '=', 6)->orderBy('created_at', 'DESC')->paginate(20);
$admins = User::where('group_id', '=', 4)->orderBy('created_at', 'DESC')->paginate(20);
$coders = User::where('group_id', '=', 10)->orderBy('created_at', 'DESC')->paginate(20);
$users = User::orderBy('created_at', 'DESC')->paginate(25);
$uploaders = User::where('group_id', '=', 7)->orderBy('created_at', 'DESC')->paginate(25);
$mods = User::where('group_id', '=', 6)->orderBy('created_at', 'DESC')->paginate(25);
$admins = User::where('group_id', '=', 4)->orderBy('created_at', 'DESC')->paginate(25);
$coders = User::where('group_id', '=', 10)->orderBy('created_at', 'DESC')->paginate(25);
return view('Staff.user.user_search', ['users' => $users, 'uploaders' => $uploaders, 'mods' => $mods, 'admins' => $admins, 'coders' => $coders]);
}
@@ -54,13 +52,14 @@ class UserController extends Controller
* @access public
*
*/
public function userSearch()
public function userSearch(Request $request)
{
$search = Request::get('search');
$search = $request->input('search');
$users = User::where([
['username', 'like', '%' . Request::get('username') . '%'],
['username', 'like', '%' . $request->input('username') . '%'],
])->paginate(25);
$users->setPath('?username=' . Request::get('username'));
$users->setPath('?username=' . $request->input('username'));
return view('Staff.user.user_results')->with('users', $users);
}
@@ -74,7 +73,7 @@ class UserController extends Controller
{
$user = User::findOrFail($id);
$groups = Group::all();
$notes = Note::where('user_id', '=', $id)->orderBy('created_at', 'desc')->paginate(20);
$notes = Note::where('user_id', '=', $id)->orderBy('created_at', 'desc')->paginate(25);
return view('Staff.user.user_edit', ['user' => $user, 'groups' => $groups, 'notes' => $notes]);
}
@@ -84,22 +83,22 @@ class UserController extends Controller
* @access public
* @return view user.profile
*/
public function userEdit($username, $id)
public function userEdit(Request $request, $username, $id)
{
$user = User::findOrFail($id);
$staff = Auth::user();
$staff = auth()->user();
$groups = Group::all();
if (Request::isMethod('post')) {
$user->username = Request::get('username');
$user->email = Request::get('email');
$user->uploaded = Request::get('uploaded');
$user->downloaded = Request::get('downloaded');
$user->about = Request::get('about');
$user->group_id = (int)Request::get('group_id');
if ($request->isMethod('POST')) {
$user->username = $request->input('username');
$user->email = $request->input('email');
$user->uploaded = $request->input('uploaded');
$user->downloaded = $request->input('downloaded');
$user->about = $request->input('about');
$user->group_id = (int)$request->input('group_id');
$user->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has edited " . $user->username . " account.");
\LogActivity::addToLog("Staff Member {$staff->username} has edited {$user->username} account.");
return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Was Updated Successfully!', 'Yay!', ['options']));
} else {
@@ -113,21 +112,21 @@ class UserController extends Controller
* @access public
* @return view user.profile
*/
public function userPermissions($username, $id)
public function userPermissions(Request $request, $username, $id)
{
$user = User::findOrFail($id);
$staff = Auth::user();
if (Request::isMethod('post')) {
$user->can_upload = Request::get('can_upload');
$user->can_download = Request::get('can_download');
$user->can_comment = Request::get('can_comment');
$user->can_invite = Request::get('can_invite');
$user->can_request = Request::get('can_request');
$user->can_chat = Request::get('can_chat');
$staff = auth()->user();
if ($request->isMethod('POST')) {
$user->can_upload = $request->input('can_upload');
$user->can_download = $request->input('can_download');
$user->can_comment = $request->input('can_comment');
$user->can_invite = $request->input('can_invite');
$user->can_request = $request->input('can_request');
$user->can_chat = $request->input('can_chat');
$user->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has edited " . $user->username . " account permissions.");
\LogActivity::addToLog("Staff Member {$staff->username} has edited {$user->username} account permissions.");
return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Permissions Succesfully Edited', 'Yay!', ['options']));
} else {
@@ -141,17 +140,17 @@ class UserController extends Controller
* @access protected
*
*/
protected function userPassword($username, $id)
protected function userPassword(Request $request, $username, $id)
{
$user = User::findOrFail($id);
$staff = Auth::user();
if (Request::isMethod('post')) {
$new_password = Request::get('new_password');
$staff = auth()->user();
if ($request->isMethod('POST')) {
$new_password = $request->input('new_password');
$user->password = Hash::make($new_password);
$user->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has changed " . $user->username . " password.");
\LogActivity::addToLog("Staff Member {$staff->username} has changed {$user->username} password.");
return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Account Password Was Updated Successfully!', 'Yay!', ['options']));
} else {
@@ -169,8 +168,8 @@ class UserController extends Controller
protected function userDelete($username, $id)
{
$user = User::findOrFail($id);
$staff = Auth::user();
if ($user->group->is_modo || Auth::user()->id == $user->id) {
$staff = auth()->user();
if ($user->group->is_modo || auth()->user()->id == $user->id) {
return redirect()->route('home')->with(Toastr::error('You Cannot Delete Yourself Or Other Staff', 'Whoops!', ['options']));
} else {
// Removes UserID from Torrents if any and replaces with System UserID (0)
@@ -230,7 +229,7 @@ class UserController extends Controller
}
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has deleted " . $user->username . " account.");
\LogActivity::addToLog("Staff Member {$staff->username} has deleted {$user->username} account.");
if ($user->delete()) {
return redirect('staff_dashboard')->with(Toastr::success('Account Has Been Removed', 'Yay!', ['options']));