mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-23 19:50:40 -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/ArticleController.php
+23 -26
View File
@@ -12,12 +12,9 @@
namespace App\Http\Controllers\Staff;
use App\Article;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use App\Article;
use \Toastr;
class ArticleController extends Controller
@@ -41,22 +38,22 @@ class ArticleController extends Controller
* @access public
* @return Staff.article.add
*/
public function add()
public function add(Request $request)
{
if (Request::isMethod('post')) {
$input = Request::all();
if ($request->isMethod('POST')) {
$input = $request->all();
$post = new Article();
$post->title = $input['title'];
$post->slug = str_slug($post->title);
$post->content = $input['content'];
$post->user_id = Auth::user()->id;
$post->user_id = auth()->user()->id;
// Verify that an image was upload
if (Request::hasFile('image') && Request::file('image')->getError() == 0) {
if ($request->hasFile('image') && $request->file('image')->getError() == 0) {
// The file is an image
if (in_array(Request::file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) {
if (in_array($request->file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) {
// Move and add the name to the object that will be saved
$post->image = 'article-' . uniqid() . '.' . Request::file('image')->getClientOriginalExtension();
Request::file('image')->move(getcwd() . '/files/img/', $post->image);
$post->image = 'article-' . uniqid() . '.' . $request->file('image')->getClientOriginalExtension();
$request->file('image')->move(getcwd() . '/files/img/', $post->image);
} else {
// Image null or wrong format
$post->image = null;
@@ -66,15 +63,15 @@ class ArticleController extends Controller
$post->image = null;
}
$v = Validator::make($post->toArray(), $post->rules);
$v = validator($post->toArray(), $post->rules);
if ($v->fails()) {
// Delete the image because the validation failed
if (file_exists(Request::file('image')->move(getcwd() . '/files/img/' . $post->image))) {
unlink(Request::file('image')->move(getcwd() . '/files/img/' . $post->image));
if (file_exists($request->file('image')->move(getcwd() . '/files/img/' . $post->image))) {
unlink($request->file('image')->move(getcwd() . '/files/img/' . $post->image));
}
return redirect()->route('staff_article_index')->with(Toastr::error('Your article has failed to published!', 'Whoops!', ['options']));
} else {
Auth::user()->articles()->save($post);
auth()->user()->articles()->save($post);
return redirect()->route('staff_article_index')->with(Toastr::success('Your article has successfully published!', 'Yay!', ['options']));
}
}
@@ -89,23 +86,23 @@ class ArticleController extends Controller
* @param $id Id of article
* @return Staff.article.edit
*/
public function edit($slug, $id)
public function edit(Request $request, $slug, $id)
{
$post = Article::findOrFail($id);
if (Request::isMethod('post')) {
$input = Request::all();
if ($request->isMethod('POST')) {
$input = $request->all();
$post->title = $input['title'];
$post->slug = str_slug($post->title);
$post->content = $input['content'];
$post->user_id = Auth::user()->id;
$post->user_id = auth()->user()->id;
// Verify that an image was upload
if (Request::hasFile('image') && Request::file('image')->getError() == 0) {
if ($request->hasFile('image') && $request->file('image')->getError() == 0) {
// The file is an image
if (in_array(Request::file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) {
if (in_array($request->file('image')->getClientOriginalExtension(), ['jpg', 'jpeg', 'bmp', 'png', 'tiff'])) {
// Move and add the name to the object that will be saved
$post->image = 'article-' . uniqid() . '.' . Request::file('image')->getClientOriginalExtension();
Request::file('image')->move(getcwd() . '/files/img/', $post->image);
$post->image = 'article-' . uniqid() . '.' . $request->file('image')->getClientOriginalExtension();
$request->file('image')->move(getcwd() . '/files/img/', $post->image);
} else {
// Image null or wrong format
$post->image = null;
@@ -115,7 +112,7 @@ class ArticleController extends Controller
$post->image = null;
}
$v = Validator::make($post->toArray(), $post->rules);
$v = validator($post->toArray(), $post->rules);
if ($v->fails()) {
return redirect()->route('staff_article_index')->with(Toastr::error('Your article changes have failed to publish!', 'Whoops!', ['options']));
} else {
app/Http/Controllers/Staff/BackupController.php
+7 -9
View File
@@ -12,11 +12,9 @@
namespace App\Http\Controllers\Staff;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Routing\Controller;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Storage;
use League\Flysystem\Adapter\Local;
use Exception;
@@ -68,7 +66,7 @@ class BackupController extends Controller
$output = Artisan::output();
// log the results
Log::info("A new backup was initiated from the staff dashboard ".$output);
info("A new backup was initiated from the staff dashboard ".$output);
// return the results as a response to the ajax call
echo $output;
} catch (Exception $e) {
@@ -81,10 +79,10 @@ class BackupController extends Controller
/**
* Downloads a backup zip file.
*/
public function download()
public function download(Request $request)
{
$disk = Storage::disk(Request::input('disk'));
$file_name = Request::input('file_name');
$disk = Storage::disk($request->input('disk'));
$file_name = $request->input('file_name');
$adapter = $disk->getDriver()->getAdapter();
if ($adapter instanceof Local) {
@@ -103,9 +101,9 @@ class BackupController extends Controller
/**
* Deletes a backup file.
*/
public function delete($file_name)
public function delete(Request $request, $file_name)
{
$disk = Storage::disk(Request::input('disk'));
$disk = Storage::disk($request->input('disk'));
if ($disk->exists($file_name)) {
$disk->delete($file_name);
app/Http/Controllers/Staff/BanController.php
+14 -17
View File
@@ -13,10 +13,7 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Mail;
use App\Mail\BanUser;
use App\Mail\UnbanUser;
@@ -42,10 +39,10 @@ class BanController extends Controller
* @param $id
*
*/
public function ban($username, $id)
public function ban(Request $request, $username, $id)
{
$user = User::findOrFail($id);
if ($user->group->is_modo || Auth::user()->id == $user->id) {
if ($user->group->is_modo || auth()->user()->id == $user->id) {
return redirect()->route('home')->with(Toastr::error('You Cannot Ban Yourself Or Other Staff!', 'Whoops!', ['options']));
} else {
$user->group_id = 5;
@@ -57,8 +54,8 @@ class BanController extends Controller
$user->can_chat = 0;
$user->save();
$staff = Auth::user();
$v = Validator::make(Request::all(), [
$staff = auth()->user();
$v = validator($request->all(), [
'owned_by' => 'required',
'created_by' => 'required|numeric',
'ban_reason' => 'required',
@@ -67,11 +64,11 @@ class BanController extends Controller
$ban = new Ban();
$ban->owned_by = $user->id;
$ban->created_by = $staff->id;
$ban->ban_reason = Request::get('ban_reason');
$ban->ban_reason = $request->input('ban_reason');
$ban->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has banned member " . $user->username . ".");
\LogActivity::addToLog("Staff Member {$staff->username} has banned member {$user->username}.");
// Send Email
Mail::to($user->email)->send(new BanUser($user));
@@ -89,13 +86,13 @@ class BanController extends Controller
* @param $id
*
*/
public function unban($username, $id)
public function unban(Request $request, $username, $id)
{
$user = User::findOrFail($id);
if ($user->group->is_modo || Auth::user()->id == $user->id) {
if ($user->group->is_modo || auth()->user()->id == $user->id) {
return redirect()->route('home')->with(Toastr::error('You Cannot Unban Yourself Or Other Staff!', 'Whoops!', ['options']));
} else {
$user->group_id = Request::get('group_id');
$user->group_id = $request->input('group_id');
$user->can_upload = 1;
$user->can_download = 1;
$user->can_comment = 1;
@@ -104,8 +101,8 @@ class BanController extends Controller
$user->can_chat = 1;
$user->save();
$staff = Auth::user();
$v = Validator::make(Request::all(), [
$staff = auth()->user();
$v = validator($request->all(), [
'unban_reason' => 'required',
'removed_at' => 'required'
]);
@@ -113,12 +110,12 @@ class BanController extends Controller
$ban = new Ban();
$ban->owned_by = $user->id;
$ban->created_by = $staff->id;
$ban->unban_reason = Request::get('unban_reason');
$ban->unban_reason = $request->input('unban_reason');
$ban->removed_at = Carbon::now();
$ban->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has unbanned member " . $user->username . ".");
\LogActivity::addToLog("Staff Member {$staff->username} has unbanned member {$user->username}.");
// Send Email
Mail::to($user->email)->send(new UnbanUser($user));
app/Http/Controllers/Staff/BlockController.php
-31
View File
@@ -1,31 +0,0 @@
<?php
/**
* NOTICE OF LICENSE
*
* UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
* @author HDVinnie
*/
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
class BlockController extends Controller
{
/**
* Blocks Settings
*
*
* @access public
* @return Staff.blocks.index
*/
public function index()
{
return view('Staff.blocks.index');
}
}
app/Http/Controllers/Staff/BugController.php
-31
View File
@@ -1,31 +0,0 @@
<?php
/**
* NOTICE OF LICENSE
*
* UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
* @author HDVinnie
*/
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
class BugController extends Controller
{
/**
* Bug Report
*
*
* @access public
* @return Staff.bug.index
*/
public function index()
{
return view('Staff.bug.index');
}
}
app/Http/Controllers/Staff/CatalogController.php
+20 -21
View File
@@ -13,8 +13,7 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use App\User;
use App\Catalog;
use App\CatalogTorrent;
@@ -34,20 +33,20 @@ class CatalogController extends Controller
}
//Add New Catalog
public function postCatalog()
public function postCatalog(Request $request)
{
$v = Validator::make(Request::all(), [
$v = validator($request->all(), [
'catalog' => 'required|min:3|max:20|regex:/^[(a-zA-Z\-)]+$/u'
]);
$catalog = Catalog::where('name', '=', Request::get('catalog'))->first();
$catalog = Catalog::where('name', '=', $request->input('catalog'))->first();
if ($catalog) {
return redirect()->route('catalogs')->with(['fail' => 'Catalog ' . $catalog->name . ' is already in database']);
return redirect()->route('catalogs')->with(Toastr::error('Catalog ' . $catalog->name . ' is already in database', 'Whoops!', ['options']));
}
$catalog = new Catalog();
$catalog->name = Request::get('catalog');
$catalog->slug = str_slug(Request::get('catalog'));
$catalog->name = $request->input('catalog');
$catalog->slug = str_slug($request->input('catalog'));
$catalog->save();
return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully added', 'Yay!', ['options']));
return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $request->input('catalog') . ' has been successfully added', 'Yay!', ['options']));
}
//Delete Catalog
@@ -62,18 +61,18 @@ class CatalogController extends Controller
}
//Edit Catalog
public function editCatalog($catalog_id)
public function editCatalog(Request $request, $catalog_id)
{
$v = Validator::make(Request::all(), [
$v = validator($request->all(), [
'catalog' => 'required|min:3|max:20|regex:/^[(a-zA-Z\-)]+$/u'
]);
$catalog = Catalog::findOrFail($catalog_id);
if (!$catalog) {
return redirect()->route('getCatalog')->with(Toastr::error('Catalog ' . Request::get('catalog') . ' is not in our DB!', 'Whoops!', ['options']));
return redirect()->route('getCatalog')->with(Toastr::error('Catalog ' . $request->input('catalog') . ' is not in our DB!', 'Whoops!', ['options']));
}
$catalog->name = Request::get('catalog');
$catalog->name = $request->input('catalog');
$catalog->save();
return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . Request::get('catalog') . ' has been successfully edited', 'Yay!', ['options']));
return redirect()->route('getCatalog')->with(Toastr::success('Catalog ' . $request->input('catalog') . ' has been successfully edited', 'Yay!', ['options']));
}
/**
@@ -88,27 +87,27 @@ class CatalogController extends Controller
}
//Add New Catalog Torrent
public function postCatalogTorrent()
public function postCatalogTorrent(Request $request)
{
// Find the right catalog
$catalog = Catalog::findOrFail(Request::get('catalog_id'));
$v = Validator::make(Request::all(), [
$catalog = Catalog::findOrFail($request->input('catalog_id'));
$v = validator($request->all(), [
'imdb' => 'required|numeric',
'tvdb' => 'required|numeric',
'catalog_id' => 'required|numeric|exists:catalog_id'
]);
$torrent = CatalogTorrent::where('imdb', '=', Request::get('imdb'))->first();
$torrent = CatalogTorrent::where('imdb', '=', $request->input('imdb'))->first();
if ($torrent) {
return redirect()->route('getCatalogTorrent')->with(Toastr::error('IMDB# ' . $torrent->imdb . ' is already in database', 'Whoops!', ['options']));
}
$torrent = new CatalogTorrent();
$torrent->imdb = Request::get('imdb');
$torrent->catalog_id = Request::get('catalog_id');
$torrent->imdb = $request->input('imdb');
$torrent->catalog_id = $request->input('catalog_id');
$torrent->save();
// Count and save the torrent number in this catalog
$catalog->num_torrent = CatalogTorrent::where('catalog_id', '=', $catalog->id)->count();
$catalog->save();
return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . Request::get('imdb') . ' has been successfully added', 'Yay!', ['options']));
return redirect()->route('getCatalogTorrent')->with(Toastr::success('IMDB# ' . $request->input('imdb') . ' has been successfully added', 'Yay!', ['options']));
}
// Get Catalogs Records
app/Http/Controllers/Staff/CategoryController.php
+16 -17
View File
@@ -14,8 +14,7 @@ namespace App\Http\Controllers\Staff;
use App\Category;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use \Toastr;
class CategoryController extends Controller
@@ -38,18 +37,18 @@ class CategoryController extends Controller
*
*
*/
public function add()
public function add(Request $request)
{
if (Request::isMethod('post')) {
if ($request->isMethod('POST')) {
$category = new Category();
$category->name = Request::get('name');
$category->name = $request->input('name');
$category->slug = str_slug($category->name);
$category->position = Request::get('position');
$category->icon = Request::get('icon');
$category->meta = Request::get('meta');
$v = Validator::make($category->toArray(), $category->rules);
$category->position = $request->input('position');
$category->icon = $request->input('icon');
$category->meta = $request->input('meta');
$v = validator($category->toArray(), $category->rules);
if ($v->fails()) {
Toastr::error('Something Went Wrong!', 'Error', ['options']);
return redirect()->back()->with(Toastr::error('Something Went Wrong!', 'Error', ['options']));
} else {
$category->save();
return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Added', 'Yay!', ['options']));
@@ -63,17 +62,17 @@ class CategoryController extends Controller
*
*
*/
public function edit($slug, $id)
public function edit(Request $request, $slug, $id)
{
$category = Category::findOrFail($id);
if (Request::isMethod('post')) {
$category->name = Request::get('name');
if ($request->isMethod('POST')) {
$category->name = $request->input('name');
$category->slug = str_slug($category->name);
$category->icon = Request::get('icon');
$category->meta = Request::get('meta');
$v = Validator::make($category->toArray(), $category->rules);
$category->icon = $request->input('icon');
$category->meta = $request->input('meta');
$v = validator($category->toArray(), $category->rules);
if ($v->fails()) {
Toastr::error('Something Went Wrong!', 'Error', ['options']);
return redirect()->back()->with(Toastr::error('Something Went Wrong!', 'Error', ['options']));
} else {
$category->save();
return redirect()->route('staff_category_index')->with(Toastr::success('Category Sucessfully Modified', 'Yay!', ['options']));
app/Http/Controllers/Staff/FailedLoginController.php
+1 -1
View File
@@ -24,7 +24,7 @@ class FailedLoginController extends Controller
*/
public function getFailedAttemps()
{
$attempts = FailedLoginAttempt::orderBy('created_at', 'DESC')->paginate(50);
$attempts = FailedLoginAttempt::orderBy('created_at', 'DESC')->paginate(25);
return view('Staff.failedlogin.index', ['attempts' => $attempts]);
}
app/Http/Controllers/Staff/FlushController.php
-3
View File
@@ -13,9 +13,6 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use App\Peer;
use App\History;
use \Toastr;
app/Http/Controllers/Staff/ForumController.php
+41 -41
View File
@@ -12,17 +12,17 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\Forum;
use App\Group;
use App\Http\Controllers\Controller;
use App\Permission;
use Illuminate\Support\Facades\Request;
class ForumController extends Controller
{
/**
* Affiche la page d'index d'administration du forum
* Show Forums
*
*/
public function index()
@@ -33,24 +33,24 @@ class ForumController extends Controller
}
/**
* Ajoute une catégorie / un forum
* Add A Forum
*
*/
public function add()
public function add(Request $request)
{
$categories = Forum::where('parent_id', '=', 0)->get();
$groups = Group::all();
if (Request::isMethod('post')) {
$parentForum = Forum::findOrFail(Request::get('parent_id'));
if ($request->isMethod('POST')) {
$parentForum = Forum::findOrFail($request->input('parent_id'));
$forum = new Forum();
$forum->name = Request::get('title');
$forum->position = Request::get('position');
$forum->slug = str_slug(Request::get('title'));
$forum->description = Request::get('description');
$forum->parent_id = (Request::get('forum_type') == 'category') ? 0 : $parentForum->id;
$forum->name = $request->input('title');
$forum->position = $request->input('position');
$forum->slug = str_slug($request->input('title'));
$forum->description = $request->input('description');
$forum->parent_id = ($request->input('forum_type') == 'category') ? 0 : $parentForum->id;
$forum->save();
// Sauvegarde les permission<s></s>
// Permissions
foreach ($groups as $k => $group) {
$perm = Permission::whereRaw('forum_id = ? AND group_id = ?', [$forum->id, $group->id])->first();
if ($perm == null) {
@@ -58,13 +58,13 @@ class ForumController extends Controller
}
$perm->forum_id = $forum->id;
$perm->group_id = $group->id;
if (array_key_exists($group->id, Request::get('permissions'))) {
$perm->show_forum = (isset(Request::get('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset(Request::get('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset(Request::get('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset(Request::get('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->upload = (isset(Request::get('permissions')[$group->id]['upload'])) ? true : false;
$perm->download = (isset(Request::get('permissions')[$group->id]['download'])) ? true : false;
if (array_key_exists($group->id, $request->input('permissions'))) {
$perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->upload = (isset($request->input('permissions')[$group->id]['upload'])) ? true : false;
$perm->download = (isset($request->input('permissions')[$group->id]['download'])) ? true : false;
} else {
$perm->show_forum = false;
$perm->read_topic = false;
@@ -76,31 +76,31 @@ class ForumController extends Controller
$perm->save();
}
return redirect()->route('staff_forum_index');
return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been created successfully', 'Yay!', ['options']));
}
return view('Staff.forum.add', ['categories' => $categories, 'groups' => $groups]);
}
/**
* Edite le forum
* Edit A Forum
*
*
*/
public function edit($slug, $id)
public function edit(Request $request, $slug, $id)
{
$categories = Forum::where('parent_id', '=', 0)->get();
$groups = Group::all();
$forum = Forum::findOrFail($id);
if (Request::isMethod('post')) {
$forum->name = Request::get('title');
$forum->position = Request::get('position');
$forum->slug = str_slug(Request::get('title'));
$forum->description = Request::get('description');
//$forum->parent_id = (Request::get('forum_type') == 'category') ? 0 : Request::get('parent_id'); // Non changé depuis la création
$forum->parent_id = Request::get('parent_id');
if ($request->isMethod('POST')) {
$forum->name = $request->input('title');
$forum->position = $request->input('position');
$forum->slug = str_slug($request->input('title'));
$forum->description = $request->input('description');
$forum->parent_id = ($request->input('forum_type') == 'category') ? 0 : $request->input('parent_id');
$forum->parent_id = $request->input('parent_id');
$forum->save();
// Sauvegarde des permissions dans la DB
// Permissions
foreach ($groups as $k => $group) {
$perm = Permission::whereRaw('forum_id = ? AND group_id = ?', [$forum->id, $group->id])->first();
if ($perm == null) {
@@ -108,13 +108,13 @@ class ForumController extends Controller
}
$perm->forum_id = $forum->id;
$perm->group_id = $group->id;
if (array_key_exists($group->id, Request::get('permissions'))) {
$perm->show_forum = (isset(Request::get('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset(Request::get('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset(Request::get('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset(Request::get('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->upload = (isset(Request::get('permissions')[$group->id]['upload'])) ? true : false;
$perm->download = (isset(Request::get('permissions')[$group->id]['download'])) ? true : false;
if (array_key_exists($group->id, $request->input('permissions'))) {
$perm->show_forum = (isset($request->input('permissions')[$group->id]['show_forum'])) ? true : false;
$perm->read_topic = (isset($request->input('permissions')[$group->id]['read_topic'])) ? true : false;
$perm->reply_topic = (isset($request->input('permissions')[$group->id]['reply_topic'])) ? true : false;
$perm->start_topic = (isset($request->input('permissions')[$group->id]['start_topic'])) ? true : false;
$perm->upload = (isset($request->input('permissions')[$group->id]['upload'])) ? true : false;
$perm->download = (isset($request->input('permissions')[$group->id]['download'])) ? true : false;
} else {
$perm->show_forum = false;
$perm->read_topic = false;
@@ -126,13 +126,13 @@ class ForumController extends Controller
$perm->save();
}
return redirect()->route('staff_forum_index');
return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been edited successfully', 'Yay!', ['options']));
}
return view('Staff.forum.edit', ['categories' => $categories, 'groups' => $groups, 'forum' => $forum]);
}
/**
* Supprime un forum / une catégorie ainsi que les topics et sous-forums
* Delete A Forum
*
*
*/
@@ -183,6 +183,6 @@ class ForumController extends Controller
}
$forum->delete();
}
return redirect()->route('staff_forum_index');
return redirect()->route('staff_forum_index')->with(Toastr::success('Forum has been deleted successfully', 'Yay!', ['options']));
}
}
app/Http/Controllers/Staff/GiftController.php
+10 -12
View File
@@ -13,10 +13,8 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use \Toastr;
class GiftController extends Controller
@@ -40,12 +38,12 @@ class GiftController extends Controller
*
* @return void
*/
public function gift()
public function gift(Request $request)
{
$user = Auth::user();
$user = auth()->user();
if (Request::isMethod('post')) {
$v = Validator::make(Request::all(), [
if ($request->isMethod('POST')) {
$v = validator($request->all(), [
'username' => "required|exists:users,username|max:180",
'bonus_points' => "required|numeric|min:0",
'invites' => "required|numeric|min:0",
@@ -53,22 +51,22 @@ class GiftController extends Controller
]);
if ($v->passes()) {
$recipient = User::where('username', 'LIKE', Request::get('username'))->first();
$recipient = User::where('username', 'LIKE', $request->input('username'))->first();
if (!$recipient) {
return redirect('/staff_dashboard/systemgift')->with(Toastr::error('Unable to find specified user', 'Whoops!', ['options']));
}
$bon = Request::get('bonus_points');
$invites = Request::get('invites');
$fl_tokens = Request::get('fl_tokens');
$bon = $request->input('bonus_points');
$invites = $request->input('invites');
$fl_tokens = $request->input('fl_tokens');
$recipient->seedbonus += $bon;
$recipient->invites += $invites;
$recipient->fl_tokens += $fl_tokens;
$recipient->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $user->username . " has sent a system gift to " . $recipient->username . " account.");
\LogActivity::addToLog("Staff Member {$user->username} has sent a system gift to {$recipient->username} account.");
return redirect('/staff_dashboard/systemgift')->with(Toastr::success('Gift Sent', 'Yay!', ['options']));
} else {
app/Http/Controllers/Staff/GroupsController.php
+2 -3
View File
@@ -13,7 +13,6 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use App\Group;
use \Toastr;
@@ -57,7 +56,7 @@ class GroupsController extends Controller
$group->is_immune = $request->get('group_immune', 0);
$group->is_freeleech = $request->get('group_freeleech', 0);
$group->autogroup = $request->get('autogroup', 0);
$v = Validator::make($group->toArray(), $group->rules);
$v = validator($group->toArray(), $group->rules);
if ($v->fails()) {
return redirect()->route('staff_groups_index')->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options']));
} else {
@@ -90,7 +89,7 @@ class GroupsController extends Controller
$group->is_immune = $request->get('group_immune', 0);
$group->is_freeleech = $request->get('group_freeleech', 0);
$group->autogroup = $request->get('autogroup', 0);
$v = Validator::make($group->toArray(), $group->rules);
$v = validator($group->toArray(), $group->rules);
if ($v->fails()) {
return redirect()->route('staff_groups_index')->with(Toastr::error('Something Went Wrong!', 'Whoops!', ['options']));
} else {
app/Http/Controllers/Staff/HomeController.php
-12
View File
@@ -13,22 +13,11 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use App\Torrent;
use App\Peer;
use App\History;
use App\User;
use App\Group;
use App\Client;
use App\Comment;
use App\Post;
use App\Topic;
use App\PrivateMessage;
use App\Catalog;
use App\CatalogTorrent;
use App\Report;
use App\Note;
use App\Poll;
use \Toastr;
@@ -63,7 +52,6 @@ class HomeController extends Controller
$solved = Report::where('solved', '=', '1')->count();
//Polls
$pollCount = Poll::count();
//System Specs
return view('Staff.home.index', ['num_user' => $num_user, 'banned' => $banned, 'validating' => $validating, 'num_torrent' => $num_torrent, 'pending' => $pending, 'rejected' => $rejected, 'peers' => $peers, 'seeders' => $seeders,
'leechers' => $leechers, 'seedboxes' => $seedboxes, 'highspeed_users' => $highspeed_users, 'highspeed_torrents' => $highspeed_torrents, 'reports' => $reports, 'unsolved' => $unsolved, 'solved' => $solved, 'pollCount' => $pollCount]);
app/Http/Controllers/Staff/InviteController.php
+1 -1
View File
@@ -24,7 +24,7 @@ class InviteController extends Controller
*/
public function getInvites()
{
$invites = Invite::orderBy('created_at', 'DESC')->paginate(50);
$invites = Invite::orderBy('created_at', 'DESC')->paginate(25);
$invitecount = Invite::count();
return view('Staff.invites.index', ['invites' => $invites, 'invitecount' => $invitecount]);
app/Http/Controllers/Staff/MassPMController.php
+7 -9
View File
@@ -13,11 +13,9 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\User;
use App\PrivateMessage;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Validator;
use \Toastr;
class MassPMController extends Controller
@@ -40,24 +38,24 @@ class MassPMController extends Controller
*
* @return void
*/
public function sendMassPM()
public function sendMassPM(Request $request)
{
$staff = Auth::user();
$staff = auth()->user();
$users = User::all();
if (Request::isMethod('post')) {
$v = Validator::make(Request::all(), [
if ($request->isMethod('POST')) {
$v = validator($request->all(), [
'title' => "required|min:5",
'message' => "required|min:5"
]);
if ($v->passes()) {
foreach ($users as $user) {
PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $user->id, 'subject' => Request::get('title'), 'message' => Request::get('message')]);
PrivateMessage::create(['sender_id' => "1", 'reciever_id' => $user->id, 'subject' => $request->input('title'), 'message' => $request->input('message')]);
}
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has sent a MassPM.");
\LogActivity::addToLog("Staff Member {$staff->username} has sent a MassPM.");
return redirect('/staff_dashboard/masspm')->with(Toastr::success('MassPM Sent', 'Yay!', ['options']));
} else {
app/Http/Controllers/Staff/ModerationController.php
+3 -10
View File
@@ -12,16 +12,10 @@
namespace App\Http\Controllers\Staff;
use App\User;
use App\Group;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\DB;
use App\Torrent;
use App\Requests;
use App\Category;
use App\Peer;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Request;
use Carbon\Carbon;
use \Toastr;
@@ -74,11 +68,10 @@ class ModerationController extends Controller
*/
public function resetRequest($id)
{
$user = Auth::user();
$user = auth()->user();
// reset code here
if ($user->group->is_modo) {
$request = Requests::findOrFail($id);
$request->filled_by = null;
$request->filled_when = null;
$request->filled_hash = null;
app/Http/Controllers/Staff/NoteController.php
+6 -8
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 App\Note;
use App\User;
use \Toastr;
@@ -27,12 +25,12 @@ class NoteController extends Controller
*
*
*/
public function postNote($username, $id)
public function postNote(Request $request, $username, $id)
{
$staff = Auth::user();
$staff = auth()->user();
$user = User::findOrFail($id);
$v = Validator::make(Request::all(), [
$v = validator($request->all(), [
'user_id' => 'required',
'staff_id' => 'required|numeric',
'message' => 'required',
@@ -41,11 +39,11 @@ class NoteController extends Controller
$note = new Note();
$note->user_id = $user->id;
$note->staff_id = $staff->id;
$note->message = Request::get('message');
$note->message = $request->input('message');
$note->save();
// Activity Log
\LogActivity::addToLog("Staff Member " . $staff->username . " has added a note on " . $user->username . " account.");
\LogActivity::addToLog("Staff Member {$staff->username} has added a note on {$user->username} account.");
return redirect()->route('profil', ['username' => $user->username, 'id' => $user->id])->with(Toastr::success('Your Staff Note Has Successfully Posted', 'Yay!', ['options']));
}
app/Http/Controllers/Staff/PageController.php
+17 -18
View File
@@ -13,10 +13,9 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\Page;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Validator;
use \Toastr;
class PageController extends Controller
{
@@ -38,20 +37,20 @@ class PageController extends Controller
*
*
*/
public function add()
public function add(Request $request)
{
if (Request::getMethod() == 'POST') {
if ($request->isMethod('POST')) {
$page = new Page();
$page->name = Request::get('name');
$page->name = $request->input('name');
$page->slug = str_slug($page->name);
$page->content = Request::get('content');
$page->content = $request->input('content');
$v = Validator::make($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']);
$v = validator($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']);
if ($v->passes()) {
$page->save();
return redirect()->route('staff_page_index');
return redirect()->route('staff_page_index')->with(Toastr::success('Page has been created successfully', 'Yay!', ['options']));
} else {
Session::put('message', 'An error has occurred');
return redirect()->back()->with(Toastr::error('Page failed to save', 'Whoops!', ['options']));
}
}
return view('Staff.page.add');
@@ -62,20 +61,20 @@ class PageController extends Controller
*
*
*/
public function edit($slug, $id)
public function edit(Request $request, $slug, $id)
{
$page = Page::findOrFail($id);
if (Request::getMethod() == 'POST') {
$page->name = Request::get('name');
if ($request->isMethod('POST')) {
$page->name = $request->input('name');
$page->slug = str_slug($page->name);
$page->content = Request::get('content');
$page->content = $request->input('content');
$v = Validator::make($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']);
$v = validator($page->toArray(), ['name' => 'required', 'slug' => 'required', 'content' => 'required']);
if ($v->passes()) {
$page->save();
return redirect()->route('staff_page_index')->with('message', 'Page edited successfully');
return redirect()->route('staff_page_index')->with(Toastr::success('Page has been edited successfully', 'Yay!', ['options']));
} else {
Session::put('message', 'An error has occurred');
return redirect()->back()->with(Toastr::error('Page failed to save', 'Whoops!', ['options']));
}
}
return view('Staff.page.edit', ['page' => $page]);
@@ -89,6 +88,6 @@ class PageController extends Controller
public function delete($slug, $id)
{
Page::findOrFail($id)->delete();
return redirect()->route('staff_page_index')->with('message', 'Page successfully deleted');
return redirect()->route('staff_page_index')->with(Toastr::success('Page has been deleted successfully', 'Yay!', ['options']));
}
}
app/Http/Controllers/Staff/PollController.php
+5 -6
View File
@@ -13,7 +13,6 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\Http\Requests;
use App\User;
@@ -28,7 +27,7 @@ class PollController extends Controller
{
public function polls()
{
$polls = Poll::orderBy('created_at', 'desc')->paginate(20);
$polls = Poll::orderBy('created_at', 'desc')->paginate(25);
return view('Staff.poll.polls', compact('polls'));
}
@@ -56,8 +55,8 @@ class PollController extends Controller
*/
public function store(StorePoll $request)
{
if (\Auth::check()) {
$poll = \Auth::user()->polls()->create($request->all());
if (auth()->check() {
$poll = auth()->user()->polls()->create($request->all());
} else {
$poll = Poll::create($request->all());
}
@@ -68,11 +67,11 @@ class PollController extends Controller
$poll->options()->saveMany($options);
// Activity Log
\LogActivity::addToLog("Staff Member " . Auth::user()->username . " has created a new poll " . $poll->title . " .");
\LogActivity::addToLog("Staff Member " . auth()->user()->username . " has created a new poll {$poll->title}.");
// Auto Shout
$appurl = config('app.url');
Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "A new poll has been created [url={$appurl}/poll/" . $poll->slug . "]" . $poll->title . "[/url] vote on it now! :slight_smile:"]);
Shoutbox::create(['user' => "1", 'mentions' => "1", 'message' => "A new poll has been created [url={$appurl}/poll/{$poll->slug}]"{$poll->title}"[/url] vote on it now! :slight_smile:"]);
Cache::forget('shoutbox_messages');
Toastr::success('Your poll has been created.', 'Yay!', ['options']);
app/Http/Controllers/Staff/ReportController.php
+5 -7
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 App\PrivateMessage;
use App\Report;
use \Toastr;
@@ -41,11 +39,11 @@ class ReportController extends Controller
return view('Staff.reports.report', ['report' => $report]);
}
public function solveReport($report_id)
public function solveReport(Request $request, $report_id)
{
$user = Auth::user();
$user = auth()->user();
$v = Validator::make(Request::all(), [
$v = validator($request->all(), [
'verdict' => 'required|min:3',
'staff_id' => 'required'
]);
@@ -56,7 +54,7 @@ class ReportController extends Controller
return redirect()->route('getReports')->with(Toastr::error('This Report Has Already Been Solved', 'Whoops!', ['options']));
}
$report->verdict = Request::get('verdict');
$report->verdict = $request->input('verdict');
$report->staff_id = $user->id;
$report->solved = 1;
$report->save();
app/Http/Controllers/Staff/SettingsController.php
-31
View File
@@ -1,31 +0,0 @@
<?php
/**
* NOTICE OF LICENSE
*
* UNIT3D is open-sourced software licensed under the GNU General Public License v3.0
* The details is bundled with this project in the file LICENSE.txt.
*
* @project UNIT3D
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
* @author HDVinnie
*/
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
class SettingsController extends Controller
{
/**
* Settings Admin
*
*
* @access public
* @return view::make Admin.settings.index
*/
public function index()
{
return view('Staff.settings.index');
}
}
app/Http/Controllers/Staff/TorrentController.php
+6 -7
View File
@@ -13,8 +13,7 @@
namespace App\Http\Controllers\Staff;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Request;
use Illuminate\Http\Request;
use App\Torrent;
class TorrentController extends Controller
@@ -27,7 +26,7 @@ class TorrentController extends Controller
*/
public function index()
{
$torrents = Torrent::orderBy('created_at', 'DESC')->paginate(20);
$torrents = Torrent::orderBy('created_at', 'DESC')->paginate(25);
return view('Staff.torrent.index', ['torrents' => $torrents]);
}
@@ -38,14 +37,14 @@ class TorrentController extends Controller
* @return View page.torrents
*
*/
public function search()
public function search(Request $request)
{
$search = Request::get('name');
$search = $request->input('name');
$torrents = Torrent::where([
['name', 'like', '%' . Request::get('name') . '%'],
['name', 'like', '%' . $request->input('name') . '%'],
])->orderBy('created_at', 'DESC')->paginate(25);
$torrents->setPath('?name=' . Request::get('name'));
$torrents->setPath('?name=' . $request->input('name'));
return view('Staff.torrent.index', ['torrents' => $torrents]);
}
app/Http/Controllers/Staff/TypeController.php
+11 -13
View File
@@ -14,9 +14,7 @@ namespace App\Http\Controllers\Staff;
use App\Type;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use \Toastr;
class TypeController extends Controller
@@ -39,14 +37,14 @@ class TypeController extends Controller
*
*
*/
public function add()
public function add(Request $request)
{
if (Request::isMethod('post')) {
if ($request->isMethod('POST')) {
$type = new Type();
$type->name = Request::get('name');
$type->name = $request->input('name');
$type->slug = str_slug($type->name);
$type->position = Request::get('position');
$v = Validator::make($type->toArray(), $type->rules);
$type->position = $request->input('position');
$v = validator($type->toArray(), $type->rules);
if ($v->fails()) {
Toastr::error('Something Went Wrong!', 'Whoops!', ['options']);
} else {
@@ -62,14 +60,14 @@ class TypeController extends Controller
*
*
*/
public function edit($slug, $id)
public function edit(Request $request, $slug, $id)
{
$type = Type::findOrFail($id);
if (Request::isMethod('post')) {
$type->name = Request::get('name');
if ($request->isMethod('POST')) {
$type->name = $request->input('name');
$type->slug = str_slug($type->name);
$type->position = Request::get('position');
$v = Validator::make($type->toArray(), $type->rules);
$type->position = $request->input('position');
$v = validator($type->toArray(), $type->rules);
if ($v->fails()) {
Toastr::error('Something Went Wrong!', 'Whoops!', ['options']);
} else {
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']));