refactor
This commit is contained in:
@@ -7,11 +7,11 @@ function getDynamicPermission($file): int {
|
||||
$permission_level = $page_tmp["parameters"]["minimal_permission_level"];
|
||||
|
||||
if (!is_numeric($permission_level) || $permission_level <= 0) {
|
||||
$permission_level = $routerConfig["default_page_permission_level"];
|
||||
$permission_level = $routerConfig["page"]["default_permissions"];
|
||||
}
|
||||
}
|
||||
catch (Exception){
|
||||
$permission_level = $routerConfig["default_page_permission_level"];
|
||||
$permission_level = $routerConfig["page"]["default_permissions"];
|
||||
} finally {
|
||||
return $permission_level;
|
||||
}
|
||||
@@ -32,16 +32,11 @@ function generateNavigation(): string
|
||||
|
||||
$site_name = str_replace("_", " ", $site_dir);
|
||||
|
||||
$site_subdomain = $site_dir . ".";
|
||||
if ($site_name == $routerConfig["default_site"]) {
|
||||
$site_subdomain = "";
|
||||
}
|
||||
|
||||
$site_name = ucfirst($site_name);
|
||||
|
||||
$site_location = $routerConfig["protocol"] . $site_subdomain . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"];
|
||||
$site_location = "/" . $site_dir . "/" . $routerConfig["default_page"];
|
||||
|
||||
if ($routerRequest["subdomain"] == $site_dir) {
|
||||
if ($routerRequest["site_name"] == $site_dir) {
|
||||
//this is the current page
|
||||
$site_class = "class=\"navsite_link active\"";
|
||||
}
|
||||
@@ -49,17 +44,17 @@ function generateNavigation(): string
|
||||
$site_class = "class=\"navsite_link\"";
|
||||
}
|
||||
|
||||
$navpages = "";
|
||||
$navigation_pages = "";
|
||||
|
||||
foreach ($pages_dir as $page_file) {
|
||||
$page_file_tmp = explode(".", $page_file);
|
||||
$page_basename = $page_file_tmp[0];
|
||||
$page_class = "class=\"navpage_link\"";
|
||||
if ($routerRequest["subdomain"] == $site_dir && $routerRequest["page_name"] == $page_basename) {
|
||||
if ($routerRequest["site_name"] == $site_dir && $routerRequest["page_name"] == $page_basename) {
|
||||
$page_class = "class=\"navpage_link active\"";
|
||||
}
|
||||
|
||||
$page_location = $routerConfig["protocol"] . $site_subdomain . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $page_basename;
|
||||
$page_location = "/" . $site_dir . "/" . $page_basename;
|
||||
|
||||
$page_name = str_replace("_", " ", $page_basename);
|
||||
$page_name = explode(".", $page_name)[0];
|
||||
@@ -73,23 +68,26 @@ function generateNavigation(): string
|
||||
$page_required_permission = intval($pageMetadata["parameters"]["minimal_permission_level"]);
|
||||
}
|
||||
else{
|
||||
$page_required_permission = $routerConfig["default_page_permission_level"];
|
||||
$page_required_permission = $routerConfig["page"]["default_permissions"];
|
||||
}
|
||||
}
|
||||
elseif($page_file_tmp[1] == "php"){
|
||||
$page_required_permission = getDynamicPermission($page_file_path);
|
||||
}
|
||||
else{
|
||||
$page_required_permission = $routerConfig["default_page_permission_level"];
|
||||
$page_required_permission = $routerConfig["page"]["default_permissions"];
|
||||
}
|
||||
|
||||
|
||||
if($page_required_permission <= $_SESSION["privilege_level"]) {
|
||||
$navpages .= "<li class='navpage_item' data-site='$site_dir' data-page='$page_basename'><a data-site='$site_dir' data-page='$page_basename' href='$page_location' $page_class>$page_name</a></li>";
|
||||
$navpage_attributes = "data-site='$site_dir' data-page='$page_basename'";
|
||||
$navigation_pages .= "<li class='navpage_item' $navpage_attributes ><a $navpage_attributes href='$page_location' $page_class>$page_name</a></li>";
|
||||
}
|
||||
}
|
||||
if(!empty($navpages)){
|
||||
if(!empty($navigation_pages)){
|
||||
$default_page = $routerConfig["default_page"];
|
||||
$nav_out .= "<li class='navsite_item' data-page='$default_page' data-site='$site_dir'><a data-page='$default_page' data-site='$site_dir' href='$site_location' $site_class>$site_name</a><ul class='navpage_list'>$navpages</ul></li>";
|
||||
$navsite_attributes = "data-page='$default_page' data-site='$site_dir'";
|
||||
$nav_out .= "<li class='navsite_item' ><a $navsite_attributes href='$site_location' $site_class>$site_name</a><ul class='navpage_list'>$navigation_pages</ul></li>";
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user