mirror of
https://github.com/openclassify/openclassify.git
synced 2026-01-24 22:11:01 -06:00
added show url language parameters
This commit is contained in:
parent
76caa0a233
commit
997f7ee5dc
@ -8,6 +8,7 @@ return [
|
|||||||
'title' => 'visiosoft.module.advs::section.general',
|
'title' => 'visiosoft.module.advs::section.general',
|
||||||
'fields' => [
|
'fields' => [
|
||||||
'market_place',
|
'market_place',
|
||||||
|
'show_lang_url',
|
||||||
'iban_numbers',
|
'iban_numbers',
|
||||||
'google_statistic_code',
|
'google_statistic_code',
|
||||||
'ogImage',
|
'ogImage',
|
||||||
|
|||||||
@ -228,4 +228,11 @@ return [
|
|||||||
'default_value' => false,
|
'default_value' => false,
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'show_lang_url' => [
|
||||||
|
'type' => 'anomaly.field_type.boolean',
|
||||||
|
'config' => [
|
||||||
|
'default_value' => false,
|
||||||
|
]
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@ -146,4 +146,7 @@ return [
|
|||||||
'hide_map_filter' => [
|
'hide_map_filter' => [
|
||||||
'name' => 'Hide Map Filter',
|
'name' => 'Hide Map Filter',
|
||||||
],
|
],
|
||||||
|
'show_lang_url' => [
|
||||||
|
'name' => 'Show Lang Parameter For URL',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@ -31,26 +31,32 @@ class redirectDiffrentLang
|
|||||||
|
|
||||||
public function handle(Request $request, Closure $next)
|
public function handle(Request $request, Closure $next)
|
||||||
{
|
{
|
||||||
$original_url = $request->server->get('ORIGINAL_REQUEST_URI');
|
if (setting_value('visiosoft.module.advs::show_lang_url')) {
|
||||||
$setting_language = setting_value('streams::default_locale');
|
$original_url = $request->server->get('ORIGINAL_REQUEST_URI');
|
||||||
$current_language = $request->session()->get('_locale', $setting_language);
|
$setting_language = setting_value('streams::default_locale');
|
||||||
$request_url = ltrim($request->getRequestUri(), '/');
|
$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.
|
$not_included = [
|
||||||
if ($request->segment(1) == "admin" and in_array($current_language, explode('/', $original_url))) {
|
'admin',
|
||||||
return $this->redirect->to($request->fullUrl());
|
'social'
|
||||||
}
|
];
|
||||||
|
|
||||||
if ($current_language != $setting_language) {
|
// If the segment(1) is admin and language parameters is not null, no forwarding will be made.
|
||||||
|
if (in_array($request->segment(1), $not_included) and in_array($current_language, explode('/', $original_url))) {
|
||||||
|
return $this->redirect->to($request->fullUrl());
|
||||||
|
}
|
||||||
|
|
||||||
// If the method is get, no forwarding will be made.
|
if ($current_language != $setting_language) {
|
||||||
// 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) {
|
// If the method is get, no forwarding will be made.
|
||||||
return $this->redirect->to('/' . $current_language . '/' . $request_url);
|
// If the segment(1) is admin, no forwarding will be made.
|
||||||
|
|
||||||
|
if ($request->method() == "GET" and !in_array($request->segment(1), $not_included) and $request_url != "" and $original_url != '/' . $current_language . '/' . $request_url) {
|
||||||
|
return $this->redirect->to('/' . $current_language . '/' . $request_url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $next($request);
|
return $next($request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user