Code restructure push

This commit is contained in:
twotalesanimation
2025-12-04 15:09:44 +02:00
parent 86faad7a78
commit be2b757f4e
111 changed files with 17297 additions and 19420 deletions

View File

@@ -13,14 +13,18 @@
* 'light' = Dark text on light background (header02 style)
*/
// Start output buffering BEFORE any code that might output
ob_start();
// Set default style if not provided
$headerStyle = $headerStyle ?? 'light';
ob_start();
require_once("env.php");
require_once("session.php");
require_once("connection.php");
require_once("functions.php");
// Use absolute paths based on this file's location
$rootDir = dirname(__FILE__);
require_once($rootDir . "/src/config/env.php");
require_once($rootDir . "/src/config/session.php");
require_once($rootDir . "/src/config/connection.php");
require_once($rootDir . "/src/config/functions.php");
$is_logged_in = isset($_SESSION['user_id']);
if (isset($_SESSION['user_id'])) {
@@ -229,7 +233,7 @@ if ($headerStyle === 'light') {
<div class="header-inner rel d-flex align-items-center">
<div class="logo-outer">
<div class="logo" style="width:200px;"><a href="index.php"><img src="<?php echo $logoImg; ?>" alt="Logo" title="Logo"></a></div>
<div class="logo" style="width:200px;"><a href="index"><img src="<?php echo $logoImg; ?>" alt="Logo" title="Logo"></a></div>
</div>
<div class="nav-outer mx-lg-auto ps-xxl-5 clearfix">
@@ -237,7 +241,7 @@ if ($headerStyle === 'light') {
<nav class="main-menu navbar-expand-lg">
<div class="navbar-header">
<div class="mobile-logo">
<a href="index.php">
<a href="index">
<img src="<?php echo $mobileLogoImg; ?>" alt="Logo" title="Logo">
</a>
</div>
@@ -252,44 +256,44 @@ if ($headerStyle === 'light') {
<div class="navbar-collapse collapse clearfix">
<ul class="navigation clearfix">
<li><a href="index.php">Home</a></li>
<li><a href="about.php">About</a></li>
<li><a href="trips.php">Trips</a>
<li><a href="index">Home</a></li>
<li><a href="about">About</a></li>
<li><a href="trips">Trips</a>
<?php if ($headerStyle === 'dark'): ?>
<ul>
<li><a href="tour-list.html">Tour List</a></li>
<li><a href="tour-grid.html">Tour Grid</a></li>
<li><a href="tour-sidebar.html">Tour Sidebar</a></li>
<li><a href="trip-details.php">Tour Details</a></li>
<li><a href="trip-details">Tour Details</a></li>
<li><a href="tour-guide.html">Tour Guide</a></li>
</ul>
<?php endif; ?>
</li>
<li class="dropdown"><a href="#">Training</a>
<ul>
<li><a href="driver_training.php">Basic 4X4 Driver Training</a></li>
<li><a href="bush_mechanics.php">Bush Mechanics</a></li>
<li><a href="rescue_recovery.php">Rescue & Recovery</a></li>
<li><a href="driver_training">Basic 4X4 Driver Training</a></li>
<li><a href="bush_mechanics">Bush Mechanics</a></li>
<li><a href="rescue_recovery">Rescue & Recovery</a></li>
</ul>
</li>
<li><a href="events.php">Events</a></li>
<li><a href="blog.php">Blog</a></li>
<li><a href="events">Events</a></li>
<li><a href="blog">Blog</a></li>
<?php if ($role === 'admin' || $role === 'superadmin') { ?>
<li class="dropdown"><a href="#">admin</a>
<ul>
<li><a href="admin_web_users.php">Website Users</a></li>
<li><a href="admin_members.php">4WDCSA Members</a></li>
<li><a href="admin_trip_bookings.php">Trip Bookings</a></li>
<li><a href="admin_course_bookings.php">Course Bookings</a></li>
<li><a href="admin_efts.php">EFT Payments</a></li>
<li><a href="process_payments.php">Process Payments</a></li>
<li><a href="admin_web_users">Website Users</a></li>
<li><a href="admin_members">4WDCSA Members</a></li>
<li><a href="admin_trip_bookings">Trip Bookings</a></li>
<li><a href="admin_course_bookings">Course Bookings</a></li>
<li><a href="admin_efts">EFT Payments</a></li>
<li><a href="process_payments">Process Payments</a></li>
<?php if ($role === 'superadmin') { ?>
<li><a href="admin_visitors.php">Visitor Log</a></li>
<li><a href="admin_visitors">Visitor Log</a></li>
<?php } ?>
</ul>
</li>
<?php } ?>
<li><a href="contact.php">Contact</a></li>
<li><a href="contact">Contact</a></li>
<?php if ($is_member) : ?>
<li class="dropdown"><a href="#">Members Area</a>
<ul>
@@ -301,15 +305,15 @@ if ($headerStyle === 'light') {
<?php if ($is_logged_in) : ?>
<li class="dropdown"><a href="#">My Account</a>
<ul>
<li><a href="account_settings.php">Account Settings</a></li>
<li><a href="membership_details.php">Membership</a></li>
<li><a href="bookings.php">My Bookings</a></li>
<li><a href="submit_pop.php">Submit P.O.P</a></li>
<li><a href="logout.php">Log Out</a></li>
<li><a href="account_settings">Account Settings</a></li>
<li><a href="membership_details">Membership</a></li>
<li><a href="bookings">My Bookings</a></li>
<li><a href="submit_pop">Submit P.O.P</a></li>
<li><a href="logout">Log Out</a></li>
</ul>
</li>
<?php else : ?>
<li class="nav-item d-xl-none"><a href="login.php">Log In</a></li>
<li class="nav-item d-xl-none"><a href="login">Log In</a></li>
<?php endif; ?>
</ul>
</div>
@@ -324,13 +328,13 @@ if ($headerStyle === 'light') {
<div class="profile-menu">
<div class="profile-info">
<span style="color: <?php echo $textColor; ?>;">Welcome, <?php echo $_SESSION['first_name']; ?></span>
<a href="account_settings.php">
<a href="account_settings">
<img src="<?php echo $_SESSION['profile_pic']; ?>?v=<?php echo time(); ?>" alt="Profile Picture" class="profile-pic">
</a>
</div>
</div>
<?php else : ?>
<a href="login.php" class="theme-btn style-two bgc-secondary">
<a href="login" class="theme-btn style-two bgc-secondary">
<span data-hover="Log In">Log In</span>
<i class="fal fa-arrow-right"></i>
</a>