Do some maintenance with phpstorm

2024-01-16 20:43:57 +01:00
parent ec725fd689
commit 02d480d31a
8 changed files with 135 additions and 137 deletions
--- a/lib/account.php
+++ b/lib/account.php
@@ -19,13 +19,13 @@ function doLogin(){
        $nickname = "";
        $pwdhash = "";
        $mcnick = "";
-        $isadmin = false;
        /* bind variables to prepared statement */
-        $stmt->bind_result($idcko, $fname, $lname, $nickname, $pwdhash, $mcnick, $isadmin);
-        
-        $found = false;
+        $stmt->bind_result($idcko, $fname, $lname, $nickname, $pwdhash, $mcnick, false);
+
        /* fetch values */
-        while ($stmt->fetch()) {
+        $found = false;
+        if($stmt->num_rows() > 0){
+            $stmt->fetch();
            if (password_verify($pass, $pwdhash)){
                $_SESSION["ID"] = $idcko;
                $_SESSION["first_name"] = $fname;
@@ -33,14 +33,9 @@ function doLogin(){
                $_SESSION["nickname"] = $nickname;
                $_SESSION["email"] = $email;
                $_SESSION["mcnick"] = $mcnick;
-                $_SESSION["isadmin"] = $isadmin;
-                $found = true; 
-                break;
+                $_SESSION["isadmin"] = false;
+                $found = true;
            }
-            else{
-                $found = false;
-            }
-            break;
        }
        $stmt->close();
        if($found){
@@ -76,7 +71,7 @@ function doRegister(){
        $password = $_POST["password"];
        $minecraftNick = $_POST["minecraftnick"];
        $activationToken = $_POST["activationtoken"];
-        if (!empty($firstName) && !empty($lastName) && !empty($nickname) && !empty($email) && !empty($password) && !empty($activationToken)){
+        if (!empty($firstName) && !empty($lastName) && !empty($nickname) && !empty($email) && !empty($password)) {
            $passwordHash = password_hash($password, PASSWORD_DEFAULT);

            $stmt = $mysqli->prepare("UPDATE Users SET FirstName = ?, LastName = ?, Nickname = ?, Email = ?, PasswordHash = ?, MinecraftNick = ?, isAdmin = 0, isActivated = 1 WHERE isActivated = 0 AND ActivationToken = ?");
@@ -88,6 +83,6 @@ function doRegister(){
            $stmt->close();
        }
    }
+    echo json_encode($status);
 }

-?>
--- a/lib/navpages.php
+++ b/lib/navpages.php
@@ -1,44 +1,50 @@
 <?php

-function generateNavigation($static_page_dir, $protocol, $subdomain, $domain, $tld, $default_page, $page_name)
+function generateNavigation()
 {
+    global $routerConfig;
+    global $routerRequest;
+
    $navsite_template = '<li class="navsite_item"><a href="__LOCATION__" __CLASS__>__NAME__</a><ul class="navpage_list">__NAVPAGES__</ul></li>';
    $navpage_template = '<li class="navpage_item"><a href="__LOCATION__" __CLASS__>__NAME__</a></li>';

-    $site_dirs = array_diff(scandir($static_page_dir), array('.', '..'));
+    $site_dirs = array_diff(scandir($routerConfig["static_page_dir"]), array('.', '..'));

    $nav_out = "";

    foreach ($site_dirs as $site_dir) {
-        $pages_dir = array_diff(scandir("$static_page_dir$site_dir"), array('.', '..'));
+        $pages_dir = array_diff(scandir($routerConfig["static_page_dir"] . $site_dir), array('.', '..'));

        $navsite = $navsite_template;
-        $site_class = "class=\"navsite_link\"";
        $site_name = str_replace("_", " ", $site_dir);
        if ($site_name == "global") {
            $site_name = "misc";
-            $site_dir = $default_page;
+            $site_dir = $routerConfig["default_page"];
        }
-        $site_location = "$protocol$site_dir.$domain.$tld/$default_page";
-        $navsite = str_replace("__CLASS__", $site_class, $navsite);
-        $navsite = str_replace("__LOCATION__", $site_location, $navsite);
-        $navsite = str_replace("__NAME__", ucfirst($site_name), $navsite);
+        $site_location = $routerRequest["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"];

-        if ($subdomain == $site_dir) {
+        if ($routerRequest["subdomain"] == $site_dir) {
            //this is the current page
            $site_class = "class=\"navsite_link active\"";
        }
+        else{
+            $site_class = "class=\"navsite_link\"";
+        }
+
+        $navsite = str_replace("__CLASS__", $site_class, $navsite);
+        $navsite = str_replace("__LOCATION__", $site_location, $navsite);
+        $navsite = str_replace("__NAME__", ucfirst($site_name), $navsite);

        $navpages = "";
        foreach ($pages_dir as $page_dir) {
            $page_dir = explode(".", $page_dir)[0];
            $navpage = $navpage_template;
            $page_class = "class=\"navpage_link\"";
-            if ($subdomain == $site_dir && $page_name == $page_dir) {
+            if ($routerRequest["subdomain"] == $site_dir && $routerRequest["page_name"] == $page_dir) {
                $page_class = "class=\"navpage_link active\"";
            }

-            $page_location = "$protocol$site_dir.$domain.$tld/$page_dir";
+            $page_location = $routerRequest["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $page_dir;

            $page_name = str_replace("_", " ", $page_dir);
            $page_name = explode(".", $page_name)[0];
@@ -55,4 +61,4 @@ function generateNavigation($static_page_dir, $protocol, $subdomain, $domain, $t
    return $nav_out;
 }

-?>
+
--- a/lib/routing.php
+++ b/lib/routing.php
@@ -1,74 +1,90 @@
 <?php

 function getProtocol(){
-    if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && !empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
+    if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
        return "https://";
    } else {
+        /** @noinspection HttpUrlsUsage */
        return "http://";
    }
 }

-function getPage($routerConfig){
-    $default_page = "domov";
+function initRouter(){
+    global $routerRequest;
+    global $routerConfig;

-    $default_site = "home";
+    $routerRequest["protocol"] = getProtocol();
+    $routerRequest["requestAddress"] = array_slice(explode('.', $_SERVER['HTTP_HOST']), -3, 3); //get the last 3 elements

-    $template_dir = "templates/";
+    $needsRedirect = false;

-    $static_page_dir = "pages/";
+    if(count($routerRequest["requestAddress"]) < 3){
+        // Root domain accessed directly
+        $needsRedirect = true;
+    } else {
+        $routerRequest["subdomain"] = basename($routerRequest["requestAddress"][0]);
+        $routerRequest["domain"] = basename($routerRequest["requestAddress"][1]);
+        $routerRequest["tld"] = basename($routerRequest["requestAddress"][2]);

-    $dynamic_page_dir = "dynamic/";
+        $routerRequest["page_name"] = basename($_SERVER["QUERY_STRING"]);

-    $subdomain = basename(explode('.', $_SERVER['HTTP_HOST'])[0]);
-    $domain = basename(explode('.', $_SERVER['HTTP_HOST'])[1]);
-    $tld = basename(explode('.', $_SERVER['HTTP_HOST'])[2]);
-    $page_name = basename($_SERVER["QUERY_STRING"]);
-    $protocol = getProtocol();
-
-    if (empty($tld)){
-        header("Location: $protocol$default_site.$subdomain.$domain/$default_page");
-        return;
+        if (empty($routerRequest["page_name"])){
+            $needsRedirect = true;
+        }
    }

-    if (empty($page_name)){
-        header("Location: $protocol$subdomain.$domain.$tld/$default_page");
-        return;
+    if ($needsRedirect) {
+        $redirectAddress = implode('.', $routerRequest["requestAddress"]);
+        header("Location: " . $routerRequest["protocol"] . $redirectAddress . "/" . $routerConfig["default_page"]);
    }
-    $page_dir = "pages/";
+    return !$needsRedirect;
+}

-    $dynamic_page_file = $page_dir . $subdomain . "/" . $page_name . ".php";
-    $page_file = $page_dir . $subdomain . "/" . $page_name . ".html";
+function renderDynamicPage($page_file)
+{
+    require_once $page_file;
+    return render();
+}

-    $dynamic_page_file_global = $page_dir . "global/" . $page_name . ".php";
-    $page_file_global = $page_dir . "global/" . $page_name . ".html";
+function getPage($page_name = null){
+    global $routerConfig;
+    global $routerRequest;

-    $skeleton = file_get_contents($template_dir . "skeleton.html");
-    $nav = file_get_contents($template_dir . "nav.html");
+    if(!$page_name){
+        $page_name = $routerRequest["page_name"];
+    }
+
+    $dynamic_page_file = $routerRequest["page_dir"] . $routerRequest["subdomain"] . "/" . $page_name . ".php";
+    $page_file = $routerRequest["page_dir"] . $routerRequest["subdomain"] . "/" . $page_name . ".html";
+
+    $dynamic_page_file_global = $routerRequest["page_dir"] . "global/" . $page_name . ".php";
+    $page_file_global = $routerRequest["page_dir"] . "global/" . $page_name . ".html";
+
+    $skeleton = file_get_contents($routerConfig["template_dir"] . "skeleton.html");
+    $nav = file_get_contents($routerConfig["template_dir"] . "nav.html");

    if (file_exists($dynamic_page_file_global)){
-        $page = include_once $dynamic_page_file_global;
+        $page = renderDynamicPage($dynamic_page_file_global);
    }
    elseif (file_exists($page_file_global)){
        $page = file_get_contents($page_file_global);
    }
    elseif (file_exists($dynamic_page_file)){
-        $page = include_once $dynamic_page_file;
+        $page = renderDynamicPage($dynamic_page_file);
    }
    elseif (file_exists($page_file)){
        $page = file_get_contents($page_file);
    }
    else{
-        $page = file_get_contents($template_dir . "404.html");
+        $page = file_get_contents($routerConfig["template_dir"] . "404.html");
    }
-    $navpages = generateNavigation($static_page_dir, $protocol, $subdomain, $domain, $tld, $default_page, $page_name);
+    $navpages = generateNavigation();

    $nav = str_replace("__NAV_PAGES__", $navpages, $nav);

    $out = $skeleton;
    $out = str_replace("__TEMPLATE__NAV__", $nav, $out);
    $out = str_replace("__TEMPLATE__PAGE__", $page, $out);
-    $out = str_replace("__TEMPLATE_PAGE_NAME__", $page_name, $out);
-    return $out;
+    return str_replace("__TEMPLATE_PAGE_NAME__", $page_name, $out);
 }

-?>