cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert Input to Request facade

Browse Source 
Laravel 5.2 no longer registers the `Input` facade by default. While
still available in Laravel 5, the `Input` facade is removed in
Laravel 6.
This commit is contained in:
Shift
2023-01-07 18:48:11 +00:00
parent 67bf088f27
commit 723ac38edd
25 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Api/v1/ApiController.php
View File

@@ -2,6 +2,7 @@
namespace App\Api\v1;
use Illuminate\Support\Facades\Request as Input;
use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController;
use App\Http\Controllers\Controller;
use App\Http\Requests\helpdesk\TicketRequest;
@@ -1418,7 +1419,7 @@ class ApiController extends Controller
{
try {
$v = \Validator::make(
\Input::get(),
Input::all(),
[
'email' => 'required|email|unique:users',
'ticket_id' => 'required',
@@ -1451,7 +1452,7 @@ class ApiController extends Controller
{
try {
$v = \Validator::make(
\Input::get(),
Input::all(),
[
'ticket_id' => 'required',
]
@@ -1483,7 +1484,7 @@ class ApiController extends Controller
{
try {
$v = \Validator::make(
\Input::get(),
Input::all(),
[
'ticketid' => 'required',
'email' => 'required',

28
app/Api/v1/TicketController.php
View File

@@ -15,7 +15,7 @@ use App\Model\helpdesk\Ticket\Tickets;
use App\User;
use Auth;
use Hash;
use Input;
use Illuminate\Support\Facades\Request;
use Mail;
/**
@@ -407,15 +407,15 @@ class TicketController extends Controller
try {
$ticket = $ticket->where('id', '=', $ticket_id)->first();
$ticket->sla = Input::get('sla_plan');
$ticket->help_topic_id = Input::get('help_topic');
$ticket->source = Input::get('ticket_source');
$ticket->priority_id = Input::get('ticket_priority');
$ticket->status = Input::get('status');
$ticket->sla = Request::get('sla_plan');
$ticket->help_topic_id = Request::get('help_topic');
$ticket->source = Request::get('ticket_source');
$ticket->priority_id = Request::get('ticket_priority');
$ticket->status = Request::get('status');
$ticket->save();
$threads = $thread->where('ticket_id', '=', $ticket_id)->first();
$threads->title = Input::get('subject');
$threads->title = Request::get('subject');
$threads->save();
} catch (\Exception $ex) {
$result = $ex->getMessage();
@@ -436,7 +436,7 @@ class TicketController extends Controller
public function assign($id)
{
try {
$UserEmail = Input::get('user');
$UserEmail = Request::get('user');
//dd($UserEmail);
// $UserEmail = 'sujitprasad12@yahoo.in';
$user = User::where('email', '=', $UserEmail)->first();
@@ -613,7 +613,7 @@ class TicketController extends Controller
*/
public function autosearch()
{
$term = \Input::get('term');
$term = Request::get('term');
$user = \App\User::where('email', 'LIKE', '%'.$term.'%')->orWhere('first_name', 'LIKE', '%'.$term.'%')->orWhere('last_name', 'LIKE', '%'.$term.'%')->orWhere('user_name', 'LIKE', '%'.$term.'%')->pluck('email');
return $user;
@@ -627,8 +627,8 @@ class TicketController extends Controller
*/
public function useradd()
{
$email = Input::get('email');
$ticket_id = Input::get('ticket_id');
$email = Request::get('email');
$ticket_id = Request::get('ticket_id');
$company = $this->company();
$user = new User();
$user->user_name = $email;
@@ -661,8 +661,8 @@ class TicketController extends Controller
*/
public function userremove()
{
$email = Input::get('email');
$ticketid = Input::get('ticketid');
$email = Request::get('email');
$ticketid = Request::get('ticketid');
$user = new User();
$user = $user->where('email', $email)->first();
$ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid)
@@ -680,7 +680,7 @@ class TicketController extends Controller
public function getCollaboratorForTicket()
{
try {
$ticketid = Input::get('ticket_id');
$ticketid = Request::get('ticket_id');
$ticket_collaborator = \DB::table('users')
->join('ticket_collaborator', function ($join) use ($ticketid) {

7
app/Http/Controllers/Admin/helpdesk/ErrorAndDebuggingController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controller
use Illuminate\Support\Facades\Request;
use App\Http\Controllers\Controller;
// request
@@ -56,13 +57,13 @@ class ErrorAndDebuggingController extends Controller
$debug = ($debug) ? 'true' : 'false';
$bugsnag_debug = \Config::get('app.bugsnag_reporting');
$bugsnag_debug = ($bugsnag_debug) ? 'true' : 'false';
if ($debug != \Input::get('debug') || $bugsnag_debug != \Input::get('bugsnag')) {
if ($debug != Request::get('debug') || $bugsnag_debug != Request::get('bugsnag')) {
// dd($request->input());
$debug_new = base_path().DIRECTORY_SEPARATOR.'.env';
$datacontent = File::get($debug_new);
$datacontent = str_replace(
'APP_DEBUG='.$debug,
'APP_DEBUG='.\Input::get('debug'),
'APP_DEBUG='.Request::get('debug'),
$datacontent
);
File::put($debug_new, $datacontent);
@@ -72,7 +73,7 @@ class ErrorAndDebuggingController extends Controller
$datacontent2 = File::get($bugsnag_debug_new);
$datacontent2 = str_replace(
'APP_BUGSNAG='.$bugsnag_debug,
'APP_BUGSNAG='.\Input::get('bugsnag'),
'APP_BUGSNAG='.Request::get('bugsnag'),
$datacontent2
);
File::put($bugsnag_debug_new, $datacontent2);

2
app/Http/Controllers/Admin/helpdesk/FormController.php
View File

@@ -14,7 +14,7 @@ use Form;
// Class
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
use Redirect;

24
app/Http/Controllers/Admin/helpdesk/LanguageController.php
View File

@@ -14,7 +14,7 @@ use File;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Session;
use Input;
use Illuminate\Support\Facades\Request;
use Lang;
use UnAuth;
use Validator;
@@ -134,9 +134,9 @@ class LanguageController extends Controller
try {
// getting all of the post data
$file = [
'File' => Input::file('File'),
'language-name' => Input::input('language-name'),
'iso-code' => Input::input('iso-code'),
'File' => Request::file('File'),
'language-name' => Request::input('language-name'),
'iso-code' => Request::input('iso-code'),
];
// setting up rules
@@ -155,14 +155,14 @@ class LanguageController extends Controller
//Checking if package already exists or not in lang folder
$path = base_path('resources/lang');
if (in_array(strtolower(Input::get('iso-code')), scandir($path))) {
if (in_array(strtolower(Request::get('iso-code')), scandir($path))) {
//sending back with error message
Session::flash('fails', Lang::get('lang.package_exist'));
Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code')));
Session::flash('link', 'change-language/'.strtolower(Request::get('iso-code')));
return Redirect::back()->withInput();
} elseif (! array_key_exists(strtolower(Input::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php
} elseif (! array_key_exists(strtolower(Request::get('iso-code')), Config::get('languages'))) {//Checking Valid ISO code form Languages.php
//sending back with error message
Session::flash('fails', Lang::get('lang.iso-code-error'));
@@ -170,13 +170,13 @@ class LanguageController extends Controller
} else {
// checking file is valid.
if (Input::file('File')->isValid()) {
$name = Input::file('File')->getClientOriginalName(); //uploaded file's original name
if (Request::file('File')->isValid()) {
$name = Request::file('File')->getClientOriginalName(); //uploaded file's original name
$destinationPath = base_path('public/uploads/'); // defining uploading path
$extractpath = base_path('resources/lang').'/'.strtolower(Input::get('iso-code')); //defining extracting path
$extractpath = base_path('resources/lang').'/'.strtolower(Request::get('iso-code')); //defining extracting path
mkdir($extractpath); //creating directroy for extracting uploadd file
//mkdir($destinationPath);
Input::file('File')->move($destinationPath, $name); // uploading file to given path
Request::file('File')->move($destinationPath, $name); // uploading file to given path
\Zipper::make($destinationPath.'/'.$name)->extractTo($extractpath); //extracting file to give path
//check if Zip extract foldercontains any subfolder
$directories = File::directories($extractpath);
@@ -194,7 +194,7 @@ class LanguageController extends Controller
} else {
// sending back with success message
Session::flash('success', Lang::get('lang.upload-success'));
Session::flash('link', 'change-language/'.strtolower(Input::get('iso-code')));
Session::flash('link', 'change-language/'.strtolower(Request::get('iso-code')));
return Redirect::route('LanguageController');
}

10
app/Http/Controllers/Admin/helpdesk/ProfileController.php
View File

@@ -13,7 +13,7 @@ use App\User;
use Auth;
use Exception;
use Hash;
use Input;
use Illuminate\Support\Facades\Request;
/**
* ProfileController.
@@ -94,13 +94,13 @@ class ProfileController extends Controller
$user->profile_pic = $name;
}
}
if (Input::file('profile_pic')) {
//$extension = Input::file('profile_pic')->getClientOriginalExtension();
$name = Input::file('profile_pic')->getClientOriginalName();
if (Request::file('profile_pic')) {
//$extension = Request::file('profile_pic')->getClientOriginalExtension();
$name = Request::file('profile_pic')->getClientOriginalName();
$destinationPath = 'lb-faveo/profilepic';
$fileName = rand(0000, 9999).'.'.$name;
//echo $fileName;
Input::file('profile_pic')->move($destinationPath, $fileName);
Request::file('profile_pic')->move($destinationPath, $fileName);
$user->profile_pic = $fileName;
} else {
$user->fill($request->except('profile_pic', 'gender', 'active', 'role', 'is_delete', 'ban'))->save();

16
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -39,7 +39,7 @@ use Exception;
use File;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
/**
@@ -866,13 +866,13 @@ class SettingsController extends Controller
public function saveConditions()
{
if (\Input::get('fetching-commands') && \Input::get('notification-commands')) {
$fetching_commands = \Input::get('fetching-commands');
$fetching_dailyAt = \Input::get('fetching-dailyAt');
$notification_commands = \Input::get('notification-commands');
$notification_dailyAt = \Input::get('notification-dailyAt');
$work_commands = \Input::get('work-commands');
$workflow_dailyAt = \Input::get('workflow-dailyAt');
if (Input::get('fetching-commands') && Input::get('notification-commands')) {
$fetching_commands = Input::get('fetching-commands');
$fetching_dailyAt = Input::get('fetching-dailyAt');
$notification_commands = Input::get('notification-commands');
$notification_dailyAt = Input::get('notification-dailyAt');
$work_commands = Input::get('work-commands');
$workflow_dailyAt = Input::get('workflow-dailyAt');
$fetching_command = $this->getCommand($fetching_commands, $fetching_dailyAt);
$notification_command = $this->getCommand($notification_commands, $notification_dailyAt);
$work_command = $this->getCommand($work_commands, $workflow_dailyAt);

2
app/Http/Controllers/Admin/helpdesk/SettingsController2.php
View File

@@ -33,7 +33,7 @@ use DB;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
/**

2
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -16,7 +16,7 @@ use App\Model\helpdesk\Utility\Languages;
// classes
use Exception;
use Illuminate\Http\Request;
use Input;
use Illuminate\Support\Facades\Request as Input;
/**
* TemplateController.

3
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Agent\helpdesk;
// controllers
use Illuminate\Support\Facades\Request as Input;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\OrganizationRequest;
@@ -264,7 +265,7 @@ class OrganizationController extends Controller
public function Head_Org($id)
{
// get the user to make organization head
$head_user = \Input::get('user');
$head_user = Input::get('user');
// get an instance of the selected organization
$org_head = Organization::where('id', '=', $id)->first();
$org_head->head = $head_user;

4
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -45,7 +45,7 @@ use Hash;
use Illuminate\Http\Request;
use Illuminate\support\Collection;
use Illuminate\Support\Str;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
use Mail;
use PDF;
@@ -1588,7 +1588,7 @@ class TicketController extends Controller
*/
public function autosearch($id)
{
$term = \Input::get('term');
$term = Input::get('term');
$user = \App\User::where('email', 'LIKE', '%'.$term.'%')->pluck('email');
echo json_encode($user);
}

4
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -39,7 +39,7 @@ use Exception;
use GeoIP;
use Hash;
use Illuminate\Http\Request;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
use Redirect;
@@ -897,7 +897,7 @@ class UserController extends Controller
// checking if the name is unique
$check2 = Organization::where('name', '=', Input::get('name'))->first();
// if any of the fields is not available then return false
if (\Input::get('name') == null) {
if (Input::get('name') == null) {
return 'Name is required';
} elseif ($check2 != null) {
return 'Name should be Unique';

2
app/Http/Controllers/Agent/kb/SettingsController.php
View File

@@ -17,7 +17,7 @@ use Config;
use Exception;
use Illuminate\Http\Request;
use Image;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
/**

22
app/Http/Controllers/Auth/UserController.php
View File

@@ -24,7 +24,7 @@ use App\User;
/* include tickets model */
/* TicketRequest to validate the ticket response */
/* Validate post check ticket */
use Input;
use Illuminate\Support\Facades\Request;
use Redirect;
/**
@@ -285,7 +285,7 @@ class UserController extends Controller
*/
public function UserAssignOrg($id)
{
$org = Input::get('org');
$org = Request::get('org');
$user_org = new User_org();
$user_org->org_id = $org;
$user_org->user_id = $id;
@@ -301,17 +301,17 @@ class UserController extends Controller
*/
public function User_Create_Org($id)
{
if (Input::get('website') != null) {
if (Request::get('website') != null) {
// checking website
$check = Organization::where('website', '=', Input::get('website'))->first();
$check = Organization::where('website', '=', Request::get('website'))->first();
} else {
$check = null;
}
// checking name
$check2 = Organization::where('name', '=', Input::get('name'))->first();
$check2 = Organization::where('name', '=', Request::get('name'))->first();
if (\Input::get('name') == null) {
if (Request::get('name') == null) {
return 'Name is required';
} elseif ($check2 != null) {
return 'Name should be Unique';
@@ -319,11 +319,11 @@ class UserController extends Controller
return 'Website should be Unique';
} else {
$org = new Organization();
$org->name = Input::get('name');
$org->phone = Input::get('phone');
$org->website = Input::get('website');
$org->address = Input::get('address');
$org->internal_notes = Input::get('internal');
$org->name = Request::get('name');
$org->phone = Request::get('phone');
$org->website = Request::get('website');
$org->address = Request::get('address');
$org->internal_notes = Request::get('internal');
$org->save();
$user_org = new User_org();

2
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -28,7 +28,7 @@ use Exception;
use GeoIP;
use Hash;
use Illuminate\Http\Request;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
use Socialite;

2
app/Http/Controllers/Common/ApiSettings.php
View File

@@ -8,7 +8,7 @@ use App\Model\helpdesk\Ticket\Tickets;
use DB;
use Exception;
use Illuminate\Http\Request;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
use Log;

2
app/Http/Controllers/Common/SettingsController.php
View File

@@ -18,7 +18,7 @@ use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Lang;
/**

2
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -19,7 +19,7 @@ use Exception;
use File;
use Hash;
use Illuminate\Http\Request;
use Input;
use Illuminate\Support\Facades\Request as Input;
use Redirect;
use Session;
use UnAuth;

3
app/Http/Controllers/Job/MailController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Job;
use Illuminate\Support\Facades\Request as Input;
use App\Http\Controllers\Controller;
use Exception;
use Form;
@@ -31,7 +32,7 @@ class MailController extends Controller
public function form($label, $name, $class)
{
$mailid = \Input::get('emailid');
$mailid = Input::get('emailid');
if ($mailid) {
$emails = new \App\Model\helpdesk\Email\Emails();
$email = $emails->find($mailid);

12
app/Http/Middleware/TicketViewURL.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Middleware;
use Closure;
use Input;
use Illuminate\Support\Facades\Request;
//use Redirect;
@@ -18,20 +18,20 @@ class TicketViewURL
*/
public function handle($request, Closure $next)
{
// dd(\Input::all(), $request->fullUrl());
// dd(Request::all(), $request->fullUrl());
$request_str = $request->fullUrl();
if (preg_match('([^D]=)', $request_str) == 1) {
$request_str = str_replace('=', '%5B%5D=', $request_str);
$request_str = str_replace('%5B%5D%5B%5D=', '%5B%5D=', $request_str);
}
if (count(Input::all()) == 0) {
if (count(Request::all()) == 0) {
return \Redirect::to('tickets?show%5B%5D=inbox&departments%5B%5D=All');
} else {
if (! array_key_exists('show', Input::all()) && ! array_key_exists('departments', Input::all())) {
if (! array_key_exists('show', Request::all()) && ! array_key_exists('departments', Request::all())) {
return \Redirect::to($request_str.'&show%5B%5D=inbox&departments%5B%5D=All');
} elseif (! array_key_exists('show', Input::all()) && array_key_exists('departments', Input::all())) {
} elseif (! array_key_exists('show', Request::all()) && array_key_exists('departments', Request::all())) {
return \Redirect::to($request_str.'&show%5B%5D=inbox');
} elseif (array_key_exists('show', Input::all()) && ! array_key_exists('departments', Input::all())) {
} elseif (array_key_exists('show', Request::all()) && ! array_key_exists('departments', Request::all())) {
return \Redirect::to($request_str.'&departments%5B%5D=All');
} else {
// do nothing

6
app/Http/breadcrumbs.php
View File

@@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Facades\Request;
Breadcrumbs::register('dashboard', function ($breadcrumbs) {
//$breadcrumbs->parent('/');
$breadcrumbs->push(Lang::get('lang.dashboard'), route('dashboard'));
@@ -561,7 +563,7 @@ Breadcrumbs::register('queue', function ($breadcrumbs) {
$breadcrumbs->push(Lang::get('lang.queues'), route('queue'));
});
Breadcrumbs::register('queue.edit', function ($breadcrumbs) {
$id = \Input::segment(2);
$id = Request::segment(2);
$breadcrumbs->parent('queue');
$breadcrumbs->push(Lang::get('lang.edit'), route('queue.edit', $id));
});
@@ -576,7 +578,7 @@ Breadcrumbs::register('social', function ($breadcrumbs) {
$breadcrumbs->push(Lang::get('lang.social-media'), route('social'));
});
Breadcrumbs::register('social.media', function ($breadcrumbs) {
$id = \Input::segment(2);
$id = Request::segment(2);
$breadcrumbs->parent('social');
$breadcrumbs->push(Lang::get('lang.settings'), route('social.media', $id));
});

1
config/app.php
View File

@@ -214,7 +214,6 @@ return [
'Event' => 'Illuminate\Support\Facades\Event',
'File' => 'Illuminate\Support\Facades\File',
'Hash' => 'Illuminate\Support\Facades\Hash',
'Input' => 'Illuminate\Support\Facades\Input',
'Inspiring' => 'Illuminate\Foundation\Inspiring',
'Lang' => 'Illuminate\Support\Facades\Lang',
'Log' => 'Illuminate\Support\Facades\Log',

18
resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php
View File

@@ -17,13 +17,13 @@ class="active"
@stop
<?php
$inputs = \Input::get('show');
$inputs = Request::get('show');
$activepage = $inputs[0];
if (\Input::has('assigned'))
if (Request::has('assigned'))
{
$activepage = \Input::get('assigned')[0];
} elseif (\Input::has('last-response-by')){
$activepage = \Input::get('last-response-by')[0];
$activepage = Request::get('assigned')[0];
} elseif (Request::has('last-response-by')){
$activepage = Request::get('last-response-by')[0];
}
?>
@@ -125,12 +125,12 @@ if (\Input::has('assigned'))
@else
{{Lang::get('lang.inbox')}}
@endif
@if(count(Input::all()) > 2 && $activepage != '0')
@if(count(Request::all()) > 2 && $activepage != '0')
/ {{Lang::get('lang.filtered-results')}}
@else()
@if(count(Input::get('departments')) == 1 && Input::get('departments')[0] != 'All')
@if(count(Request::get('departments')) == 1 && Request::get('departments')[0] != 'All')
/ {{Lang::get('lang.filtered-results')}}
@elseif (count(Input::get('departments')) > 1)
@elseif (count(Request::get('departments')) > 1)
/ {{Lang::get('lang.filtered-results')}}
@endif
@endif
@@ -171,7 +171,7 @@ if (\Input::has('assigned'))
<i class="fas fa-cogs"> </i> {!! Lang::get('lang.merge') !!}
</button>
<?php $inputs = Input::all(); ?>
<?php $inputs = Request::all(); ?>
<div class="btn-group">
<?php $statuses = Finder::getCustomedStatus(); ?>

2
resources/views/vendor/Chumper/tickets-javascript.blade.php vendored
View File

@@ -15,7 +15,7 @@ $segment = "";
foreach ($segments as $seg) {
$segment.="/".$seg;
}
$inputs = json_encode(\Input::all());
$inputs = json_encode(Request::all());
$path = public_path();
?>
<script type="text/javascript">

6
routes/web.php
View File

@@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Facades\Request;
/*
|--------------------------------------------------------------------------
| Application Routes
@@ -487,13 +489,13 @@ Route::group(['middleware' => ['web']], function () {
*/
// seasrch
// Route::POST('tickets/search/', function () {
// $keyword = Illuminate\Support\Str::lower(Input::get('auto'));
// $keyword = Illuminate\Support\Str::lower(Request::get('auto'));
// $models = App\Model\Ticket\Tickets::where('ticket_number', '=', $keyword)->orderby('ticket_number')->take(10)->skip(0)->get();
// $count = count($models);
// return Illuminate\Support\Facades\Redirect::back()->with('contents', $models)->with('counts', $count);
// });
Route::any('getdata', function () {
$term = Illuminate\Support\Str::lower(Input::get('term'));
$term = Illuminate\Support\Str::lower(Request::get('term'));
$data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term.'%')->groupBy('ticket_number')->take(10)->get();
foreach ($data as $v) {
return [