diff --git a/lib/navigation.php b/lib/navigation.php index d5fdfff..e4b6b4b 100644 --- a/lib/navigation.php +++ b/lib/navigation.php @@ -20,7 +20,10 @@ function generateNavigation(): string $site_name = str_replace("_", " ", $site_dir); if ($site_name == "global") { $site_name = "misc"; - $site_dir = $routerConfig["default_site"]; + $site_subdomain = $routerConfig["default_site"]; + } + else{ + $site_subdomain = $site_dir; } if ($site_name == "smp") { @@ -29,7 +32,7 @@ function generateNavigation(): string $site_name = ucfirst($site_name); } - $site_location = $routerConfig["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"]; + $site_location = $routerConfig["protocol"] . $site_subdomain . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"]; if ($routerRequest["subdomain"] == $site_dir) { //this is the current page @@ -40,6 +43,7 @@ function generateNavigation(): string } $navpages = ""; + foreach ($pages_dir as $page_file) { $page_dir_tmp = explode(".", $page_file); $page_dir = $page_dir_tmp[0]; @@ -48,15 +52,14 @@ function generateNavigation(): string $page_class = "class=\"navpage_link active\""; } - $page_location = $routerConfig["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $page_dir; + $page_location = $routerConfig["protocol"] . $site_subdomain . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $page_dir; $page_name = str_replace("_", " ", $page_dir); $page_name = explode(".", $page_name)[0]; $page_name = ucfirst($page_name); - $page_file = $routerConfig["page_dir"] . $site_dir . "/" . $page_file ; - + $page_file_path = $routerConfig["page_dir"] . $site_dir . "/" . $page_file ; if($page_dir_tmp[1] == "html"){ - $page_tmp = file_get_contents($page_file); + $page_tmp = file_get_contents($page_file_path); $pageMetadata = parsePageTag($page_tmp); if(!empty($pageMetadata["parameters"]["minimal_permission_level"])){ @@ -67,7 +70,7 @@ function generateNavigation(): string } } elseif($page_dir_tmp[1] == "php"){ - $page_required_permission = getDynamicPermission($page_file); + $page_required_permission = getDynamicPermission($page_file_path); } else{ $page_required_permission = $routerConfig["default_page_permission_level"];