Merge branch 'main' of https://git.brn.systems/Adleraci/adlerka.top

.gitignore

@@ -0,0 +1,4 @@
+.idea
+secrets
+secrets/
+secrets/config.php

assets/style.css

@@ -11,9 +11,7 @@
 }
 
 body {
-    background: linear-gradient(127deg, var(--secondary-bg), var(--primary-bg));
+    background: linear-gradient(127deg, var(--secondary-bg), var(--primary-bg)) no-repeat fixed;
-    background-repeat: no-repeat;
-    background-attachment: fixed;
     background-size: cover;
     height: 100%;
     width: 100%;
@@ -29,28 +27,9 @@ nav {
     justify-content: space-between;
     padding: 1.2rem 1rem;
     background-color: rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 20px 28px 0px rgba(0,0,0,0.2);
+    -webkit-box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2);
-    -moz-box-shadow: 0px 20px 28px 0px rgba(0,0,0,0.2);
+    -moz-box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2);
-    box-shadow: 0px 20px 28px 0px rgba(0,0,0,0.2);
+    box-shadow: 0 20px 28px 0 rgba(0,0,0,0.2);
-}
-
-nav #login {
-    color: var(--primary-text);
-    text-decoration: none;
-    background-color: #2a9dd6;
-    padding: 0.35rem 0.65rem;
-    transition: all 0.3s ease;
-    border-radius: 15px;
-}
-
-nav #login:hover, nav #login.active{
-    transition: all 0.3s ease;
-    background-color: var(--primary-hover);
-    color: var(--primary-text);
-}
-
-nav #login:hover::after, nav #login.active::after {
-    width: 0;
 }
 
 ul {
@@ -89,11 +68,6 @@ li a:hover::after {
     width: 85%;
 }
 
-li a:hover, li a.active {
-    color: var(--primary);
-    transition: all 0.3s ease;
-}
-
 .wrapper-404 {
     text-align: center;
 }
@@ -162,7 +136,6 @@ header hr {
 }
 
 .navpage_list{
-    margin-top: 8px;
     background-color: var(--third-bg);
     margin-top: 10px;
     display: flex;
@@ -183,11 +156,6 @@ header hr {
     transition-delay: 0s; /* Reset delay on hover */
 }
 
-a.navpage_link{
-    padding: 0;
-    margin: 0;
-}
-
 li.navpage_item{
     padding-left: 20px;
     padding-right: 20px;

index.php

@@ -1,74 +1,22 @@
 <?php
-require "secrets/config.php";
+/** @noinspection PhpIncludeInspection */
-require "templates/navpages.php";
+require_once "secrets/config.php";
+require_once "lib/navpages.php";
+require_once "lib/routing.php";
+require_once "lib/config.php";
 
+$routerConfig = array();
+$routerRequest = array();
+
+loadRouterConfig();
+if(initRouter()) {
+    /** @noinspection PhpArrayIsAlwaysEmptyInspection */
+    session_set_cookie_params(0, '/', "." . $routerRequest["domain"] . "." . $routerRequest["tld"], true, true);
     session_start();
-
+    /** @noinspection PhpArrayIsAlwaysEmptyInspection */
-$default_page = "domov";
+    echo getPage($routerRequest["page_name"]);
-
-$default_site = "home";
-
-$template_dir = "templates/";
-
-$static_page_dir = "pages/";
-
-$dynamic_page_dir = "dynamic/";
-
-$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"]);;
-
-
-$srvname = $_SERVER["SERVER_NAME"];
-
-$protocol = $_SERVER['PROTOCOL'] = isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && !empty($_SERVER['HTTP_X_FORWARDED_PROTO']) ? "https://" : "http://";
-
-if (empty($tld)){
-    header("Location: $protocol$default_site.$subdomain.$domain/$default_page");
-    return;
-}
-
-if (empty($page_name)){
-    header("Location: $protocol$subdomain.$domain.$tld/$default_page");
-    return;
-}
-
-
-$dynamic_page_file = $static_page_dir . $subdomain . "/" . $page_name . ".php";
-$page_file = $static_page_dir . $subdomain . "/" . $page_name . ".html";
-
-$dynamic_page_file_global = $static_page_dir . "global/" . $page_name . ".php";
-$page_file_global = $static_page_dir . "global/" . $page_name . ".html";
-
-$skeleton = file_get_contents($template_dir . "skeleton.html");
-$nav = file_get_contents($template_dir . "nav.html");
-
-if (file_exists($dynamic_page_file_global)){
-    $page = include_once $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;
-}
-elseif (file_exists($page_file)){
-    $page = file_get_contents($page_file);
 }
 else{
-    $page = file_get_contents($template_dir . "404.html");
+    exit();
 }
 
-$navpages = generateNavigation($static_page_dir, $protocol, $subdomain, $domain, $tld, $default_page, $page_name);
-
-$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);
-
-echo $out;
-
-?>

lib/account.php

@@ -0,0 +1,88 @@
+<?php
+
+function isLoggedIn(){
+    return $_SESSION["ID"] > 0 && !empty($_SESSION["email"]);
+}
+
+function doLogin(){
+    global $mysqli;
+    if(!empty($_POST["email"]) && !empty($_POST["password"])){
+        $email = $_POST["email"];
+        $pass = $_POST["password"];
+        /* prepare statement */
+        $stmt = $mysqli->prepare("SELECT ID, FirstName, LastName, Nickname, PasswordHash, MinecraftNick, isAdmin FROM Users WHERE EMAIL = ? AND isActive = 1");
+        $stmt->bind_param("s", $email);
+        $stmt->execute();
+        $idcko = 0;
+        $fname = "";
+        $lname = "";
+        $nickname = "";
+        $pwdhash = "";
+        $mcnick = "";
+        /* bind variables to prepared statement */
+        $stmt->bind_result($idcko, $fname, $lname, $nickname, $pwdhash, $mcnick, false);
+
+        /* fetch values */
+        $found = false;
+        if($stmt->num_rows() > 0){
+            $stmt->fetch();
+            if (password_verify($pass, $pwdhash)){
+                $_SESSION["ID"] = $idcko;
+                $_SESSION["first_name"] = $fname;
+                $_SESSION["last_name"] = $lname;
+                $_SESSION["nickname"] = $nickname;
+                $_SESSION["email"] = $email;
+                $_SESSION["mcnick"] = $mcnick;
+                $_SESSION["isadmin"] = false;
+                $found = true;
+            }
+        }
+        $stmt->close();
+        if($found){
+            $status = ["status" => "success"];
+        }
+        else{
+            $status = ["status" => "fail"];
+        }
+        echo json_encode($status);
+    }
+}
+
+function doLogout(){
+    if(isLoggedIn()){
+        session_destroy();
+        $status = ["status" => "success"];
+    }
+    else{
+        $status = ["status" => "fail"];
+    }
+    echo json_encode($status);
+}
+
+function doRegister(){
+    $status = ["status" => "fail"];
+    if (!empty($_POST["activationtoken"])){
+        global $mysqli;
+
+        $firstName = $_POST["firstname"];
+        $lastName = $_POST["lastname"];
+        $nickname = $_POST["nickname"];
+        $email = $_POST["email"];
+        $password = $_POST["password"];
+        $minecraftNick = $_POST["minecraftnick"];
+        $activationToken = $_POST["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 = ?");
+            $stmt->bind_param("ssssss", $firstName, $lastName, $nickname, $email, $passwordHash, $minecraftNick, $activationToken);
+            $stmt->execute();
+            if ($stmt->affected_rows > 0) {
+                $status["status"] = "success";
+            }
+            $stmt->close();
+        }
+    }
+    echo json_encode($status);
+}
+

lib/config.php

@@ -0,0 +1,14 @@
+<?php
+    function loadRouterConfig(){
+        global $routerConfig;
+        
+        $routerConfig["default_page"] = "domov";
+
+        $routerConfig["default_site"] = "home";
+
+        $routerConfig["template_dir"] = "templates/";
+
+        $routerConfig["page_dir"] = "pages/";
+
+        $routerConfig["protocol"] = "https://";
+    }

lib/navpages.php

@@ -0,0 +1,54 @@
+<?php
+
+function generateNavigation()
+{
+    global $routerConfig;
+    global $routerRequest;
+
+    $site_dirs = array_diff(scandir($routerConfig["page_dir"]), array('.', '..'));
+
+    $nav_out = "";
+
+    foreach ($site_dirs as $site_dir) {
+        $pages_dir = array_diff(scandir($routerConfig["page_dir"] . $site_dir), array('.', '..'));
+
+        $site_name = str_replace("_", " ", $site_dir);
+        if ($site_name == "global") {
+            $site_name = "misc";
+            $site_dir = $routerConfig["default_page"];
+        }
+        $site_name = ucfirst($site_name);
+
+        $site_location = $routerConfig["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $routerConfig["default_page"];
+
+        if ($routerRequest["subdomain"] == $site_dir) {
+            //this is the current page
+            $site_class = "class=\"navsite_link active\"";
+        }
+        else{
+            $site_class = "class=\"navsite_link\"";
+        }
+
+        $navpages = "";
+        foreach ($pages_dir as $page_dir) {
+            $page_dir = explode(".", $page_dir)[0];
+            $page_class = "class=\"navpage_link\"";
+            if ($routerRequest["subdomain"] == $site_dir && $routerRequest["page_name"] == $page_dir) {
+                $page_class = "class=\"navpage_link active\"";
+            }
+
+            $page_location = $routerConfig["protocol"] . $site_dir . "." . $routerRequest["domain"] . "." . $routerRequest["tld"] . "/" . $page_dir;
+
+            $page_name = str_replace("_", " ", $page_dir);
+            $page_name = explode(".", $page_name)[0];
+            $page_name = ucfirst($page_name);
+
+            $navpages .= "<li class='navpage_item'><a href='$page_location' $page_class>$page_name</a></li>";
+        }
+        $nav_out .= "<li class='navsite_item'><a href='$site_location' $site_class>$site_name</a><ul class='navpage_list'>$navpages</ul></li>";
+    }
+
+    return $nav_out;
+}
+
+

lib/routing.php

@@ -0,0 +1,94 @@
+<?php
+
+
+function initRouter(){
+    global $routerRequest;
+    global $routerConfig;
+
+    $routerRequest["requestAddress"] = array_slice(explode('.', $_SERVER['HTTP_HOST']), -3, 3); //get the last 3 elements
+
+    $needsRedirect = false;
+
+    if(count($routerRequest["requestAddress"]) < 3){
+        // Root domain accessed directly
+        $needsRedirect = true;
+
+        $routerRequest["subdomain"] = $routerConfig["default_site"];
+        $routerRequest["domain"] = basename($routerRequest["requestAddress"][0]);
+        $routerRequest["tld"] = basename($routerRequest["requestAddress"][1]);
+
+    } else {
+        $routerRequest["subdomain"] = basename($routerRequest["requestAddress"][0]);
+        $routerRequest["domain"] = basename($routerRequest["requestAddress"][1]);
+        $routerRequest["tld"] = basename($routerRequest["requestAddress"][2]);
+
+        $routerRequest["page_name"] = basename($_SERVER["QUERY_STRING"]);
+
+        if (empty($routerRequest["page_name"])) {
+            // Page name is empty
+            $needsRedirect = true;
+            $routerRequest["page_name"] = $routerConfig["default_page"];
+        }
+    }
+
+    if ($needsRedirect) {
+        $redirectAddress = $routerConfig["protocol"] .
+            $routerRequest["subdomain"] . "." .
+            $routerRequest["domain"] . "." .
+            $routerRequest["tld"] . "/" .
+            $routerRequest["page_name"];
+        // Redirect with default page name
+        header("Location: $redirectAddress");
+    }
+
+    return !$needsRedirect;
+}
+
+function renderDynamicPage($page_file)
+{
+    require_once $page_file;
+    return render();
+}
+
+function getPage($page_name = null){
+    global $routerConfig;
+    global $routerRequest;
+
+    if(!$page_name){
+        $page_name = $routerRequest["page_name"];
+    }
+
+    $dynamic_page_file = $routerConfig["page_dir"] . $routerRequest["subdomain"] . "/" . $page_name . ".php";
+    $page_file = $routerConfig["page_dir"] . $routerRequest["subdomain"] . "/" . $page_name . ".html";
+
+    $dynamic_page_file_global = $routerConfig["page_dir"] . "global/" . $page_name . ".php";
+    $page_file_global = $routerConfig["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 = 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 = renderDynamicPage($dynamic_page_file);
+    }
+    elseif (file_exists($page_file)){
+        $page = file_get_contents($page_file);
+    }
+    else{
+        $page = file_get_contents($routerConfig["template_dir"] . "404.html");
+    }
+    $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);
+    return str_replace("__TEMPLATE_PAGE_NAME__", $page_name, $out);
+}
+

pages/global/account.php

@@ -0,0 +1,40 @@
+<?php
+
+require_once "lib/routing.php";
+
+function render()
+{
+    global $routerConfig;
+    $diddoAjax = true;
+
+    switch ($_POST["action"]) {
+        case "login":
+            doLogin();
+            break;
+        case "register":
+            doRegister();
+            break;
+        case "logout":
+            doLogout();
+            break;
+        default:
+            $diddoAjax = false;
+            break;
+    }
+
+    if ($diddoAjax) {
+        exit();
+    }
+
+    ob_start();
+
+    if ($_SESSION["ID"] > 0) {
+        $account_template = file_get_contents($routerConfig["template_dir"] . "account.html");
+        echo $account_template;
+    } else {
+        $login_template = file_get_contents($routerConfig["template_dir"] . "login.html");
+        echo $login_template;
+    }
+
+    return ob_get_clean();
+}

pages/global/login.php

@@ -1,56 +0,0 @@
-<?php
-ob_start();
-
-$template_dir = "templates/";
-
-if($_SERVER["REQUEST_METHOD"] == "POST"){
-    if(!empty($_POST["email"]) && !empty($_POST["password"])){
-        $email = $_POST["email"];
-        $pass = $_POST["password"];
-        /* prepare statement */
-        $stmt = $mysqli->prepare("SELECT ID, PSWD, IGN, ISADMIN FROM Users where EMAIL = ?");
-        $stmt->bind_param("s", $email);
-        $stmt->execute();
-        /* bind variables to prepared statement */
-        $stmt->bind_result($idcko, $hash, $ign, $isadmin);
-        
-        $found = false;
-        /* fetch values */
-        while ($stmt->fetch()) {
-            if (password_verify($pass, $hash)){
-                $_SESSION["ID"] = $idcko;
-                $_SESSION["email"] = $email;
-                $_SESSION["ign"] = $ign;
-                $_SESSION["isadmin"] = $isadmin;
-                $found = true; 
-                break;
-            }
-            else{
-                $_SESSION["ID"] = 0;
-                $_SESSION["email"] = "";
-                $_SESSION["ign"] = "";
-                $_SESSION["isadmin"] = 0;
-                $found = false;
-            }
-            break;
-        }
-        if($found){
-            echo "Login successful";
-        }
-        else{
-            echo "Login failed";
-        }
-    }
-}
-if ($_SESSION["ID"] > 0){
-    $account_template = file_get_contents($template_dir . "account.html");
-    echo $account_template;
-}
-else{
-    $login_template = file_get_contents($template_dir . "login.html");
-    echo $login_template;
-}
-
-return ob_get_clean();
-
-?>

templates/login.html

@@ -1,5 +1,7 @@
 <form method="post">
-    <input type="email" name="email">
+    <label for="login_email">Email:</label><br>
-    <input type="password" name="password">
+    <input id="login_email" type="email" name="email"><br>
+    <label for="login_password">Password</label><br>
+    <input id="login_password" type="password" name="password"><br>
     <input type="submit">
 </form>

templates/nav.html

@@ -1,5 +1,5 @@
 <nav>
-    <div class="logo"><img class="standard-logo" src="http://www.adlerka.sk/wp-content/uploads/2021/09/Logo_text_Adlerka_modro_cerveno_biele-e1652431356820.png" title="Adlerka"></div>
+    <div class="logo"><img alt="Adlerka logo" class="standard-logo" src="https://www.adlerka.sk/wp-content/uploads/2021/09/Logo_text_Adlerka_modro_cerveno_biele-e1652431356820.png" title="Adlerka"></div>
     <ul class="navsite_list">
         __NAV_PAGES__
     </ul>

templates/navpages.php

@@ -1,58 +0,0 @@
-<?php
-
-function generateNavigation($static_page_dir, $protocol, $subdomain, $domain, $tld, $default_page, $page_name)
-{
-    $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('.', '..'));
-
-    $nav_out = "";
-
-    foreach ($site_dirs as $site_dir) {
-        $pages_dir = array_diff(scandir("$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_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__", $site_name.ucfirst(), $navsite);
-
-        if ($subdomain == $site_dir) {
-            //this is the current page
-            $site_class = "class=\"navsite_link active\"";
-        }
-
-        $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) {
-                $page_class = "class=\"navpage_link active\"";
-            }
-
-            $page_location = "$protocol$site_dir.$domain.$tld/$page_dir";
-
-            $page_name = str_replace("_", " ", $page_dir);
-            $page_name = explode(".", $page_name)[0];
-
-            $navpage = str_replace("__CLASS__", $page_class, $navpage);
-            $navpage = str_replace("__LOCATION__", $page_location, $navpage);
-            $navpage = str_replace("__NAME__", $page_name, $navpage);
-            $navpages .= $navpage;
-        }
-        $navsite = str_replace("__NAVPAGES__", $navpages, $navsite);
-        $nav_out .= $navsite;
-    }
-
-    return $nav_out;
-}
-
-?>