A lot of code cleanup and code sanitation done.

This commit is contained in:
2026-06-20 00:31:32 +02:00
parent be392b8149
commit d781078c0d
100 changed files with 733 additions and 2097 deletions

View File

@@ -8,12 +8,12 @@ if (!defined('APP_INIT')) {
use api\classes\API;
require_once($_SERVER['DOCUMENT_ROOT'] . '/api/classes/API.php');
require_once "{$_SERVER['DOCUMENT_ROOT']}/api/classes/API.php";
class pageBuilder extends API
class pageBuilder
{
private $jsScriptLoadData;
private array $jsScriptLoadData;
public function __construct()
{
@@ -38,12 +38,12 @@ class pageBuilder extends API
$this->figureOutContent();
}
private function figureOutContent()
private function figureOutContent(): void
{
$requestUri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
// Remove trailing slash, but only if its not the root "/"
if ($requestUri !== '/' && substr($requestUri, -1) === '/') {
if ($requestUri !== '/' && str_ends_with($requestUri, '/')) {
$requestUri = rtrim($requestUri, '/');
}
@@ -66,7 +66,7 @@ class pageBuilder extends API
}
}
public function buildPage()
public function buildPage(): void
{ ?>
<!DOCTYPE html>
<html lang="en">
@@ -94,8 +94,7 @@ class pageBuilder extends API
</html>
<?php }
private
function pageHeadContent()
private function pageHeadContent(): void
{ ?>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -127,12 +126,11 @@ class pageBuilder extends API
</head>
<?php }
private function pageSidebarContent()
private function pageSidebarContent(): void
{
$API = new API();
function showSpan($module_name)
function showSpan($module_name): void
{
?>
<li class="nav-section">
@@ -145,7 +143,7 @@ class pageBuilder extends API
</li>
<?php }
function showPage($module_name, $page_name)
function showPage($module_name, $page_name): void
{
$page = $GLOBALS['pages'][$module_name][$page_name];
?>
@@ -161,7 +159,7 @@ class pageBuilder extends API
<div class="sidebar-logo">
<div class="logo-header">
<a href="/" class="logo">
<img src="/src/images/logo-sidebar-dark.webp" alt="navbar brand" class="navbar-brand" height="50"/>
<img src="/src/images/logo-sidebar-dark.webp" alt="navbar brand" class="navbar-brand" height="60"/>
</a>
<div class="nav-toggle">
<button class="btn btn-toggle toggle-sidebar">
@@ -219,8 +217,7 @@ class pageBuilder extends API
<?php
}
private
function pageNavbarContent()
private function pageNavbarContent(): void
{
?>
<div class="main-header">
@@ -228,7 +225,7 @@ class pageBuilder extends API
<!-- Logo Header -->
<div class="logo-header">
<a href="/" class="logo">
<img src="/src/images/logo-sidebar-dark.webp" alt="navbar brand" class="navbar-brand" height="50"/>
<img src="/src/images/logo-sidebar-dark.webp" alt="navbar brand" class="navbar-brand" height="60"/>
</a>
<div class="nav-toggle">
<button class="btn btn-toggle toggle-sidebar">
@@ -258,37 +255,34 @@ class pageBuilder extends API
<span class="op-7"> <?php echo __('hi') ?>,&nbsp;</span>
<span class="fw-bold"><?php echo $_SESSION['user']['user_first_name'] ?></span>
</a>
<ul class="dropdown-menu dropdown-user animated fadeIn">
<div class="dropdown-user-scroll scrollbar-outer">
<li>
<div class="user-box">
<div class="avatar-lg">
<img src="<?php echo(($_SESSION['user']['user_profile_picture_thumbnail'] != null) ? 'data:image/png;base64, ' . $_SESSION['user']['user_profile_picture_thumbnail'] : '/src/images/user-avatar-default-small.png') ?>" alt="image profile" class="avatar-img rounded">
</div>
<div class="u-text">
<h4><?php echo $_SESSION['user']['user_email'] ?></h4>
<p class="text-muted"><?php echo $_SESSION['user']['user_email'] ?></p>
</div>
<li>
<div class="user-box">
<div class="avatar-lg">
<img src="<?php echo(($_SESSION['user']['user_profile_picture_thumbnail'] != null) ? 'data:image/png;base64, ' . $_SESSION['user']['user_profile_picture_thumbnail'] : '/src/images/user-avatar-default-small.png') ?>" alt="image profile" class="avatar-img rounded">
</div>
</li>
<li>
<?php
if ($_SESSION['user']['user_group_type'] == 'user' || $_SESSION['user']['user_group_type'] == 'admin') { ?>
<a class="dropdown-item" href="/userprofile/"><i class="fa-solid fa-address-card"></i> <?php echo __('user_profile') ?>
</a>
<div class="dropdown-divider"></div>
<?php } else { ?>
<div class="dropdown-divider"></div>
<?php } ?>
<form id="logoutform" class="form-inline logoutform" action="/login/logout.php" method="POST">
<input type="hidden" name="logout">
<a class="dropdown-item" href="#" onclick="document.getElementById('logoutform').submit()">
<i class="fas fa-sign-out-alt"></i> <?php echo __('logout') ?>
</a>
</form>
</li>
</div>
<div class="u-text">
<h4><?php echo $_SESSION['user']['user_email'] ?></h4>
<p class="text-muted"><?php echo $_SESSION['user']['user_email'] ?></p>
</div>
</div>
</li>
<li>
<?php
if ($_SESSION['user']['user_group_type'] == 'user' || $_SESSION['user']['user_group_type'] == 'admin') { ?>
<a class="dropdown-item" href="/userprofile/"><i class="fa-solid fa-address-card"></i> <?php echo __('user_profile') ?>
</a>
<div class="dropdown-divider"></div>
<?php } else { ?>
<div class="dropdown-divider"></div>
<?php } ?>
<form id="logoutform" class="form-inline logoutform" action="/login/logout.php" method="POST">
<input type="hidden" name="logout">
<button type="submit" form="logoutform" class="dropdown-item">
<i class="fas fa-sign-out-alt"></i> Logout
</button>
</form>
</li>
</ul>
</li>
</ul>
@@ -298,8 +292,7 @@ class pageBuilder extends API
</div>
<?php }
private
function pageFooterContent()
private function pageFooterContent(): void
{ ?>
<footer class="footer py-2">
<div class="container-fluid d-flex justify-content-between">
@@ -321,8 +314,7 @@ class pageBuilder extends API
</footer>
<?php }
private
function pageScriptContents()
private function pageScriptContents(): void
{ ?>
<!-- always load these -->
<script src="/src/js/core/jquery-3.7.1.min.js"></script>