Skip to content

Commit 99f5751

Browse files
xaviqvxaviqv
committed
Replaced request->has with request->input for Laravel 5.5 compatibility
1 parent 6e635a8 commit 99f5751

10 files changed

Lines changed: 37 additions & 36 deletions

‎src/Controllers/CategoriesController.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,13 @@ protected function add_reasons_to($request)
175175
$regex_text = trans('panichd::lang.regex-text-inline');
176176

177177
$min_chars = "5";
178-
178+
179179
if ($request->exists('reason_ordering')){
180180
foreach ($request->input('reason_ordering') as $ordering=>$i){
181-
if ($request->has('jquery_delete_reason_'.$i)){
181+
if ($request->input('jquery_delete_reason_'.$i) != ""){
182182
$a_delete[] = $request->input('jquery_reason_id_'.$i);
183-
}elseif($request->has('jquery_reason_id_'.$i)) {
183+
184+
}elseif($request->input('jquery_reason_id_'.$i) != "") {
184185

185186
$reason = [
186187
'ordering'=>$ordering
@@ -244,9 +245,9 @@ protected function add_tags_to($request)
244245

245246
$a_tags_update = [];
246247
for ($i = 0; $i < $request->input('tags_count'); $i++) {
247-
if (!$request->has('jquery_delete_tag_'.$i)) {
248+
if (!$request->input('jquery_delete_tag_'.$i) != "") {
248249
// Add validation for renamed tags
249-
if ($request->exists('jquery_tag_name_'.$i) and $request->has('jquery_tag_id_'.$i)) {
250+
if ($request->exists('jquery_tag_name_'.$i) and $request->input('jquery_tag_id_'.$i) != "") {
250251
$tag = $request->input('jquery_tag_name_'.$i);
251252
$request->merge(['jquery_tag_name_'.$i=>$tag]);
252253
$a_tags_update[$request->input('jquery_tag_id_'.$i)]['name'] = $tag;
@@ -256,7 +257,7 @@ protected function add_tags_to($request)
256257
}
257258

258259
// Add colors for tag update
259-
if ($request->has('jquery_tag_color_'.$i)) {
260+
if ($request->input('jquery_tag_color_'.$i) != "") {
260261
$a_tags_update[$request->input('jquery_tag_id_'.$i)]['color'] = $request->input('jquery_tag_color_'.$i);
261262
}
262263
}
@@ -293,7 +294,7 @@ protected function do_validate($request, $rules, $reason_messages)
293294
*/
294295
protected function category_email_fields($request, $category)
295296
{
296-
if ($request->email_scope != 'default' and $request->has('email_name') and $request->has('email')){
297+
if ($request->email_scope != 'default' and $request->input('email_name') != "" and $request->input('email') != ""){
297298
$category->email_name = $request->email_name;
298299
$category->email = $request->email;
299300

@@ -384,7 +385,7 @@ protected function sync_category_tags($request, $category, $a_tags_new, $a_tags_
384385
// Detach checked tags to delete
385386
$a_detach = $a_rename = [];
386387
for ($i = 0; $i < $request->input('tags_count'); $i++) {
387-
if ($request->has('jquery_delete_tag_'.$i)) {
388+
if ($request->input('jquery_delete_tag_'.$i) != "") {
388389
// Exclude for sync
389390
$a_detach[] = $request->input('jquery_delete_tag_'.$i);
390391
}

‎src/Controllers/CommentsController.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public function store(Request $request)
132132
// Filter response type
133133
$comment->type = in_array($request->get('response_type'), ['note','reply']) ? $request->get('response_type') : 'note';
134134

135-
if ($request->has('complete_ticket') and $member->canCloseTicket($request->get('ticket_id'))){
135+
if ($request->input('complete_ticket') != "" and $member->canCloseTicket($request->get('ticket_id'))){
136136
if ($comment->type == 'reply' and $ticket->user_id == $member->id){
137137
// comment for assigned agent only
138138
$comment->type = 'completetx';
@@ -145,7 +145,7 @@ public function store(Request $request)
145145
$comment->type = 'reply';
146146

147147
// Close ticket + new status
148-
if ($member->canCloseTicket($request->get('ticket_id')) and $request->has('complete_ticket')){
148+
if ($member->canCloseTicket($request->get('ticket_id')) and $request->input('complete_ticket') != ""){
149149
$ticket->completed_at = Carbon::now();
150150
$ticket->status_id = Status::where('id',$request->get('status_id'))->count()==1 ? $request->get('status_id') : Setting::grab('default_close_status_id');
151151
}
@@ -173,7 +173,7 @@ public function store(Request $request)
173173
// Update parent ticket
174174
$ticket->updated_at = $comment->created_at;
175175

176-
if ($member->currentLevel() > 1 and $member->canManageTicket($request->get('ticket_id')) and $comment->type == 'reply' and $request->has('add_to_intervention')){
176+
if ($member->currentLevel() > 1 and $member->canManageTicket($request->get('ticket_id')) and $comment->type == 'reply' and $request->input('add_to_intervention') != ""){
177177
$ticket->intervention = $ticket->intervention.$comment->content;
178178
$ticket->intervention_html = $ticket->intervention_html.$comment->html;
179179
}
@@ -268,7 +268,7 @@ public function update(Request $request, $id)
268268

269269
if (!$a_result_errors){
270270
// 3 - destroy checked attachments
271-
if ($request->has('delete_files')){
271+
if ($request->input('delete_files') != ""){
272272
$destroy_error = $this->destroyAttachmentIds($request->delete_files);
273273

274274
if ($destroy_error) $a_result_errors['messages'][] = $destroy_error;

‎src/Controllers/DashboardController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public function index($indicator_period = 2)
5959
$ticketController = new TicketsController(new Ticket(), new \PanicHDMember());
6060
$monthly_performance = $ticketController->monthlyPerfomance($indicator_period);
6161

62-
if (request()->has('cat_page')) {
62+
if (request()->input('cat_page') != "") {
6363
$active_tab = 'cat';
64-
} elseif (request()->has('agents_page')) {
64+
} elseif (request()->input('agents_page') != "") {
6565
$active_tab = 'agents';
66-
} elseif (request()->has('users_page')) {
66+
} elseif (request()->input('users_page') != "") {
6767
$active_tab = 'users';
6868
} else {
6969
$active_tab = 'cat';

‎src/Controllers/InstallController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public function setup(Request $request)
179179
$admin_user = \PanicHDMember::find(auth()->user()->id);
180180
$admin_user->panichd_admin = true;
181181

182-
if ($request->has('quickstart')){
182+
if ($request->input('quickstart') != ""){
183183
// Insert quickstart seed data
184184
Artisan::call('db:seed', [
185185
'--class' => 'PanicHD\\PanicHD\\Seeds\\Basic',

‎src/Controllers/NotificationsController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public function newComment(Comment $comment, $request)
194194
}
195195

196196
if (count($a_recipients) > 0){
197-
if ($request->has('add_in_user_notification_text') or (isset($comment->add_in_user_notification_text))){
197+
if ($request->input('add_in_user_notification_text') != "" or (isset($comment->add_in_user_notification_text))){
198198
// Element in request comes from Comment modal
199199
// $comment property comes from an embedded comment when editing or creating a ticket
200200
$data['add_in_user_notification_text'] = true;
@@ -281,7 +281,7 @@ public function notificationResend(Request $request)
281281
'notification_type' => $comment->type
282282
];
283283

284-
if ($request->has('recipients')){
284+
if ($request->input('recipients') != ""){
285285

286286
foreach($request->recipients as $recipient_key){
287287
// Search by member_id or by email address

‎src/Controllers/PrioritiesController.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function update(Request $request, $id)
137137
public function reorder(Request $request)
138138
{
139139
$result = "error";
140-
if ($request->has('priorities')){
140+
if ($request->input('priorities') != ""){
141141

142142
$a_priorities = $a_priorities = explode(',', $request->priorities);
143143
if (Priority::whereNotIn('id', $a_priorities)->count() == 0
@@ -170,7 +170,7 @@ public function destroy(Request $request, $id)
170170
$priority = Priority::findOrFail($id);
171171
$name = $priority->name;
172172

173-
if ($request->has('tickets_new_priority_id')){
173+
if ($request->input('tickets_new_priority_id') != ""){
174174
$this->validate($request, [
175175
'tickets_new_priority_id' => 'required|exists:panichd_priorities,id',
176176
]);

‎src/Controllers/StatusesController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function destroy(Request $request, $id)
119119
$status = Status::findOrFail($id);
120120
$name = $status->name;
121121

122-
if ($request->has('tickets_new_status_id')){
122+
if ($request->input('tickets_new_status_id') != ""){
123123
$this->validate($request, [
124124
'tickets_new_status_id' => 'required|exists:panichd_statuses,id',
125125
]);

‎src/Controllers/TicketsController.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ protected function validation_common($request, $new_ticket = true)
901901

902902
$fields['priority_id'] = 'required|exists:panichd_priorities,id';
903903

904-
if ($request->has('start_date')){
904+
if ($request->input('start_date') != ""){
905905
\Datetime::createFromFormat(trans('panichd::lang.datetime-format'), $request->input('start_date'));
906906
$errors = \DateTime::getLastErrors();
907907
if (isset($errors['warnings']) and isset($errors['errors']) and ($errors['warnings'] or $errors['errors'])){
@@ -926,7 +926,7 @@ protected function validation_common($request, $new_ticket = true)
926926
}
927927
}
928928

929-
if ($request->has('limit_date')){
929+
if ($request->input('limit_date') != ""){
930930
\Datetime::createFromFormat(trans('panichd::lang.datetime-format'), $request->input('limit_date'));
931931
$errors = \DateTime::getLastErrors();
932932

@@ -1004,7 +1004,7 @@ protected function validation_common($request, $new_ticket = true)
10041004

10051005

10061006
// Date diff validation
1007-
if ($request->has('start_date') and isset($start_date) and $request->has('limit_date') and isset($limit_date)
1007+
if ($request->input('start_date') != "" and isset($start_date) and $request->input('limit_date') != "" and isset($limit_date)
10081008
and (!$a_result_errors or ($a_result_errors and !isset($a_result_errors['fields']['limit_date'])))){
10091009

10101010
if ($start_date->diffInSeconds($limit_date, false) < 0){
@@ -1139,15 +1139,15 @@ public function add_embedded_comments($request, $ticket, $a_result_errors)
11391139
{
11401140
$a_new_comments = [];
11411141

1142-
if ($request->has('form_comments')){
1142+
if ($request->input('form_comments') != ""){
11431143
$custom_messages = [
11441144
'content.required' => trans('panichd::lang.validate-comment-required'),
11451145
'content.min' => trans('panichd::lang.validate-comment-min'),
11461146
];
11471147

11481148
foreach($request->form_comments as $i){
11491149

1150-
if (!$request->has('response_' . $i)) continue;
1150+
if (!$request->input('response_' . $i) != "") continue;
11511151

11521152
$response_type = in_array($request->{'response_' . $i}, ['note','reply']) ? $request->{'response_' . $i} : 'note';
11531153

@@ -1168,10 +1168,10 @@ public function add_embedded_comments($request, $ticket, $a_result_errors)
11681168
$comment->save();
11691169

11701170
// Comment recipients
1171-
if($request->has('comment_' . $i . '_recipients')) $comment->a_recipients = $request->{'comment_' . $i . '_recipients'};
1171+
if($request->input('comment_' . $i . '_recipients') != "") $comment->a_recipients = $request->{'comment_' . $i . '_recipients'};
11721172

11731173
// Adds this as a $comment property to check it in NotificationsController
1174-
if($request->has('comment_' . $i . '_notification_text')) $comment->add_in_user_notification_text = 'yes';
1174+
if($request->input('comment_' . $i . '_notification_text') != "") $comment->add_in_user_notification_text = 'yes';
11751175

11761176
$a_new_comments[] = $comment;
11771177
}
@@ -1446,7 +1446,7 @@ public function update(Request $request, $id)
14461446

14471447
if (!$a_result_errors){
14481448
// 3 - destroy checked attachments
1449-
if ($request->has('delete_files')){
1449+
if ($request->input('delete_files') != ""){
14501450
$destroy_error = $this->destroyAttachmentIds($request->delete_files);
14511451

14521452
if ($destroy_error) $a_result_errors['messages'][] = $destroy_error;
@@ -1766,12 +1766,12 @@ public function changeAgent(Request $request)
17661766
$original_ticket = Ticket::findOrFail($request->input('ticket_id'));
17671767
$ticket = clone $original_ticket;
17681768
$old_agent = $ticket->agent()->first();
1769-
if ($request->has('agent_id')){
1769+
if ($request->input('agent_id') != ""){
17701770
$new_agent = \PanicHDMember::find($request->input('agent_id'));
17711771
}else
17721772
$new_agent = clone $old_agent;
17731773

1774-
if (!$request->has('status_checkbox') and (is_null($new_agent) || $ticket->agent_id == $request->input('agent_id'))){
1774+
if (!$request->input('status_checkbox') != "" and (is_null($new_agent) || $ticket->agent_id == $request->input('agent_id'))){
17751775
return redirect()->back()->with('warning', trans('panichd::lang.update-agent-same', [
17761776
'name' => '#'.$ticket->id.' '.$ticket->subject,
17771777
'link' => route(Setting::grab('main_route').'.show', $ticket->id),
@@ -1782,7 +1782,7 @@ public function changeAgent(Request $request)
17821782
$ticket->agent_id = $new_agent->id;
17831783

17841784
$old_status_id = $ticket->status_id;
1785-
if ($request->has('status_checkbox') || !Setting::grab('use_default_status_id')){
1785+
if ($request->input('status_checkbox') != "" || !Setting::grab('use_default_status_id')){
17861786
$ticket->status_id = Setting::grab('default_reopen_status_id');
17871787
}
17881788
$ticket->save();

‎src/Traits/Attachments.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ protected function updateAttachments($request, $a_result_errors, $attachments)
376376

377377
// New filename
378378
$field = 'attachment_'.$att->id.'_new_filename';
379-
if ($request->has($field)){
379+
if ($request->input($field) != ""){
380380
$a_fields['new_filename'] = [
381381
'name' => $field,
382382
'value' => $request->input($field)
@@ -385,7 +385,7 @@ protected function updateAttachments($request, $a_result_errors, $attachments)
385385

386386
// Description
387387
$field = 'attachment_'.$att->id.'_description';
388-
if ($request->has($field)){
388+
if ($request->input($field) != ""){
389389
$a_fields['description'] = [
390390
'name' => $field,
391391
'value' => $request->input($field)
@@ -394,7 +394,7 @@ protected function updateAttachments($request, $a_result_errors, $attachments)
394394

395395
// Image cropping
396396
$field = 'attachment_'.$att->id.'_image_crop';
397-
if ($request->has($field)){
397+
if ($request->input($field) != ""){
398398
$a_fields['image_crop'] = $request->input($field);
399399
$original_filename = basename($att->file_path);
400400
}

‎src/Traits/TicketRoutes.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function getRouteTicket($request)
8686
*/
8787
public function getRouteCategory($request)
8888
{
89-
if ($request->has('category_id')){
89+
if ($request->input('category_id') != ""){
9090
$category_id = $request->category_id;
9191
}else{
9292
if ($this->route_ticket){

0 commit comments

Comments
 (0)