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

Replace deprecated array and string helpers

Browse Source 
Laravel recommends using the `Str` and `Arr` class methods directly instead of the respective helper functions. These helper functions are deprecated in Laravel 5.8 and removed in Laravel 6.
This commit is contained in:
Shift
2023-01-06 11:53:35 +00:00
parent 03623d493d
commit b02541ac64
28 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@
namespace App\Api\v1;
use Illuminate\Support\Str;
use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController;
use App\Http\Controllers\Controller;
//use Illuminate\Support\Facades\Request as Value;
@@ -729,8 +730,8 @@ class ApiController extends Controller
}
$url = $this->request->input('url');
if (! str_is('*/', $url)) {
$url = str_finish($url, '/');
if (! Str::is('*/', $url)) {
$url = Str::finish($url, '/');
}
$url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token');
@@ -817,7 +818,7 @@ class ApiController extends Controller
$set = $this->setting->where('id', '1')->first();
//dd($set);
if ($set->api_enable == 1) {
$key = str_random(32);
$key = Str::random(32);
$set->api_key = $key;
$set->save();
$result = $set->api_key;
@@ -1661,7 +1662,7 @@ class ApiController extends Controller
return response()->json(compact('error'));
}
$str = str_random(8);
$str = Str::random(8);
$array = ['password' => $str, 'password_confirmation' => $str, 'email' => $this->request->input('email'), 'full_name' => $this->request->input('first_name')];
$all = $this->request->input();
$merged = $array + $all;

5
app/Api/v1/ApiExceptAuthController.php
View File

@@ -2,6 +2,7 @@
namespace App\Api\v1;
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
@@ -34,8 +35,8 @@ class ApiExceptAuthController extends Controller
}
$url = $this->request->input('url');
if (! str_is('*/', $url)) {
$url = str_finish($url, '/');
if (! Str::is('*/', $url)) {
$url = Str::finish($url, '/');
}
$url = $url.'api/v1/helpdesk/check-url';

3
app/Api/v1/TokenAuthController.php
View File

@@ -2,6 +2,7 @@
namespace App\Api\v1;
use Illuminate\Support\Str;
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Controller;
use App\User;
@@ -166,7 +167,7 @@ class TokenAuthController extends Controller
if (isset($user)) {
$user1 = $user->email;
//gen new code and pass
$code = str_random(60);
$code = Str::random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);

3
app/Console/Commands/InstallDB.php
View File

@@ -2,6 +2,7 @@
namespace App\Console\Commands;
use Illuminate\Support\Str;
use App\Http\Controllers\Installer\helpdesk\InstallController;
use DB;
use Illuminate\Console\Command;
@@ -78,7 +79,7 @@ class InstallDB extends Command
public function updateAppUrl()
{
$url = $this->ask('Enter your app url (with http/https and www/non www)');
if (str_finish($url, '/')) {
if (Str::finish($url, '/')) {
$url = rtrim($url, '/ ');
}
$systems = new \App\Model\helpdesk\Settings\System();

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// Controller
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// Model
use App\Model\helpdesk\Form\Fields;
@@ -136,7 +137,7 @@ class FormController extends Controller
$fields = [];
for ($i = 0; $i <= $count; $i++) {
if (! empty(Input::get('name')[$i])) {
$name = str_slug(Input::get('name')[$i], '_');
$name = Str::slug(Input::get('name')[$i], '_');
$field = Fields::create([
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
@@ -251,7 +252,7 @@ class FormController extends Controller
}
//dd(Input::get('label'),Input::get('name'),Input::get('type'),Input::get('required'));
for ($i = 0; $i < $count; $i++) {
$name = str_slug(Input::get('name')[$i], '_');
$name = Str::slug(Input::get('name')[$i], '_');
$field = $field->create([
'forms_id' => $forms->id,
'label' => Input::get('label')[$i],
@@ -384,7 +385,7 @@ class FormController extends Controller
'field_id' => $fieldid,
'child_id' => $childid,
'field_key' => $key,
'field_value' => str_slug($value, '_'),
'field_value' => Str::slug($value, '_'),
]);
}
}
@@ -443,12 +444,12 @@ class FormController extends Controller
}
return '<script>
$("#'.str_slug($value).'").on("change", function () {
var valueid = $("#'.str_slug($value).'").val();
var fieldid = $("#'.$fieldid.str_slug($value).'").val();
send'.$fieldid.str_slug($value).'(valueid,fieldid);
$("#'.Str::slug($value).'").on("change", function () {
var valueid = $("#'.Str::slug($value).'").val();
var fieldid = $("#'.$fieldid.Str::slug($value).'").val();
send'.$fieldid.Str::slug($value).'(valueid,fieldid);
});
function send'.$fieldid.str_slug($value).'(valueid,fieldid) {
function send'.$fieldid.Str::slug($value).'(valueid,fieldid) {
$.ajax({
url: "'.url('forms/render/child/').'",
dataType: "html",
@@ -554,8 +555,8 @@ class FormController extends Controller
if (count($values) > 0) {
foreach ($values as $field_value) {
$script = self::jqueryScript($field_value, $field->id, $field->name, $field_type);
$radio .= '<div>'.Form::hidden('fieldid[]', $field->id, ['id' => $field->id.str_slug($field_value)]);
$radio .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => str_slug($field_value), 'required' => $required]).$script.'<span> '.removeUnderscore($field_value).'</span></div>';
$radio .= '<div>'.Form::hidden('fieldid[]', $field->id, ['id' => $field->id.Str::slug($field_value)]);
$radio .= Form::$field_type($field->name, $field_value, null, ['class' => "$field->id", 'id' => Str::slug($field_value), 'required' => $required]).$script.'<span> '.removeUnderscore($field_value).'</span></div>';
}
$html = Form::label($field->label, $field->label, ['class' => $required_class]).'</br>'.$radio.'<div id='.$field->name.'></br></div>';
}

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\CompanyRequest;
@@ -572,7 +573,7 @@ class SettingsController extends Controller
*/
public function generateApiKey()
{
$key = str_random(32);
$key = Str::random(32);
return $key;
}

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\CompanyRequest;
@@ -718,7 +719,7 @@ class SettingsController2 extends Controller
*/
public function generateApiKey()
{
$key = str_random(32);
$key = Str::random(32);
return $key;
}

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Agent\helpdesk;
// models
use Illuminate\Support\Str;
use App\Http\Controllers\Admin\MailFetch as Fetch;
use App\Http\Controllers\Controller;
use App\Model\helpdesk\Email\Emails;
@@ -253,7 +254,7 @@ class MailController extends Controller
$disposition = $structure->disposition;
}
$filename = str_random(16).'-'.$attachment->getFileName();
$filename = Str::random(16).'-'.$attachment->getFileName();
$type = $attachment->getMimeType();
$size = $attachment->getSize();
$data = $attachment->getData();

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Agent\helpdesk;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Common\FileuploadController;
use App\Http\Controllers\Common\NotificationController as Notify;
use App\Http\Controllers\Common\PhpMailController;
@@ -665,7 +666,7 @@ class TicketController extends Controller
}
$user->role = 'user';
$user->active = $user_status;
$token = str_random(60);
$token = Str::random(60);
$user->remember_token = $token;
// mail user his/her password
//\Event::fire(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source));
@@ -2688,7 +2689,7 @@ class TicketController extends Controller
if (isset($tickets->ticket_title)) {
$string = utfEncoding($tickets->ticket_title);
if (strlen($string) > 25) {
$string = str_limit($string, 30).'...';
$string = Str::limit($string, 30).'...';
}
} else {
$string = Lang::get('lang.no-subject');
@@ -2757,7 +2758,7 @@ class TicketController extends Controller
$color = "<i class='fa fa-exclamation-triangle' title='".Lang::get('lang.accoutn-not-verified')."'></i>";
}
return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.strip_tags($name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".str_limit(strip_tags($name), 30).' <span style="color:#f75959">'.$color.'</span></span></a>';
return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.strip_tags($name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".Str::limit(strip_tags($name), 30).' <span style="color:#f75959">'.$color.'</span></span></a>';
})
->editColumn('a_uname', function ($tickets) {
if ($tickets->assigned_to == null && $tickets->name == null) {
@@ -3126,7 +3127,7 @@ class TicketController extends Controller
})
->addColumn('title', function ($tickets) {
if (isset($tickets->ticket_title)) {
$string = str_limit($tickets->ticket_title, 20);
$string = Str::limit($tickets->ticket_title, 20);
} else {
$string = '(no subject)';
}
@@ -3182,7 +3183,7 @@ class TicketController extends Controller
$color = "<i class='fa fa-exclamation-triangle' title='".Lang::get('lang.accoutn-not-verified')."'></i>";
}
return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.ucfirst($tickets->user_name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".ucfirst(str_limit($name, 30)).' <span style="color:#f75959">'.$color.'</span></span></a>';
return "<a href='".$url."' title='".Lang::get('lang.see-profile1').' '.ucfirst($tickets->user_name).'&apos;'.Lang::get('lang.see-profile2')."'><span style='color:#508983'>".ucfirst(Str::limit($name, 30)).' <span style="color:#f75959">'.$color.'</span></span></a>';
})
->addColumn('assign_user_name', function ($tickets) {
if ($tickets->assigned_to == null) {

7
app/Http/Controllers/Agent/kb/ArticleController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Agent\kb;
// Controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
// Requests
use App\Http\Requests\kb\ArticleRequest;
@@ -72,7 +73,7 @@ class ArticleController extends Controller
/* add column name */
->addColumn('name', function ($model) {
$name = str_limit($model->name, 20, '...');
$name = Str::limit($model->name, 20, '...');
return "<p title=$model->name>$name</p>";
})
@@ -155,7 +156,7 @@ class ArticleController extends Controller
$publishTime = $request->input('year').'-'.$request->input('month').'-'.$request->input('day').' '.$request->input('hour').':'.$request->input('minute').':00';
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
$article->slug = $slug;
$article->publish_time = $publishTime;
$article->fill($request->except('created_at', 'slug'))->save();
@@ -225,7 +226,7 @@ class ArticleController extends Controller
$id = $aid->id;
$sl = $request->input('slug');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
// dd($slug);
$article->slug = $slug;

7
app/Http/Controllers/Agent/kb/CategoryController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Agent\kb;
// Controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Agent\helpdesk\TicketController;
use App\Http\Controllers\Controller;
// Requests
@@ -77,7 +78,7 @@ class CategoryController extends Controller
->addColumn('name', function ($model) {
$string = strip_tags($model->name);
return str_limit($string, 20);
return Str::limit($string, 20);
})
/* add column Created */
->addColumn('Created', function ($model) {
@@ -140,7 +141,7 @@ class CategoryController extends Controller
{
/* Get the whole request from the form and insert into table via model */
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
$category->slug = $slug;
// send success message to index page
try {
@@ -182,7 +183,7 @@ class CategoryController extends Controller
/* Edit the selected category via id */
$category = Category::where('id', $id)->first();
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
/* update the values at the table via model according with the request */
//redirct to index page with success message
try {

5
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Agent\kb;
use Illuminate\Support\Str;
use App\Http\Controllers\Agent\helpdesk\TicketController;
use App\Http\Controllers\Controller;
// request
@@ -126,7 +127,7 @@ class PageController extends Controller
public function store(PageRequest $request)
{
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
$this->page->slug = $slug;
try {
@@ -167,7 +168,7 @@ class PageController extends Controller
// get pages with respect to slug
$pages = $this->page->where('slug', $slug)->first();
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$slug = Str::slug($sl, '-');
try {
$pages->fill($request->all())->save();

3
app/Http/Controllers/Auth/AuthController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Admin\helpdesk\SocialMedia\SocialMediaController;
use App\Http\Controllers\Common\PhpMailController;
// requests
@@ -179,7 +180,7 @@ class AuthController extends Controller
$user->user_name = $request->input('email');
}
$user->role = 'user';
$code = str_random(60);
$code = Str::random(60);
$user->remember_token = $code;
$user->save();
$message12 = '';

3
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Support\Str;
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Controller;
use App\User;
@@ -51,7 +52,7 @@ class ForgotPasswordController extends Controller
if (isset($user)) {
$user1 = $user->email;
//gen new code and pass
$code = str_random(60);
$code = Str::random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);

3
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Auth;
// controllers
use Illuminate\Support\Str;
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Controller;
// request
@@ -58,7 +59,7 @@ class PasswordController extends Controller
if (isset($user)) {
$user1 = $user->email;
//gen new code and pass
$code = str_random(60);
$code = Str::random(60);
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Common;
// controllers
use Illuminate\Support\Arr;
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests;
@@ -303,7 +304,7 @@ class SettingsController extends Controller
return \Datatable::collection(new Collection($plugins))
->searchColumns('name')
->addColumn('name', function ($model) {
if (array_has($model, 'path')) {
if (Arr::has($model, 'path')) {
if ($model['status'] == 0) {
$activate = '<a href='.url('plugin/status/'.$model['path']).'>Activate</a>';
$settings = ' ';

5
app/Http/Controllers/Update/UpgradeController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Update;
use Illuminate\Support\Str;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Utility\LibraryController as Utility;
use App\Model\Update\BarNotification;
@@ -43,7 +44,7 @@ class UpgradeController extends Controller
'data' => $data,
];
$url = 'http://faveohelpdesk.com/billing/public/verification';
if (str_contains($url, ' ')) {
if (Str::contains($url, ' ')) {
$url = str_replace(' ', '%20', $url);
}
$curl = $this->postCurl($url, $post_data);
@@ -65,7 +66,7 @@ class UpgradeController extends Controller
{
$name = \Config::get('app.name');
$durl = 'http://www.faveohelpdesk.com/billing/public/download-url';
if (str_contains($durl, ' ')) {
if (Str::contains($durl, ' ')) {
$durl = str_replace(' ', '%20', $durl);
}
$data = [

3
app/Http/Requests/helpdesk/ClientRequest.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Requests\helpdesk;
use Illuminate\Support\Arr;
use App\Http\Requests\Request;
use App\Model\helpdesk\Settings\CommonSettings;
@@ -158,6 +159,6 @@ class ClientRequest extends Request
// $purified[] = $this->purifyArray($value);
// }
// }
// return array_dot($purified);
// return Arr::dot($purified);
// }
}

6
app/Http/helpers.php
View File

@@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Str;
function loging($context, $message, $level = 'error', $array = [])
{
\Log::$level($message.':-:-:-'.$context, $array);
@@ -30,14 +32,14 @@ function mime($type)
$type == 'image/gif' ||
// $type == "application/octet-stream" ||
$type == 'image/png' ||
starts_with($type, 'image')) {
Str::startsWith($type, 'image')) {
return 'image';
}
}
function removeUnderscore($string)
{
if (str_contains($string, '_') === true) {
if (Str::contains($string, '_') === true) {
$string = str_replace('_', ' ', $string);
}

3
app/Model/helpdesk/Ticket/Ticket_attachments.php
View File

@@ -2,6 +2,7 @@
namespace App\Model\helpdesk\Ticket;
use Illuminate\Support\Str;
use Illuminate\Database\Eloquent\Model;
class Ticket_attachments extends Model
@@ -60,7 +61,7 @@ class Ticket_attachments extends Model
return '<li style="background-color:#f4f4f4;"><span class="mailbox-attachment-icon has-img">'.$var.'</span><div class="mailbox-attachment-info"><b style="word-wrap: break-word;">'.$this->name.'</b><br/><p>'.$value.'</p></div></li>';
} else {
$var = '<a style="max-width:200px;height:133px;color:#666;" href="'.\URL::route('image', ['image_id' => $this->id]).'" target="_blank"><span class="mailbox-attachment-icon" style="background-color:#fff; font-size:18px;">'.strtoupper(str_limit($this->type, 15)).'</span><div class="mailbox-attachment-info"><span ><b style="word-wrap: break-word;">'.$this->name.'</b><br/><p>'.$value.'</p></span></div></a>';
$var = '<a style="max-width:200px;height:133px;color:#666;" href="'.\URL::route('image', ['image_id' => $this->id]).'" target="_blank"><span class="mailbox-attachment-icon" style="background-color:#fff; font-size:18px;">'.strtoupper(Str::limit($this->type, 15)).'</span><div class="mailbox-attachment-info"><span ><b style="word-wrap: break-word;">'.$this->name.'</b><br/><p>'.$value.'</p></span></div></a>';
return '<li style="background-color:#f4f4f4;">'.$var.'</li>';
}