rtrim slash

main
Robert 5 months ago
parent 8b02110167
commit 3f91fc5272
  1. 10
      src/classes/misc.php

@ -274,7 +274,7 @@ final class misc {
*/ */
public static function get_url(string $route, string $method, $vars = ''): string { public static function get_url(string $route, string $method, $vars = ''): string {
$route = ltrim($route, "/"); $route = ltrim($route, "/");
if (is_array($vars)) { if (is_array($vars)) {
$vars = http_build_query($vars); $vars = http_build_query($vars);
} elseif (is_string($vars) && !empty($vars)) { } elseif (is_string($vars) && !empty($vars)) {
@ -283,10 +283,10 @@ final class misc {
if (bootstrap\configure::get('CodeHydrater', 'short_url') === true) { if (bootstrap\configure::get('CodeHydrater', 'short_url') === true) {
$vars = (!empty($vars)) ? "?{$vars}" : ''; $vars = (!empty($vars)) ? "?{$vars}" : '';
return PROJECT_BASE_REF . "/{$route}/{$method}.html{$vars}"; return rtrim(PROJECT_BASE_REF, "/") . "/{$route}/{$method}.html{$vars}";
} else { } else {
$vars = (!empty($vars)) ? "&{$vars}" : ''; $vars = (!empty($vars)) ? "&{$vars}" : '';
return PROJECT_BASE_REF . "?route={$route}&m={$method}{$vars}"; return rtrim(PROJECT_BASE_REF, "/") . "?route={$route}&m={$method}{$vars}";
} }
} }
@ -308,10 +308,10 @@ final class misc {
if (bootstrap\configure::get("CodeHydrater", 'short_url') === true) { if (bootstrap\configure::get("CodeHydrater", 'short_url') === true) {
$vars = (!empty($vars)) ? "?{$vars}" : '?x=0'; $vars = (!empty($vars)) ? "?{$vars}" : '?x=0';
return PROJECT_BASE_REF . "/api/{$route}/{$method}{$vars}&api=true"; return rtrim(PROJECT_BASE_REF, "/") . "/api/{$route}/{$method}{$vars}&api=true";
} else { } else {
$vars = (!empty($vars)) ? "&{$vars}" : ''; $vars = (!empty($vars)) ? "&{$vars}" : '';
return PROJECT_BASE_REF . "?route={$route}&m={$method}&code=/api/{$vars}&api=true"; return rtrim(PROJECT_BASE_REF, "/") . "?route={$route}&m={$method}&code=/api/{$vars}&api=true";
} }
} }

Loading…
Cancel
Save