|
@@ -48,7 +48,7 @@ class Util
|
|
|
{
|
|
{
|
|
|
if (!filter_var($url, FILTER_VALIDATE_URL)) {
|
|
if (!filter_var($url, FILTER_VALIDATE_URL)) {
|
|
|
if (empty($url)) return $url;
|
|
if (empty($url)) return $url;
|
|
|
- $newUrl = config('app.url') . $url;
|
|
|
|
|
|
|
+ $newUrl = rtrim(config('app.url'), '/') . '/' . ltrim($url, '/');
|
|
|
return filter_var($newUrl, FILTER_VALIDATE_URL) ? $newUrl : $url;
|
|
return filter_var($newUrl, FILTER_VALIDATE_URL) ? $newUrl : $url;
|
|
|
}
|
|
}
|
|
|
return $url;
|
|
return $url;
|
|
@@ -56,9 +56,14 @@ class Util
|
|
|
|
|
|
|
|
public static function replacePartInUrl($url)
|
|
public static function replacePartInUrl($url)
|
|
|
{
|
|
{
|
|
|
|
|
+ if (empty($url) || !is_string($url)) {
|
|
|
|
|
+ return $url;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
if (filter_var($url, FILTER_VALIDATE_URL)) {
|
|
if (filter_var($url, FILTER_VALIDATE_URL)) {
|
|
|
- $target = config('app.url');
|
|
|
|
|
- return str_replace($target, '', $url);
|
|
|
|
|
|
|
+ $path = parse_url($url, PHP_URL_PATH) ?: '';
|
|
|
|
|
+ $query = parse_url($url, PHP_URL_QUERY);
|
|
|
|
|
+ return $query ? "{$path}?{$query}" : $path;
|
|
|
}
|
|
}
|
|
|
return $url;
|
|
return $url;
|
|
|
}
|
|
}
|