From 01f5737761b892413df29625ed1895dba0568d28 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 20 Aug 2020 09:29:57 +0300 Subject: [PATCH 1/2] add page layouts --- .../resources/views/layouts/page.twig | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 addons/default/visiosoft/base-theme/resources/views/layouts/page.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig new file mode 100644 index 000000000..7ac84f568 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig @@ -0,0 +1,37 @@ + + + + + + + + + + + {% include "visiosoft.theme.base::partials/metadata" %} + {% block styles %}{% endblock %} + + + + +{% include "visiosoft.theme.base::partials/header" %} + +
+
+ + {% include "visiosoft.theme.base::partials/messages" %} + + {% block content %}{% endblock %} + +
+
+ +{% include "visiosoft.theme.base::partials/footer" %} +{% include "visiosoft.theme.base::partials/settings" %} + + + \ No newline at end of file From b22ecb1d60b6d497c6d3372d318b1273634111b9 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 20 Aug 2020 13:16:02 +0300 Subject: [PATCH 2/2] fixed redirect problem --- .../src/Http/Middleware/redirectDiffrentLang.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php index dd71ae2ca..6475f893f 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php +++ b/addons/default/visiosoft/advs-module/src/Http/Middleware/redirectDiffrentLang.php @@ -35,14 +35,20 @@ class redirectDiffrentLang $setting_language = setting_value('streams::default_locale'); $current_language = $request->session()->get('_locale', $setting_language); $request_url = ltrim($request->getRequestUri(), '/'); + + // If the segment(1) is admin and language parameters is not null, no forwarding will be made. + if ($request->segment(1) == "admin" and in_array($current_language, explode('/', $original_url))) { + return $this->redirect->to($request->fullUrl()); + } + if ($current_language != $setting_language) { - if ($request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) { + + // If the method is get, no forwarding will be made. + // If the segment(1) is admin, no forwarding will be made. + + if ($request->method() == "GET" and $request->segment(1) != "admin" and $request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) { return $this->redirect->to('/' . $current_language . '/' . $request_url); } - } else { - if ($request_url == "" and '/' . $current_language != $original_url) { - $this->redirect->to($current_language); - } } return $next($request);