Adleraci/adlerka.top
4
1
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bunch of stuff

Browse Source
This commit is contained in:
Bruno Rybársky 2024-02-03 16:18:48 +01:00
parent 15964cf109
commit 6ccbe82189
17 changed files with 23 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,7 +1,7 @@
# Adlerka.Top
The code for Adlerka.top
The code for https://adlerka.top
[![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](https://choosealicense.com/licenses/mit/)

3
assets/scripts/home/account.js
View File

@ -1,3 +0,0 @@

4
index.php
View File

@ -1,4 +1,6 @@
<?php
<?php /** @noinspection PhpArrayIsAlwaysEmptyInspection */
/** @noinspection PhpArrayIsAlwaysEmptyInspection */
/** @noinspection PhpArrayIsAlwaysEmptyInspection */
/** @noinspection PhpIncludeInspection */
require_once "secrets/config.php";
require_once "lib/config.php";

5
lib/account.php
View File

@ -149,6 +149,7 @@ function doRegister($firstname, $lastname, $email, $password, $activation_token)
$passwordHash = password_hash($password, PASSWORD_DEFAULT);
$stmt = $mysqli->prepare("INSERT INTO Users (FirstName, LastName, Email, PasswordHash, PrivilegeLevel, isActivated, ActivationToken, RegisteredAt) VALUES (?, ?, ?, ?, ?, 1, ?, NOW())");
$privilege_level = $routerConfig["logged_in_default_permission_level"];
/** @noinspection SpellCheckingInspection */
$stmt->bind_param("ssssis", $firstname, $lastname, $email, $passwordHash, $privilege_level, $activation_token);
$stmt->execute();
if ($stmt->affected_rows > 0) {
@ -188,6 +189,7 @@ function updateUserProfile($firstName, $lastName, $nickname, $minecraft_nickname
$userID = $_SESSION["ID"];
$stmt = $mysqli->prepare("UPDATE Users SET FirstName = ?, LastName = ?, Nickname = ?, MinecraftNick = ? WHERE ID = ?");
/** @noinspection SpellCheckingInspection */
$stmt->bind_param("ssssi", $firstName, $lastName, $nickname, $minecraft_nickname, $userID);
$stmt->execute();
@ -206,6 +208,7 @@ function updateUserEmail($email): array
{
global $mysqli;
$status = ["Status" => "Fail"];
/** @noinspection SpellCheckingInspection */
$validmail = false;
if (isLoggedIn() && !empty($email)) {
@ -221,9 +224,11 @@ function updateUserEmail($email): array
if ($email != $old_email) {
if (isEmailAvailable($email)) {
/** @noinspection SpellCheckingInspection */
$validmail = true;
}
} else {
/** @noinspection SpellCheckingInspection */
$validmail = true;
}

2
lib/config.php
View File

@ -3,7 +3,7 @@
{
global $routerConfig;
$routerConfig["default_page"] = "domov";
$routerConfig["default_page"] = "index";
$routerConfig["default_site"] = "home";

33
lib/page.php
View File

@ -111,45 +111,12 @@ function getPage($page_name = null): array|false|string
$page_title = $page_name;
}
$site_name = $routerRequest["subdomain"];
if(!empty($pageMetadata["parameters"]["page_style"])){
$style_location = $pageMetadata["parameters"]["page_style"];
}
else{
$style_location = "assets/styles/$site_name/$page_name.css";
}
if(file_exists($style_location)) {
$style_tag = $style_location;
}
else{
$style_tag = "";
}
if(!empty($pageMetadata["parameters"]["page_script"])){
$script_location = $pageMetadata["parameters"]["page_script"];
}
else{
$script_location = "assets/scripts/$site_name/$page_name.js";
}
if(file_exists($style_location)) {
$script_tag = $script_location;
}
else{
$script_tag = "";
}
$navpages = generateNavigation();
$nav = str_replace("__NAV_PAGES__", $navpages, $nav);
$out = $skeleton;
$out = str_replace("__TEMPLATE__NAV__", $nav, $out);
$out = str_replace("__TEMPLATE_PAGE_STYLE_TAG__", $style_tag, $out);
$out = str_replace("__TEMPLATE_PAGE_SCRIPT_TAG__", $script_tag, $out);
$out = str_replace("__TEMPLATE__PAGE__", $page, $out);
return str_replace("__TEMPLATE_PAGE_TITLE__", $page_title, $out);
}

2
lib/router.php
View File

@ -25,7 +25,6 @@ function initRouter(): bool
if($routerRequest["subdomain"] == $routerConfig["default_site"]){
$routerRequest["subdomain"] = "";
$needsRedirect = true;
header("redirReasonApex: yes");
}
}
@ -35,7 +34,6 @@ function initRouter(): bool
// Page name is empty
$needsRedirect = true;
$routerRequest["page_name"] = $routerConfig["default_page"];
header("redirReasonPage: yes");
}

6
pages/home/domov.html
View File

@ -1,6 +0,0 @@
<page minimal_permission_level="1" secret="no" page_title="Domov"></page>
<header>
<h1 class="title">Vitaj na tejto úžasnej stránke</h1>
<p>Neoficiálna študentská stránka pre adlerku</p>
<hr>
</header>

6
pages/home/index.html Normal file
View File

@ -0,0 +1,6 @@
<page minimal_permission_level="1" secret="no" page_title="Domov"></page>
<header>
<h1 class="title">Vitaj, na tejto úžasnej stránke</h1>
<p>Neoficiálna študentská stránka pre Adlerku</p>
<hr>
</header>

0
pages/memes/domov.html → pages/memes/index.html
View File

0
pages/notes/domov.html → pages/notes/index.html
View File

4
pages/smp/domov.html → pages/smp/index.html
View File

@ -3,7 +3,7 @@
<h1 class="title">Vitaj na oficiálnej AdlerkaSMP stránke</h1>
<p>Najlepší <a href="https://minecraft.net" style="text-decoration: underline; color: #fff;" target="_blank">Minecraft®™</a> server na Adlerke</p>
<hr>
<wrapper class="feature-list">
<div class="wrapper feature-list">
<h2>Čo môžeš očakávať od AdlerkaSMP:</h2>
<ul class="feature-list-ul">
@ -31,5 +31,5 @@
</ul>
</li>
</ul>
</wrapper>
</div>
</header>

2
templates/403.html
View File

@ -2,5 +2,5 @@
<h2>TY KÁR KAM TO DEŠ</h2>
<h1 class="error-code">403</h1>
<h3><i class="ri-error-warning-line"></i> Našli sme stránku ktorú hľadáš, ale nemáš práva na ňu pristupovať: <span class="error">__TEMPLATE_PAGE_TITLE__</span>. <i class="ri-error-warning-line"></i></h3>
<a href="/domov" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
<a href="/index" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
</div>

2
templates/404.html
View File

@ -2,5 +2,5 @@
<h2>TY KÁR KAM TO DEŠ</h2>
<h1 class="error-code">404</h1>
<h3><i class="ri-error-warning-line"></i> Nenašli sme stránku ktorú hľadáš: <span class="error">__TEMPLATE_PAGE_TITLE__</span>. <i class="ri-error-warning-line"></i></h3>
<a href="/domov" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
<a href="/index" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
</div>

2
templates/500.html
View File

@ -2,5 +2,5 @@
<h2>Niekto to pobabral</h2>
<h1 class="error-code">500</h1>
<h3><i class="ri-error-warning-line"></i> Nejaký neschopný vývojár nevedel robiť túto stránku. <i class="ri-error-warning-line"></i></h3>
<a href="/domov" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
<a href="/index" class="back"><i class="ri-arrow-left-line"></i> SPÄŤ DOMOV</a>
</div>

2
templates/register.html
View File

@ -15,7 +15,7 @@
data.append("nickname", nickname);
data.append("email", email);
data.append("password", password);
data.append("minecraftnick", minecraftNick);
data.append("minecraft_nick", minecraftNick);
data.append("activation_token", activationToken);
doRegister(data);

3
templates/skeleton.html
View File

@ -5,8 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/remixicon/4.1.0/remixicon.min.css" integrity="sha512-i5VzKip7owqOGjb0YTF8MR2J9yBVO3FLHeazKzLp354XYTmKcqEU3UeFYUw82R8tV6JqxeATOfstCfpfPhbyEA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" href="/assets/style.css">
__TEMPLATE_PAGE_STYLE_TAG__
__TEMPLATE_PAGE_SCRIPT_TAG__
<script src="/assets/script.js"></script>
<script async src="https://umami.brn.systems/script.js" data-website-id="95e93885-5c19-4cab-ba9b-2f746a316a2a"></script>
<title>Adlerka __TEMPLATE_PAGE_TITLE__</title>
</head>