mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-01-24 04:50:01 -06: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

28
app/Http/Controllers/PrivateMessageController.php
View File

@@ -12,11 +12,9 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\PrivateMessage;
use App\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Response;
use Illuminate\Support\Facades\Auth;
use \Toastr;
use Carbon\Carbon;
@@ -32,7 +30,7 @@ class PrivateMessageController extends Controller
*/
public function searchPM(Request $request, $username, $id)
{
$user = Auth::user();
$user = auth()->user();
$search = $request->input('subject');
$pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->where([
['subject', 'like', '%' . $search . '%'],
@@ -50,15 +48,15 @@ class PrivateMessageController extends Controller
*/
public function getPrivateMessages(Request $request, $username, $id)
{
$user = Auth::user();
$pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->orderBy('created_at', 'desc')->paginate(20);
$user = auth()->user();
$pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->orderBy('created_at', 'desc')->paginate(25);
return view('pm.inbox', ['pms' => $pms, 'user' => $user]);
}
public function markAllAsRead(Request $request, $username, $id)
{
$user = Auth::user();
$user = auth()->user();
$pms = PrivateMessage::where('reciever_id', '=', $request->user()->id)->get();
foreach ($pms as $pm) {
$pm->read = 1;
@@ -75,9 +73,9 @@ class PrivateMessageController extends Controller
* @return View pm.message
*
*/
public function getPrivateMessageById(Request $request, $username, $id, $pmid)
public function getPrivateMessageById($username, $id, $pmid)
{
$user = Auth::user();
$user = auth()->user();
$pm = PrivateMessage::where('id', $pmid)->firstOrFail();
// If the message is not read, change the the status
@@ -97,7 +95,7 @@ class PrivateMessageController extends Controller
*/
public function getPrivateMessagesSent(Request $request)
{
$user = Auth::user();
$user = auth()->user();
$pms = PrivateMessage::where('sender_id', $request->user()->id)
->orderBy('created_at', 'desc')
->paginate(20);
@@ -114,7 +112,7 @@ class PrivateMessageController extends Controller
*/
public function makePrivateMessage($username, $id)
{
$user = Auth::user();
$user = auth()->user();
$usernames = User::orderBy('username', 'ASC')->get();
return view('pm.send', ['usernames' => $usernames, 'user' => $user]);
@@ -129,7 +127,7 @@ class PrivateMessageController extends Controller
*/
public function sendPrivateMessage(Request $request)
{
$user = Auth::user();
$user = auth()->user();
$attributes = [
'sender_id' => $user->id,
@@ -153,7 +151,7 @@ class PrivateMessageController extends Controller
*/
public function replyPrivateMessage(Request $request, $pmid)
{
$user = Auth::user();
$user = auth()->user();
$pm = PrivateMessage::where('id', $pmid)->firstOrFail();
@@ -178,9 +176,9 @@ class PrivateMessageController extends Controller
* @return View pm.inbox
*
*/
public function deletePrivateMessage(Request $request, $pmid)
public function deletePrivateMessage($pmid)
{
$user = Auth::user();
$user = auth()->user();
$pm = PrivateMessage::where('id', $pmid)->firstOrFail();
$pm->delete();