From 91c4415fcc336c3117157368da7a4b6796722f66 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Sun, 10 Jan 2021 22:42:14 +0300 Subject: [PATCH 1/4] Security update for axios --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5d22e8d9..048feaf8a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" }, "devDependencies": { - "axios": "^0.19", + "axios": "^0.21", "bootstrap": "^4.1.0", "cross-env": "^5.1", "jquery": "^3.2", From 0a89b2984529a9838e945e1e0b93ec67939b0d21 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Sun, 10 Jan 2021 23:15:29 +0300 Subject: [PATCH 2/4] #2974 - Remove role base - My dopings shows 403 with standard user --- .../advs-module/src/Http/Controller/advsController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 89fad88d1..b64c5e83e 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -625,9 +625,6 @@ class AdvsController extends PublicController } $isActiveDopings = $this->adv_model->is_enabled('dopings'); - if ($isActiveDopings) { - $isActiveDopings = doping_check_role(); - } return $this->view->make('visiosoft.module.advs::new-ad/preview/preview', compact('adv', 'categories', 'features', 'isActiveDopings')); From c310aace1739b556e74f510d1fa521109397b988 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 14 Jan 2021 14:51:59 +0300 Subject: [PATCH 3/4] #3116 [advs-list] Custom fields bug fixed --- .../visiosoft/advs-module/resources/views/list/list.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 91f262d86..fcba046c6 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -79,7 +79,7 @@ {{ addBlock('ads-list/row-bottom',{'show_favorite_search':true})|raw }} - {{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs})|raw }} + {{ addBlock('ads-list/row',{'topfields':topfields,'selectRange':selectRange,'advs':advs, 'mainCats':mainCats|length})|raw }}
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} From 5ac2789a279ae72c2afd025bac3f59d6e8b9aef4 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 15 Jan 2021 16:24:10 +0300 Subject: [PATCH 4/4] add isset for HTTP_ACCEPT_LANGUAGE --- app/Providers/AppServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 73720e8fa..b16d7ffd7 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -16,7 +16,7 @@ class AppServiceProvider extends ServiceProvider { //Auto Language Switcher view()->composer('*', function ($view) { - if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale'))) { + if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language $acceptLang = config('streams::locales.enabled'); //Supported Language $lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en');