diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php index fdf4738b4..3c85fb819 100644 --- a/app/Api/v1/ApiController.php +++ b/app/Api/v1/ApiController.php @@ -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; diff --git a/app/Api/v1/ApiExceptAuthController.php b/app/Api/v1/ApiExceptAuthController.php index 14bd09b0a..545da0ba0 100644 --- a/app/Api/v1/ApiExceptAuthController.php +++ b/app/Api/v1/ApiExceptAuthController.php @@ -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'; diff --git a/app/Api/v1/TokenAuthController.php b/app/Api/v1/TokenAuthController.php index f84c3d3da..70a8ec7b0 100644 --- a/app/Api/v1/TokenAuthController.php +++ b/app/Api/v1/TokenAuthController.php @@ -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]); diff --git a/app/Console/Commands/InstallDB.php b/app/Console/Commands/InstallDB.php index f689d5891..c2e1f0ec1 100644 --- a/app/Console/Commands/InstallDB.php +++ b/app/Console/Commands/InstallDB.php @@ -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(); diff --git a/app/Http/Controllers/Admin/helpdesk/FormController.php b/app/Http/Controllers/Admin/helpdesk/FormController.php index 58280f54d..735b8f4c6 100644 --- a/app/Http/Controllers/Admin/helpdesk/FormController.php +++ b/app/Http/Controllers/Admin/helpdesk/FormController.php @@ -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 '