Fixed subdir install url path

Author: givanz

system/routes.php

@@ -111,6 +111,7 @@ public static function init() {
 		}
 
 		self :: $init = true;
+
 		return true;
 	}
 
@@ -139,6 +140,10 @@ public static function get($route) {
 		return self :: $routes[$route] ?? [];
 	}
 
+	public static function getRoutes() {
+		return self :: $routes ?? [];
+	}
+
 	public static function varReplace($url, $parameters) {
 		return preg_replace_callback('/' . self :: stringRegex . '|' . self :: numericRegex . '/',
 			function ($matches) use ($parameters) {
@@ -228,9 +233,9 @@ function ($matches) use ($parameters, &$missing) {
 				}, $pattern);
 
 			if ($missing) {
-				return (V_SUBDIR_INSTALL ? V_SUBDIR_INSTALL : '') . '/?route=' . $route . '&' . (is_array($parameters) ? http_build_query($parameters) : '');
+				return '/?route=' . $route . '&' . (is_array($parameters) ? http_build_query($parameters) : '');
 			} else {
-				return (V_SUBDIR_INSTALL ? V_SUBDIR_INSTALL : '') . $url;
+				return $url;
 			}
 		}
 	}

system/sites.php

@@ -164,7 +164,8 @@ public static function url($url, $host = null) {
 				return $matches['prefix'] .
 					   $subdomain . ($subdomain ? '.' : '') .
 					   $domain . ($tld ? '.' : '') . $tld .
-					   ($matches['path'] ?? '');
+					   ($matches['path'] ?? '') .
+					   (V_SUBDIR_INSTALL ? V_SUBDIR_INSTALL : '');
 			}
 
 			//if host is ip number, localhost or does not have tld remove tld and subdomain
@@ -177,7 +178,8 @@ public static function url($url, $host = null) {
 				   (! empty($matches['subdomain']) ? $matches['subdomain'] . '.' : '') .
 				   ($matches['domain'] ?? '') .
 				   (! empty($matches['tld']) ? '.' . $matches['tld'] : '') .
-				   ($matches['path'] ?? '');
+				   ($matches['path'] ?? '') .
+				   (V_SUBDIR_INSTALL ? V_SUBDIR_INSTALL : '');
 		}
 
 		return $url;
@@ -238,8 +240,6 @@ public static function setSiteData($site, $name, $value) {
 		} else {
 			return self :: setSiteDataByKey($site, $name, $value);
 		}
-
-		return false;
 	}
 
 	public static function getHost() {
@@ -254,7 +254,7 @@ public static function getSiteData($site_url = false) {
 		}
 
 		if (! $site_url) {
-			$host =$_SERVER['HTTP_HOST'] ?? 'localhost';
+			$host = $_SERVER['HTTP_HOST'] ?? 'localhost';
 		}
 
 		$host = self :: siteKey($host);