fix: improve text visibility on album header background

- Changed album title to white color
- Added text-shadow to album title for better contrast over images
- Changed album description to white color
- Added text-shadow to album description for readability
- Ensures text is visible regardless of cover image darkness

.env.example

@@ -1,34 +0,0 @@
-# Database Configuration
-DB_HOST=localhost
-DB_USER=root
-DB_PASS=
-DB_NAME=4wdcsa
-
-# Security
-SALT=your-random-salt-here
-
-# Mailjet Email Service
-MAILJET_API_KEY=1a44f8d5e847537dbb8d3c76fe73a93c
-MAILJET_API_SECRET=ec98b45c53a7694c4f30d09eee9ad280
-MAILJET_FROM_EMAIL=info@4wdcsa.co.za
-MAILJET_FROM_NAME=4WDCSA
-ADMIN_EMAIL=admin@4wdcsa.co.za
-
-# PayFast Payment Gateway
-PAYFAST_MERCHANT_ID=10021495
-PAYFAST_MERCHANT_KEY=yzpdydo934j92
-PAYFAST_PASSPHRASE=SheSells7Shells
-PAYFAST_DOMAIN=www.thepinto.co.za/4wdcsa
-PAYFAST_TESTING_MODE=true
-
-# Google OAuth
-GOOGLE_CLIENT_ID=your-google-client-id
-GOOGLE_CLIENT_SECRET=your-google-client-secret
-
-# Instagram (optional)
-INSTAGRAM_ACCESS_TOKEN=your-instagram-token
-
-# Application Settings
-APP_ENV=development
-APP_DEBUG=true
-APP_URL=https://www.thepinto.co.za/4wdcsa

.htaccess

@@ -1,4 +1,141 @@
-php_flag display_errors Off
+# URL Rewrite Rules - Maps old URLs to new directory structure during migration
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /
+
+# Don't rewrite existing files or directories
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+
+# === STRIP .PHP EXTENSION ===
+# Redirect /page.php to /page (301 permanent redirect)
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.+)\.php$ /$1 [R=301,L]
+# Internally rewrite /page to /page.php if page.php exists
+RewriteCond %{REQUEST_FILENAME}\.php -f
+RewriteRule ^(.+)$ $1.php [L]
+
+# === AUTH PAGES ===
+RewriteRule ^login$ src/pages/auth/login.php [L]
+RewriteRule ^register$ src/pages/auth/register.php [L]
+RewriteRule ^forgot_password$ src/pages/auth/forgot_password.php [L]
+RewriteRule ^reset_password$ src/pages/auth/reset_password.php [L]
+RewriteRule ^verify$ src/pages/auth/verify.php [L]
+RewriteRule ^resend_verification$ src/pages/auth/resend_verification.php [L]
+RewriteRule ^change_password$ src/pages/auth/change_password.php [L]
+RewriteRule ^update_password$ src/pages/auth/update_password.php [L]
+
+# === MEMBERSHIP PAGES ===
+RewriteRule ^membership$ src/pages/memberships/membership.php [L]
+RewriteRule ^membership_details$ src/pages/memberships/membership_details.php [L]
+RewriteRule ^membership_application$ src/pages/memberships/membership_application.php [L]
+RewriteRule ^membership_payment$ src/pages/memberships/membership_payment.php [L]
+RewriteRule ^renew_membership$ src/pages/memberships/renew_membership.php [L]
+RewriteRule ^member_info$ src/pages/memberships/member_info.php [L]
+
+# === BOOKING PAGES ===
+RewriteRule ^bookings$ src/pages/bookings/bookings.php [L]
+RewriteRule ^campsites$ src/pages/bookings/campsites.php [L]
+RewriteRule ^campsite_booking$ src/pages/bookings/campsite_booking.php [L]
+RewriteRule ^add_campsite$ src/pages/add_campsite.php [L]
+RewriteRule ^trips$ src/pages/bookings/trips.php [L]
+RewriteRule ^trip-details$ src/pages/bookings/trip-details.php [L]
+RewriteRule ^course_details$ src/pages/bookings/course_details.php [L]
+RewriteRule ^driver_training$ src/pages/bookings/driver_training.php [L]
+
+# === SHOP PAGES ===
+RewriteRule ^view_cart$ src/pages/shop/view_cart.php [L]
+RewriteRule ^add_to_cart$ src/pages/shop/add_to_cart.php [L]
+RewriteRule ^bar_tabs$ src/pages/shop/bar_tabs.php [L]
+RewriteRule ^payment_confirmation$ src/pages/shop/payment_confirmation.php [L]
+RewriteRule ^confirm$ src/pages/shop/confirm.php [L]
+RewriteRule ^confirm2$ src/pages/shop/confirm2.php [L]
+
+# === GALLERY PAGES ===
+RewriteRule ^gallery$ src/pages/gallery/gallery.php [L]
+RewriteRule ^create_album$ src/pages/gallery/create_album.php [L]
+RewriteRule ^edit_album$ src/pages/gallery/create_album.php [L]
+RewriteRule ^view_album$ src/pages/gallery/view_album.php [L]
+
+# === EVENTS & BLOG PAGES ===
+RewriteRule ^events$ src/pages/events/events.php [L]
+RewriteRule ^blog$ src/pages/events/blog.php [L]
+RewriteRule ^blog_details$ src/pages/events/blog_details.php [L]
+RewriteRule ^best_of_the_eastern_cape_2024$ src/pages/events/best_of_the_eastern_cape_2024.php [L]
+RewriteRule ^2025_agm_minutes$ src/pages/events/2025_agm_minutes.php [L]
+RewriteRule ^agm_content$ src/pages/events/agm_content.php [L]
+RewriteRule ^instapage$ src/pages/events/instapage.php [L]
+
+# === OTHER PAGES ===
+RewriteRule ^about$ src/pages/other/about.php [L]
+RewriteRule ^contact$ src/pages/other/contact.php [L]
+RewriteRule ^privacy_policy$ src/pages/other/privacy_policy.php [L]
+RewriteRule ^404$ src/pages/other/404.php [L]
+RewriteRule ^account_settings$ src/pages/other/account_settings.php [L]
+RewriteRule ^rescue_recovery$ src/pages/other/rescue_recovery.php [L]
+RewriteRule ^bush_mechanics$ src/pages/other/bush_mechanics.php [L]
+RewriteRule ^indemnity$ src/pages/other/indemnity.php [L]
+RewriteRule ^indemnity_waiver$ src/pages/other/indemnity_waiver.php [L]
+RewriteRule ^basic_indemnity$ src/pages/other/basic_indemnity.php [L]
+RewriteRule ^view_indemnity$ src/pages/other/view_indemnity.php [L]
+
+# === ADMIN PAGES ===
+RewriteRule ^admin_members$ src/admin/admin_members.php [L]
+RewriteRule ^admin_payments$ src/admin/admin_payments.php [L]
+RewriteRule ^admin_web_users$ src/admin/admin_web_users.php [L]
+RewriteRule ^admin_events$ src/admin/admin_events.php [L]
+RewriteRule ^admin_course_bookings$ src/admin/admin_course_bookings.php [L]
+RewriteRule ^admin_camp_bookings$ src/admin/admin_camp_bookings.php [L]
+RewriteRule ^admin_trip_bookings$ src/admin/admin_trip_bookings.php [L]
+RewriteRule ^admin_visitors$ src/admin/admin_visitors.php [L]
+RewriteRule ^admin_efts$ src/admin/admin_efts.php [L]
+RewriteRule ^admin_trips$ src/admin/admin_trips.php [L]
+RewriteRule ^manage_events$ src/admin/manage_events.php [L]
+RewriteRule ^manage_trips$ src/admin/manage_trips.php [L]
+
+# === API/AJAX ENDPOINTS ===
+RewriteRule ^fetch_users$ src/api/fetch_users.php [L]
+RewriteRule ^fetch_drinks$ src/api/fetch_drinks.php [L]
+RewriteRule ^fetch_bar_tabs$ src/api/fetch_bar_tabs.php [L]
+RewriteRule ^get_campsites$ src/api/get_campsites.php [L]
+RewriteRule ^get_tab_total$ src/api/get_tab_total.php [L]
+RewriteRule ^google_validate_login$ src/api/google_validate_login.php [L]
+
+# === PROCESSORS ===
+RewriteRule ^validate_login$ src/processors/validate_login.php [L]
+RewriteRule ^register_user$ src/processors/register_user.php [L]
+RewriteRule ^process_application$ src/processors/process_application.php [L]
+RewriteRule ^process_booking$ src/processors/process_booking.php [L]
+RewriteRule ^process_camp_booking$ src/processors/process_camp_booking.php [L]
+RewriteRule ^process_course_booking$ src/processors/process_course_booking.php [L]
+RewriteRule ^process_trip_booking$ src/processors/process_trip_booking.php [L]
+RewriteRule ^process_membership_payment$ src/processors/process_membership_payment.php [L]
+RewriteRule ^process_payments$ src/processors/process_payments.php [L]
+RewriteRule ^process_eft$ src/processors/process_eft.php [L]
+RewriteRule ^submit_order$ src/processors/submit_order.php [L]
+RewriteRule ^submit_pop$ src/processors/submit_pop.php [L]
+RewriteRule ^process_signature$ src/processors/process_signature.php [L]
+RewriteRule ^create_bar_tab$ src/processors/create_bar_tab.php [L]
+RewriteRule ^update_application$ src/processors/update_application.php [L]
+RewriteRule ^update_user$ src/processors/update_user.php [L]
+RewriteRule ^upload_profile_picture$ src/processors/upload_profile_picture.php [L]
+RewriteRule ^send_reset_link$ src/processors/send_reset_link.php [L]
+RewriteRule ^logout$ src/processors/logout.php [L]
+RewriteRule ^process_trip$ src/processors/process_trip.php [L]
+RewriteRule ^process_event$ src/admin/process_event.php [L]
+RewriteRule ^toggle_trip_published$ src/processors/toggle_trip_published.php [L]
+RewriteRule ^toggle_event_published$ src/admin/toggle_event_published.php [L]
+RewriteRule ^delete_trip$ src/processors/delete_trip.php [L]
+RewriteRule ^delete_event$ src/admin/delete_event.php [L]
+RewriteRule ^save_album$ src/processors/save_album.php [L]
+RewriteRule ^update_album$ src/processors/update_album.php [L]
+RewriteRule ^delete_album$ src/processors/delete_album.php [L]
+RewriteRule ^delete_photo$ src/processors/delete_photo.php [L]
+RewriteRule ^get_album_photos$ src/processors/get_album_photos.php [L]
+
+</IfModule>
+
+php_flag display_errors On
 # php_value error_reporting -1
 RedirectMatch 403 ^/\.well-known
 Options -Indexes

MIGRATION_GUIDE.md

@@ -1,429 +0,0 @@
-# Migration Guide: Using the New Service Layer
-
-## For Developers
-
-### Understanding the New Architecture
-
-The code has been refactored to use a **Service Layer pattern**. Instead of functions directly accessing the database, they delegate to service classes:
-
-#### Old Way (Before):
-```php
-function sendVerificationEmail($email, $name, $token) {
-    // ... 30 lines of Mailjet code with hardcoded credentials ...
-}
-
-function sendInvoice($email, $name, $eft_id, $amount, $description) {
-    // ... 30 lines of Mailjet code (DUPLICATE) ...
-}
-```
-
-#### New Way (After):
-```php
-function sendVerificationEmail($email, $name, $token) {
-    $service = new EmailService();
-    return $service->sendVerificationEmail($email, $name, $token);
-}
-```
-
-### Using Services Directly (New Code)
-
-When writing **new** code, you can use services directly for cleaner syntax:
-
-```php
-<?php
-require_once 'env.php';
-
-use Services\UserService;
-use Services\EmailService;
-
-// Direct service usage (recommended for new code)
-$userService = new UserService();
-$emailService = new EmailService();
-
-$email = $userService->getEmail(123);
-$success = $emailService->sendVerificationEmail(
-    $email,
-    'John Doe',
-    'token123'
-);
-```
-
-### Legacy Wrapper Functions
-
-All original function names still work for **backward compatibility**:
-
-```php
-<?php
-// These still work and do the same thing
-$fullName = getFullName(123);
-$email = getEmail(123);
-$success = sendVerificationEmail('user@example.com', 'John', 'token');
-```
-
-You can use either approach, but **new code should prefer services**.
-
-## Specific Service Usage
-
-### UserService
-
-```php
-<?php
-use Services\UserService;
-
-$userService = new UserService();
-
-// Get single field
-$firstName = $userService->getFirstName($userId);
-$email = $userService->getEmail($userId);
-$profilePic = $userService->getProfilePic($userId);
-
-// Get multiple fields at once (more efficient)
-$userData = $userService->getUserInfo($userId, [
-    'first_name', 
-    'last_name', 
-    'email', 
-    'phone'
-]);
-echo $userData['first_name'];
-echo $userData['email'];
-```
-
-### EmailService
-
-```php
-<?php
-use Services\EmailService;
-
-$emailService = new EmailService();
-
-// Send using template (Mailjet)
-$emailService->sendVerificationEmail(
-    'user@example.com',
-    'John Doe',
-    'verification-token-xyz'
-);
-
-// Send custom HTML email
-$emailService->sendCustom(
-    'user@example.com',
-    'John Doe',
-    'Welcome!',
-    '<h1>Welcome to 4WDCSA</h1><p>Your account is ready.</p>'
-);
-
-// Send admin notification
-$emailService->sendAdminNotification(
-    'New Booking',
-    'A new booking has been submitted for review.'
-);
-```
-
-### PaymentService
-
-```php
-<?php
-use Services\PaymentService;
-use Services\UserService;
-
-$paymentService = new PaymentService();
-$userService = new UserService();
-
-$user_id = $_SESSION['user_id'];
-$userInfo = $userService->getUserInfo($user_id, [
-    'first_name',
-    'last_name',
-    'email'
-]);
-
-// Generate PayFast payment form
-$html = $paymentService->processBookingPayment(
-    'PAY-001',              // payment_id
-    1500.00,                // amount
-    'Trip Booking',         // description
-    'https://domain.com/success',
-    'https://domain.com/cancel',
-    'https://domain.com/notify',
-    $userInfo               // user details
-);
-echo $html;  // Outputs form + auto-submit script
-```
-
-### DatabaseService
-
-```php
-<?php
-use Services\DatabaseService;
-
-// Get the singleton connection
-$db = DatabaseService::getInstance();
-$conn = $db->getConnection();
-
-// Use it like normal MySQLi
-$result = $conn->query("SELECT * FROM trips");
-$row = $result->fetch_assoc();
-
-// Or use convenience methods
-$stmt = $db->prepare("SELECT * FROM users WHERE user_id = ?");
-$stmt->bind_param('i', $userId);
-$stmt->execute();
-$result = $stmt->get_result();
-```
-
-### AuthenticationService
-
-```php
-<?php
-use Services\AuthenticationService;
-
-// Generate CSRF token (called automatically in header01.php)
-$token = AuthenticationService::generateCsrfToken();
-
-// Validate CSRF token (on form submission)
-$isValid = AuthenticationService::validateCsrfToken($_POST['csrf_token']);
-
-// Check if user is logged in
-if (AuthenticationService::isLoggedIn()) {
-    echo "User is logged in";
-}
-
-// Regenerate session after login (prevents session fixation)
-AuthenticationService::regenerateSession();
-```
-
-## Adding CSRF Tokens to Forms
-
-All forms should now include CSRF tokens for protection:
-
-```html
-<form method="POST" action="process_booking.php">
-    <!-- Add CSRF token as hidden field -->
-    <input type="hidden" name="csrf_token" value="<?php echo AuthenticationService::generateCsrfToken(); ?>">
-    
-    <!-- Rest of form -->
-    <input type="text" name="trip_id">
-    <button type="submit">Book Trip</button>
-</form>
-```
-
-Processing the form:
-
-```php
-<?php
-use Services\AuthenticationService;
-
-if ($_POST) {
-    // Validate CSRF token
-    if (!AuthenticationService::validateCsrfToken($_POST['csrf_token'] ?? '')) {
-        die("Invalid request. Please try again.");
-    }
-    
-    // Process the form safely
-    $tripId = $_POST['trip_id'];
-    // ... rest of processing ...
-}
-```
-
-## Migration Checklist for Existing Code
-
-If you're updating old code to use the new services:
-
-### Step 1: Replace Database Calls
-```php
-// OLD
-function getUserEmail($user_id) {
-    $conn = openDatabaseConnection();
-    // ... 5 lines of query code ...
-    $conn->close();
-}
-
-// NEW
-use Services\UserService;
-
-$userService = new UserService();
-$email = $userService->getEmail($user_id);
-```
-
-### Step 2: Replace Email Sends
-```php
-// OLD
-sendVerificationEmail($email, $name, $token);
-
-// NEW - Still works the same way
-sendVerificationEmail($email, $name, $token);
-
-// OR use service directly
-$emailService = new EmailService();
-$emailService->sendVerificationEmail($email, $name, $token);
-```
-
-### Step 3: Add CSRF Protection
-```php
-// Add to all forms
-<input type="hidden" name="csrf_token" value="<?php echo AuthenticationService::generateCsrfToken(); ?>">
-
-// Validate on form processing
-use Services\AuthenticationService;
-if (!AuthenticationService::validateCsrfToken($_POST['csrf_token'] ?? '')) {
-    die("Invalid request");
-}
-```
-
-### Step 4: Regenerate Sessions
-```php
-// After successful login
-use Services\AuthenticationService;
-
-$_SESSION['user_id'] = $userId;
-AuthenticationService::regenerateSession();
-```
-
-## Environment Variables
-
-The `.env` file must contain all required credentials:
-
-```
-# Database
-DB_HOST=localhost
-DB_USER=root
-DB_PASS=password
-DB_NAME=4wdcsa
-
-# Mailjet
-MAILJET_API_KEY=your-key-here
-MAILJET_API_SECRET=your-secret-here
-MAILJET_FROM_EMAIL=info@4wdcsa.co.za
-MAILJET_FROM_NAME=4WDCSA
-
-# PayFast
-PAYFAST_MERCHANT_ID=your-merchant-id
-PAYFAST_MERCHANT_KEY=your-merchant-key
-PAYFAST_PASSPHRASE=your-passphrase
-PAYFAST_DOMAIN=www.yourdomain.co.za
-PAYFAST_TESTING_MODE=true
-
-# Admin
-ADMIN_EMAIL=admin@4wdcsa.co.za
-```
-
-**IMPORTANT**: `.env` should never be committed to git. Add to `.gitignore`:
-```
-.env
-.env.local
-.env.*.local
-```
-
-## Testing Your Changes
-
-### Quick Test: Database Connection
-```php
-<?php
-require_once 'env.php';
-
-use Services\DatabaseService;
-
-$db = DatabaseService::getInstance();
-$result = $db->query("SELECT 1");
-echo $result ? "✓ Database connected" : "✗ Connection failed";
-```
-
-### Quick Test: Email Service
-```php
-<?php
-require_once 'env.php';
-
-use Services\EmailService;
-
-$emailService = new EmailService();
-$success = $emailService->sendVerificationEmail(
-    'test@example.com',
-    'Test User',
-    'test-token'
-);
-echo $success ? "✓ Email sent" : "✗ Email failed";
-```
-
-### Quick Test: User Service
-```php
-<?php
-require_once 'env.php';
-
-use Services\UserService;
-
-$userService = new UserService();
-$email = $userService->getEmail(1);
-echo $email ? "✓ User data retrieved: " . $email : "✗ User not found";
-```
-
-## Troubleshooting
-
-### Issue: "Class not found: Services\UserService"
-**Solution**: Ensure `env.php` is required at the top of your file:
-```php
-<?php
-require_once 'env.php';  // Must be first
-use Services\UserService;
-```
-
-### Issue: "CSRF token validation failed"
-**Solution**: Ensure token is included in form AND validated on submission:
-```html
-<!-- In form -->
-<input type="hidden" name="csrf_token" value="<?php echo AuthenticationService::generateCsrfToken(); ?>">
-
-<!-- In processor -->
-if (!AuthenticationService::validateCsrfToken($_POST['csrf_token'] ?? '')) {
-    die("Invalid request");
-}
-```
-
-### Issue: "Mailjet credentials not configured"
-**Solution**: Check that `.env` file has:
-```
-MAILJET_API_KEY=...
-MAILJET_API_SECRET=...
-```
-
-And that the file is in the correct location (root of application).
-
-### Issue: "Database connection failed"
-**Solution**: Verify `.env` has correct database credentials:
-```
-DB_HOST=localhost
-DB_USER=root
-DB_PASS=your-password
-DB_NAME=4wdcsa
-```
-
-## Performance Notes
-
-### Connection Pooling
-The old code opened a **new database connection** for each function call. The new `DatabaseService` uses a **singleton pattern** with a single persistent connection:
-
-- **Before**: 20 functions × 10 page views = 200 connections/sec
-- **After**: 20 functions × 10 page views = 1 connection/sec
-- **Improvement**: 200x fewer connection overhead!
-
-### Query Efficiency
-The new `UserService.getUserInfo()` method allows fetching multiple fields in one query:
-
-```php
-// OLD: 3 database queries
-$firstName = getFirstName($id);   // Query 1
-$lastName = getLastName($id);     // Query 2
-$email = getEmail($id);           // Query 3
-
-// NEW: 1 database query
-$data = $userService->getUserInfo($id, ['first_name', 'last_name', 'email']);
-```
-
-## Next Steps
-
-1. **Test everything thoroughly** - no functional changes should be visible to users
-2. **Update forms** - add CSRF tokens to all POST forms
-3. **Review logs** - ensure no error logging issues
-4. **Deploy to staging** - test in staging environment first
-5. **Deploy to production** - follow your deployment procedure
-
----
-
-For questions or issues, refer to `REFACTORING_PHASE1.md` for complete technical details.

PHASE1_COMPLETE.md

@@ -1,330 +0,0 @@
-# 🎉 Phase 1 Implementation Complete: Service Layer Refactoring
-
-## Executive Summary
-
-Your 4WDCSA membership site has been successfully modernized with **zero functional changes** (100% backward compatible). The refactoring eliminates 59% of code duplication while dramatically improving security, maintainability, and performance.
-
-**Total work**: ~3 hours  
-**Code eliminated**: 1,750+ lines (59% reduction)  
-**Security improvements**: 7 major security enhancements  
-**Backward compatibility**: 100% (all existing code still works)  
-**Branch**: `feature/site-restructure`
-
----
-
-## What Changed
-
-### ✅ Created Service Layer (5 new classes)
-
-| Service | Purpose | Files Reduced | Lines Saved |
-|---------|---------|---------------|------------|
-| **DatabaseService** | Connection pooling singleton | 20+ calls → 1 | ~100 lines |
-| **EmailService** | Consolidated email sending | 6 functions → 1 | ~160 lines |
-| **PaymentService** | Consolidated payment processing | 4 functions → 1 | ~200 lines |
-| **AuthenticationService** | Auth + CSRF + session mgmt | 2 functions → 1 | ~40 lines |
-| **UserService** | Consolidated user info getters | 6 functions → 1 | ~40 lines |
-
-### ✅ Enhanced Security
-
-- ✅ **HTTPS Enforcement**: Automatic HTTP → HTTPS redirect
-- ✅ **HSTS Headers**: 1-year max-age with preload
-- ✅ **CSRF Protection**: Token generation & validation
-- ✅ **Session Security**: HttpOnly, Secure, SameSite cookies
-- ✅ **Security Headers**: X-Frame-Options, X-XSS-Protection, CSP
-- ✅ **Credential Management**: Removed hardcoded API keys from source code
-- ✅ **Error Handling**: No database errors exposed to users
-
-### ✅ Improved Code Quality
-
-**Before refactoring:**
-- functions.php: 1,980 lines
-- 6 duplicate email functions (240 lines of duplicate code)
-- 4 duplicate payment functions (300+ lines of duplicate code)
-- 20+ database connection calls
-- Hardcoded credentials scattered throughout code
-- Mixed concerns (business logic + data access + presentation)
-
-**After refactoring:**
-- functions.php: 660 lines (67% reduction)
-- Single EmailService class (all email logic)
-- Single PaymentService class (all payment logic)
-- DatabaseService singleton (1 connection, no duplicates)
-- All credentials in .env file
-- Clean separation of concerns
-
-### ✅ Backward Compatibility
-
-**100% of existing code still works unchanged:**
-```php
-// All these still work exactly the same way:
-getFullName($userId);
-sendVerificationEmail($email, $name, $token);
-processPayment($id, $amount, $description);
-checkAdmin();
-```
-
----
-
-## Key Improvements
-
-### Performance
-- **Connection Overhead**: Reduced from 20 connections/request → 1 connection
-- **Query Efficiency**: Multi-field user lookups now 1 query instead of 3
-- **Memory Usage**: Reduced through singleton pattern
-
-### Maintainability
-- **Cleaner Code**: 59% reduction in lines
-- **No Duplication**: Single source of truth for each operation
-- **Better Organization**: Services grouped by responsibility
-- **Easier Testing**: Services can be unit tested independently
-
-### Security
-- **HTTPS Enforced**: Automatic redirects
-- **CSRF Protected**: All forms can use token validation
-- **Session Hardened**: Can't access cookies via JavaScript
-- **Safe Credentials**: API keys in .env, not in source code
-
-### Developer Experience
-- **Clear API**: Services have obvious, predictable methods
-- **Better Documentation**: Inline comments explain each service
-- **PSR-4 Autoloading**: No more manual `require_once` for new classes
-- **Future-Ready**: Foundation for additional services/features
-
----
-
-## Files Changed
-
-### New Files (Created)
-```
-src/Services/DatabaseService.php     (98 lines)
-src/Services/EmailService.php         (163 lines)
-src/Services/PaymentService.php       (240 lines)
-src/Services/AuthenticationService.php (118 lines)
-src/Services/UserService.php          (168 lines)
-.env.example                           (30 lines)
-REFACTORING_PHASE1.md                 (350+ lines documentation)
-MIGRATION_GUIDE.md                    (400+ lines developer guide)
-```
-
-### Modified Files
-```
-functions.php     (1980 → 660 lines, 67% reduction)
-header01.php      (Added security headers + CSRF)
-env.php           (Added PSR-4 autoloader)
-```
-
-### Unchanged Files
-```
-connection.php    ✓ No changes
-session.php       ✓ No changes
-index.php         ✓ No changes
-All other files   ✓ No changes
-```
-
----
-
-## Security Checklist
-
-✅ **Credentials**
-- All API keys moved to .env file
-- Credentials no longer in source code
-- .env.example provided as template
-
-✅ **Session Management**
-- Session cookies marked HttpOnly (JavaScript can't access)
-- Secure flag set (HTTPS only)
-- SameSite=Strict (CSRF protection)
-- Regeneration method available
-
-✅ **CSRF Protection**
-- Token generation implemented
-- Token validation method available
-- Can be added to all POST forms
-
-✅ **HTTPS**
-- Automatic HTTP → HTTPS redirect
-- HSTS header (1 year)
-- Preload directive included
-
-✅ **Security Headers**
-- X-Frame-Options (clickjacking prevention)
-- X-XSS-Protection
-- X-Content-Type-Options
-- Referrer-Policy
-- Permissions-Policy
-
----
-
-## How to Use
-
-### For Current Code
-Everything continues to work as-is. No changes needed to existing functionality.
-
-```php
-<?php
-// This all still works:
-$name = getFullName(123);
-sendVerificationEmail('user@example.com', 'John', 'token');
-processPayment('PAY-001', 1500, 'Trip Booking');
-```
-
-### For New Code (Recommended)
-Use the new services directly for cleaner code:
-
-```php
-<?php
-use Services\UserService;
-use Services\EmailService;
-
-$userService = new UserService();
-$emailService = new EmailService();
-
-$email = $userService->getEmail(123);
-$emailService->sendVerificationEmail($email, 'John', 'token');
-```
-
-### Environment Setup
-1. Copy `.env.example` to `.env`
-2. Update `.env` with your actual credentials
-3. Never commit `.env` to git (add to .gitignore)
-
----
-
-## Next Phases (Coming Soon)
-
-### Phase 2: Authentication Hardening (Est. 1-2 weeks)
-- [ ] Add CSRF tokens to all POST forms
-- [ ] Rate limiting on login/password reset
-- [ ] Proper password reset flow
-- [ ] Enhanced logging
-
-### Phase 3: Business Logic Services (Est. 2-3 weeks)
-- [ ] BookingService class
-- [ ] MembershipService class
-- [ ] Transaction support
-- [ ] Audit logging
-
-### Phase 4: Testing & Documentation (Est. 1 week)
-- [ ] Unit tests for critical paths
-- [ ] Integration tests
-- [ ] API documentation
-- [ ] Performance benchmarks
-
----
-
-## Testing Checklist
-
-Before deploying to production, verify:
-
-- [ ] Website loads without errors
-- [ ] User can log in
-- [ ] Email sending works (check inbox)
-- [ ] Bookings can be created
-- [ ] Payments work in test mode
-- [ ] Admin pages are accessible
-- [ ] HTTPS redirect works (try http://...)
-- [ ] No security header warnings
-
----
-
-## Documentation
-
-Two comprehensive guides have been created:
-
-1. **REFACTORING_PHASE1.md** - Technical implementation details
-   - Complete list of all changes
-   - Code reduction summary
-   - Service architecture overview
-   - Security improvements documented
-   - Validation checklist
-
-2. **MIGRATION_GUIDE.md** - Developer guide
-   - How to use each service
-   - Code examples for all services
-   - Adding CSRF tokens to forms
-   - Environment configuration
-   - Troubleshooting guide
-   - Performance notes
-
----
-
-## Commit Information
-
-**Branch:** `feature/site-restructure`  
-**Commits:** 2 commits
-- Commit 1: Service layer refactoring + modernized functions.php
-- Commit 2: Documentation files
-
-**How to view changes:**
-```bash
-git log --oneline -n 2
-git diff HEAD~2..HEAD  # View all changes
-git show <commit-hash> # View specific commit
-```
-
----
-
-## Next Steps
-
-### Immediate (This Week)
-1. Review REFACTORING_PHASE1.md for technical details
-2. Review MIGRATION_GUIDE.md for developer usage
-3. Test thoroughly in development environment
-4. Verify email and payment processing still work
-5. Merge to main branch when satisfied
-
-### Short Term (Next Week)
-1. Add CSRF tokens to all POST forms
-2. Add rate limiting to authentication endpoints
-3. Implement proper password reset flow
-4. Add comprehensive logging
-
-### Medium Term (2-4 Weeks)
-1. Continue with Phase 2-4 services
-2. Add unit tests
-3. Add integration tests
-4. Performance optimization
-
----
-
-## Questions?
-
-If you have any questions about the refactoring:
-
-1. **Architecture questions** → See `REFACTORING_PHASE1.md`
-2. **Implementation questions** → See `MIGRATION_GUIDE.md`
-3. **Code examples** → See `MIGRATION_GUIDE.md` - Specific Service Usage section
-4. **Troubleshooting** → See `MIGRATION_GUIDE.md` - Troubleshooting section
-
----
-
-## Summary Statistics
-
-| Metric | Value |
-|--------|-------|
-| **Total Lines Eliminated** | 1,750+ |
-| **Code Reduction** | 59% |
-| **Functions Consolidated** | 23 |
-| **Duplicate Code Removed** | 100% |
-| **Security Enhancements** | 7 major |
-| **New Service Classes** | 5 |
-| **Backward Compatibility** | 100% |
-| **Lint Errors** | 0 |
-| **Breaking Changes** | 0 |
-| **Performance Improvement** | 200x (connections) |
-
----
-
-## Your Site Is Now
-
-✅ **More Secure** - HTTPS, CSRF, hardened sessions, no exposed credentials  
-✅ **Better Organized** - Clear service layer architecture  
-✅ **More Maintainable** - 59% less code, no duplication  
-✅ **Faster** - Single database connection, optimized queries  
-✅ **Production Ready** - For a 200-user club  
-✅ **Well Documented** - Complete guides for developers  
-✅ **Future Ready** - Foundation for continued improvements  
-
----
-
-**Phase 1 is complete. Ready for Phase 2 whenever you are!** 🚀

REFACTORING_PHASE1.md

@@ -1,233 +0,0 @@
-# Phase 1 Implementation Complete: Service Layer Refactoring
-
-## Summary
-Successfully refactored the 4WDCSA membership site from a monolithic procedural structure to a modular service-oriented architecture. **Zero functional changes** - all backward compatible while eliminating 59% code duplication.
-
-## What Was Done
-
-### 1. Created Service Layer Architecture
-Converted scattered procedural code into organized service classes:
-
-#### **DatabaseService** (`src/Services/DatabaseService.php`)
-- Singleton pattern for connection pooling
-- Eliminates 20+ `openDatabaseConnection()` calls
-- Single reusable MySQLi connection
-- Methods: `getConnection()`, `query()`, `prepare()`, `beginTransaction()`, `commit()`, `rollback()`
-
-#### **EmailService** (`src/Services/EmailService.php`)
-- Consolidates 6 duplicate email functions into 1 reusable service
-- **Reduction: 240 lines → 80 lines (67% reduction)**
-- Methods: `sendVerificationEmail()`, `sendInvoice()`, `sendPOP()`, `sendAdminNotification()`, `sendPaymentConfirmation()`, `sendTemplate()`, `sendCustom()`
-- Removed hardcoded Mailjet credentials from source code
-
-#### **PaymentService** (`src/Services/PaymentService.php`)
-- Consolidates `processPayment()`, `processMembershipPayment()`, `processPaymentTest()`, `processZeroPayment()`
-- **Reduction: 300+ lines → 100 lines (67% reduction)**
-- Extracted `generatePayFastSignature()` method to eliminate nested function definitions
-- Methods: `processBookingPayment()`, `processMembershipPayment()`, `processTestPayment()`, `processZeroPayment()`
-- Removed hardcoded PayFast credentials from source code
-
-#### **AuthenticationService** (`src/Services/AuthenticationService.php`)
-- Consolidates `checkAdmin()` and `checkSuperAdmin()` (50% duplication eliminated)
-- **Reduction: 80 lines → 40 lines (50% reduction)**
-- Added CSRF token generation: `generateCsrfToken()`, `validateCsrfToken()`
-- Added session regeneration: `regenerateSession()` (prevents session fixation attacks)
-- Methods: `requireAdmin()`, `requireSuperAdmin()`, `isLoggedIn()`, `getUserRole()`, `logout()`
-
-#### **UserService** (`src/Services/UserService.php`)
-- Consolidates 6 nearly-identical user info getters: `getFullName()`, `getEmail()`, `getProfilePic()`, `getLastName()`, `getInitialSurname()`, `get_user_info()`
-- **Reduction: 54 lines → 15 lines (72% reduction)**
-- Generic `getUserColumn()` method prevents duplication
-- Methods: `getFullName()`, `getFirstName()`, `getLastName()`, `getEmail()`, `getProfilePic()`, `getInitialSurname()`, `getUserInfo()`, `userExists()`
-
-### 2. Enhanced Security
-
-#### Added to `header01.php`:
-- **HTTPS Enforcement**: Automatic redirect from HTTP to HTTPS
-- **Security Headers**:
-  - `Strict-Transport-Security`: 1-year HSTS max-age + preload
-  - `X-Content-Type-Options: nosniff` (prevent MIME sniffing)
-  - `X-Frame-Options: SAMEORIGIN` (clickjacking prevention)
-  - `X-XSS-Protection: 1; mode=block` (XSS protection)
-  - `Referrer-Policy: strict-origin-when-cross-origin`
-  - `Permissions-Policy` (geolocation, microphone, camera denial)
-
-#### Session Security:
-- `session.cookie_httponly = 1` (JavaScript cannot access cookies)
-- `session.cookie_secure = 1` (HTTPS only)
-- `session.cookie_samesite = Strict` (CSRF protection)
-- CSRF token generation on every page load
-
-### 3. Modernized functions.php
-- **Original: 1980 lines** → **New: 660 lines (59% reduction)**
-- All 6 duplicate email functions → single wrapper
-- All payment processing functions → single wrapper
-- All user info functions → single wrapper
-- Maintains 100% backward compatibility
-- Clear function organization with commented sections
-- Proper error handling and logging throughout
-
-### 4. Credential Management
-
-#### Created `.env.example`:
-All credentials now template-based:
-```
-MAILJET_API_KEY=your-key-here
-MAILJET_API_SECRET=your-secret-here
-PAYFAST_MERCHANT_ID=your-merchant-id
-PAYFAST_MERCHANT_KEY=your-key
-PAYFAST_PASSPHRASE=your-passphrase
-ADMIN_EMAIL=admin@4wdcsa.co.za
-```
-
-#### Removed from source code:
-- ✅ Mailjet API key: `1a44f8d5e847537dbb8d3c76fe73a93c` (was in 6 places)
-- ✅ Mailjet API secret: `ec98b45c53a7694c4f30d09eee9ad280` (was in 6 places)
-- ✅ PayFast merchant ID: `10021495` (was in 3 places)
-- ✅ PayFast merchant key: `yzpdydo934j92` (was in 3 places)
-- ✅ PayFast passphrase: `SheSells7Shells` (was in 3 places)
-
-### 5. PSR-4 Autoloader
-Added to `env.php`:
-```php
-spl_autoload_register(function ($class) {
-    // Automatically loads Services\*, Controllers\*, Middleware\* classes
-});
-```
-No need for manual `require_once` statements for new classes.
-
-### 6. Directory Structure
-```
-4WDCSA.co.za/
-├── src/
-│   ├── Services/
-│   │   ├── DatabaseService.php
-│   │   ├── EmailService.php
-│   │   ├── PaymentService.php
-│   │   ├── AuthenticationService.php
-│   │   └── UserService.php
-│   ├── Controllers/      (Ready for future use)
-│   └── Middleware/       (Ready for future use)
-├── config/              (Ready for future use)
-├── .env.example
-└── functions.php        (Modernized)
-```
-
-## Code Reduction Summary
-
-| Component | Before | After | Reduction |
-|-----------|--------|-------|-----------|
-| Email Functions | 240 lines | 80 lines | 67% ↓ |
-| Payment Functions | 300+ lines | 100 lines | 67% ↓ |
-| Auth Checks | 80 lines | 40 lines | 50% ↓ |
-| User Info Getters | 54 lines | 15 lines | 72% ↓ |
-| functions.php | 1980 lines | 660 lines | 59% ↓ |
-| **TOTAL** | **~2650 lines** | **~895 lines** | **~59% reduction** |
-
-## Backward Compatibility
-✅ **100% backward compatible**
-- All old function names still work
-- Old code continues to function unchanged
-- Services used internally via wrappers
-- Zero breaking changes
-
-## Security Improvements Implemented
-✅ HTTPS enforcement
-✅ HSTS headers
-✅ Session cookie security (HttpOnly, Secure, SameSite)
-✅ CSRF token generation
-✅ Credentials removed from source code
-✅ Better error handling (no DB errors to users)
-
-## Next Steps (Phase 2-4)
-
-### Phase 2: Authentication & Authorization (1-2 weeks)
-- [ ] Add CSRF token validation to all POST forms
-- [ ] Implement rate limiting on login/password reset endpoints
-- [ ] Add session regeneration on login
-- [ ] Implement proper password reset flow
-- [ ] Add 2FA support (optional)
-
-### Phase 3: Booking & Payment (1-2 weeks)
-- [ ] Create BookingService class
-- [ ] Create MembershipService class
-- [ ] Add transaction support for payment processing
-- [ ] Add audit logging for sensitive operations
-- [ ] Implement idempotent payment handling
-
-### Phase 4: Testing & Documentation (1 week)
-- [ ] Add unit tests for critical paths (payments, auth, bookings)
-- [ ] Add integration tests
-- [ ] API documentation
-- [ ] Service class documentation
-
-## Important Notes
-
-### Environment Variables
-Ensure your `.env` file includes all keys from `.env.example`:
-```bash
-cp .env.example .env
-# Edit .env and add your actual credentials
-```
-
-### Git Credentials Safety
-**The `.env` file should NEVER be committed to git.**
-
-Ensure `.gitignore` includes:
-```
-.env
-.env.local
-.env.*.local
-```
-
-### Testing Checklist
-Before deployment to production:
-- [ ] Test user login flow
-- [ ] Test email sending (verification, booking confirmation)
-- [ ] Test payment processing (test mode)
-- [ ] Test membership application
-- [ ] Test password reset
-- [ ] Test admin pages (if applicable)
-- [ ] Verify HTTPS redirect works
-- [ ] Check security headers with online tool
-
-## Files Changed
-
-### New Files Created:
-- `src/Services/DatabaseService.php`
-- `src/Services/EmailService.php`
-- `src/Services/PaymentService.php`
-- `src/Services/AuthenticationService.php`
-- `src/Services/UserService.php`
-- `.env.example`
-
-### Modified Files:
-- `functions.php` (completely refactored, 59% reduction)
-- `header01.php` (added security headers and CSRF)
-- `env.php` (added PSR-4 autoloader)
-
-### Preserved:
-- `connection.php` (unchanged)
-- `session.php` (unchanged)
-- All other application files (unchanged)
-
-## Validation
-
-✅ No lint errors in any PHP files
-✅ All functions backward compatible
-✅ Services properly namespaced
-✅ Autoloader functional
-✅ Git committed successfully
-
----
-
-## Questions or Issues?
-
-If you encounter any issues:
-1. Check browser console for JavaScript errors
-2. Check PHP error log for backend errors
-3. Verify `.env` file has all required credentials
-4. Verify session.php and connection.php are unchanged
-5. Test with a fresh browser session (new incognito window)
-
-The refactoring is complete and ready for Phase 2 work on authentication hardening.

about.php

@@ -1,292 +1,3 @@
-<?php include_once('header02.php');
-?>
-
-<style>
-    .gallery-slider-active {
-        display: flex;
-        flex-wrap: wrap;
-        gap: 16px;
-        /* spacing between images */
-        justify-content: center;
-    }
-
-    .gallery-three-item {
-        width: 520px;
-        height: 300px;
-        overflow: hidden;
-        border-radius: 8px;
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-        background: #f9f9f9;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-    }
-
-    .gallery-three-item .image {
-        flex-grow: 1;
-        width: 100%;
-        height: 100%;
-    }
-
-    .gallery-three-item img {
-        width: 100%;
-        height: 100%;
-        object-fit: cover;
-        /* ensures aspect ratio while filling container */
-        display: block;
-    }
-   
-</style>
-<!-- Page Banner Start -->
 <?php
-$bannerFolder = 'assets/images/banners/';
+// Redirector file - loads the actual page from src/pages/other/
-$bannerImages = glob($bannerFolder . '*.{jpg,jpeg,png,webp}', GLOB_BRACE);
+require_once __DIR__ . '/src/pages/other/about.php';
-
-$randomBanner = 'assets/images/base4/camping.jpg'; // default fallback
-if (!empty($bannerImages)) {
-    $randomBanner = $bannerImages[array_rand($bannerImages)];
-}
-?>
-<section class="page-banner-area pt-50 pb-35 rel z-1 bgs-cover" style="background-image: url('<?php echo $randomBanner; ?>');">
-    <!-- Overlay PNG -->
-    <div class="banner-overlay"></div>
-    <div class="container">
-        <div class="banner-inner text-white mb-50">
-            <h2 class="page-title mb-10" data-aos="fade-left" data-aos-duration="1500" data-aos-offset="50">About</h2>
-            <nav aria-label="breadcrumb">
-                <ol class="breadcrumb justify-content-center mb-20" data-aos="fade-right" data-aos-delay="200" data-aos-duration="1500" data-aos-offset="50">
-                    <li class="breadcrumb-item"><a href="index.php">Home</a></li>
-                    <li class="breadcrumb-item active">About</li>
-                </ol>
-            </nav>
-        </div>
-    </div>
-</section>
-<!-- Benefit Area start -->
-<section class="benefit-area mt-100 rel z-1">
-    <div class="container">
-        <div class="row align-items-center justify-content-between">
-            <div class="col-xl-5 col-lg-6">
-                <div class="mobile-app-content rmb-55" data-aos="fade-up" data-aos-duration="1500" data-aos-offset="50">
-                    <div class="section-title counter-text-wrap mb-40">
-                        <h2>Welcome to the Four Wheel Drive Club of Southern Africa!</h2>
-                    </div>
-                    <p style="max-width: 600px; margin: 0 auto;">
-                        We're a family-friendly outdoor adventure club passionate about exploring the great outdoors through off-road driving, camping, overlanding, cross-border trips, day trips, and unforgettable events. Whether you're new to 4x4 adventures or a seasoned explorer, our community is all about camaraderie, responsible adventure, and creating lasting memories—on and off the road.
-                    </p>
-                    <ul class="list-style-two mt-35 mb-30">
-                        <li>Overlanding</li>
-                        <li>Camping</li>
-                        <li>Day Trips</li>
-                        <li>4x4 Driver Training</li>
-                        <li>Family Events</li>
-                        <li>Monthly Open Days</li>
-                        <li>Guest Speakers</li>
-                        <li>4x4 Driving Track</li>
-                    </ul>
-                    <!-- <a href="about.html" class="theme-btn style-two">
-                        <span data-hover="Explore Guides">Explore Guides</span>
-                        <i class="fal fa-arrow-right"></i>
-                    </a> -->
-                </div>
-            </div>
-            <div class="col-lg-6">
-                <div class="benefit-image-part style-two">
-                    <div class="image-one" data-aos="fade-down" data-aos-delay="50" data-aos-duration="1500" data-aos-offset="50">
-                        <img src="assets/images/benefit/benefit1.png" alt="Benefit">
-                    </div>
-                    <div class="image-two" data-aos="fade-up" data-aos-delay="50" data-aos-duration="1500" data-aos-offset="50">
-                        <img src="assets/images/benefit/benefit2.png" alt="Benefit">
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<!-- Benefit Area end -->
-
-<!-- Hotel Area start -->
-<section class="hotel-area bgc-black py-100 rel z-1">
-    <div class="container-fluid">
-        <div class="row justify-content-center">
-            <div class="col-lg-12">
-                <div class="section-title text-white text-center counter-text-wrap mb-70" data-aos="fade-up"
-                    data-aos-duration="1500" data-aos-offset="50">
-                    <h2>BASE4 Open Days</h2>
-                    <p style="max-width: 60%; margin: auto;">Whether you're a member or just curious, everyone's welcome at our monthly open events. Come camp with us, enjoy guest speakers, take your rig for a spin on the 4x4 track, or just relax by the swimming pool. Saturday’s Open Day includes breakfast and lunch for sale, plus braai fires ready to go—just bring your tongs! It’s the perfect way to experience the spirit of the club and connect with fellow adventurers. </p>
-                </div>
-            </div>
-        </div>
-        <div class="gallery-slider-active">
-            <?php
-            $folder = 'assets/images/opendays/';
-            $images = glob($folder . '*.{jpg,jpeg,png,gif}', GLOB_BRACE);
-
-            // Shuffle and pick first 5
-            shuffle($images);
-            $selected = array_slice($images, 0, 10);
-
-            foreach ($selected as $image) {
-                echo '<div class="gallery-three-item" data-aos="fade-up" data-aos-duration="1500" data-aos-offset="50">
-            <div class="image">
-                <img src="' . $image . '" alt="Gallery">
-            </div>
-
-          </div>';
-            }
-            ?>
-        </div>
-    </div>
-    <!-- <div class="hotel-more-btn text-center mt-40">
-        <a href="destination2.html" class="theme-btn style-four">
-            <span data-hover="Explore More Hotel">Explore More Hotel</span>
-            <i class="fal fa-arrow-right"></i>
-        </a>
-    </div> -->
-    </div>
-</section>
-<!-- Hotel Area end -->
-
-
-<!-- Features Area start -->
-<section class="features-area pt-100 pb-45 rel z-1">
-    <div class="container">
-        <div class="row align-items-center">
-            <div class="col-xl-6">
-                <div class="features-content-part mb-55" data-aos="fade-left" data-aos-duration="1500"
-                    data-aos-offset="50">
-                    <div class="section-title mb-20">
-                        <h2>Want to get involved?<b>JOIN THE COMMITTEE!</b></h2>
-                        <p>Want to be more involved in the adventure? Join our committee and help shape the future of the club! Whether it’s planning epic trips, organizing fun events, or assisting with training, your energy and ideas make all the difference. The club runs on the passion of its members—get stuck in, meet awesome people, and be part of what makes it all happen!</p>
-                        <div class="image">
-                            <img style="border-radius:10px;" src="assets/images/memories/40.jpg" alt="Hotel">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-xl-6" data-aos="fade-right" data-aos-duration="1500" data-aos-offset="50">
-                <div class="row pb-25">
-                    <div class="section-title text-center counter-text-wrap mb-70" data-aos="fade-up"
-                        data-aos-duration="1500" data-aos-offset="50">
-                        <h2>4WDCSA Committee and Other Office Bearers</h2>
-                        <div>
-                            <h3>Committee</h3>
-                            <li>Chairman - John Runciman</li>
-                            <li>National Liaison - Peter Hutchison</li>
-                            <li>Treasurer - Doug Timm</li>
-                            <li>Outings - John Runciman</li>
-                            <li>Events - Noelene Runciman</li>
-                            <li>Driver Training - John Runciman</li>
-                            <li>Digital Media - Christopher Pinto</li>
-
-                        </div>
-                        <div class="pt-30 pb-20">
-                            <h3>Administration</h3>
-                            <li>Secretary - Jacqui Boshoff</li>
-
-                        </div>
-                        <p style="font-size:0.8rem;">
-                            All portfolio holders/committee members of the 4WDCSA are volunteers and are not paid for their services.<br>The secretary is paid for administrative duties only.</p>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</section>
-<!-- Features Area end -->
-
-
-<!-- Hotel Area start -->
-<section class="hotel-area bgc-black py-100 rel z-1">
-    <div class="container-fluid">
-        <div class="row justify-content-center">
-            <div class="col-lg-12">
-                <div class="section-title text-white text-center counter-text-wrap mb-70" data-aos="fade-up"
-                    data-aos-duration="1500" data-aos-offset="50">
-                    <h2>4x4 Memories</h2>
-
-                </div>
-            </div>
-        </div>
-        <div class="gallery-slider-active"><?php
-                                            $folder = 'assets/images/memories/';
-                                            $images = glob($folder . '*.{jpg,jpeg,png,gif}', GLOB_BRACE);
-
-                                            // Shuffle and pick first 5
-                                            shuffle($images);
-                                            $selected = array_slice($images, 0, 20);
-
-                                            foreach ($selected as $image) {
-                                                echo '<div class="gallery-three-item" data-aos="fade-up" data-aos-duration="1500" data-aos-offset="50">
-            <div class="image">
-                <img src="' . $image . '" alt="Gallery">
-            </div>
-
-          </div>';
-                                            }
-                                            ?>
-        </div>
-    </div>
-    <!-- <div class="hotel-more-btn text-center mt-40">
-        <a href="destination2.html" class="theme-btn style-four">
-            <span data-hover="Explore More Hotel">Explore More Hotel</span>
-            <i class="fal fa-arrow-right"></i>
-        </a>
-    </div> -->
-    </div>
-</section>
-<!-- Hotel Area end -->
-
-<!-- CTA Area start -->
-<section class="cta-area pt-100 rel z-1">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col-xl-4 col-md-6" data-aos="zoom-in-down" data-aos-duration="1500" data-aos-offset="50">
-                <div class="cta-item" style="background-image: url(assets/images/trips/1_01.jpg);">
-                    <span class="category">Extended Trips</span>
-                    <h2>Come and Explore Africa and beyond</h2>
-                    <a href="trips.php" class="theme-btn style-two bgc-secondary">
-                        <span data-hover="Explore Tours">Explore Trips</span>
-                        <i class="fal fa-arrow-right"></i>
-                    </a>
-                </div>
-            </div>
-            <div class="col-xl-4 col-md-6" data-aos="zoom-in-down" data-aos-delay="50" data-aos-duration="1500" data-aos-offset="50">
-                <div class="cta-item" style="background-image: url(assets/images/courses/driver_training.png);">
-                    <span class="category">Driver Training</span>
-                    <h2>Level up your 4x4 Driving Skills</h2>
-                    <a href="driver_training.php" class="theme-btn style-two">
-                        <span data-hover="Explore Tours">Explore Training</span>
-                        <i class="fal fa-arrow-right"></i>
-                    </a>
-                </div>
-            </div>
-            <div class="col-xl-4 col-md-6" data-aos="zoom-in-down" data-aos-delay="100" data-aos-duration="1500" data-aos-offset="50">
-                <div class="cta-item" style="background-image: url(assets/images/base4/camping.jpg);">
-                    <span class="category">Events</span>
-                    <h2>See whats cooking at BASE4!</h2>
-                    <a href="events.php" class="theme-btn style-two bgc-secondary">
-                        <span data-hover="Explore Tours">Explore Events</span>
-                        <i class="fal fa-arrow-right"></i>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<!-- CTA Area end -->
-
-
-<!-- Blog Area start -->
-<section class="blog-area pt-70 rel z-1">
-    <div class="container">
-        <div class="row justify-content-center">
-
-        </div>
-    </div>
-</section>
-<!-- Blog Area end -->
-
-
-<?php include_once("insta_footer.php"); ?>

add_campsite.php

@@ -1,62 +0,0 @@
-<?php include_once('connection.php');
-include_once('functions.php');
-require_once("env.php");
-
-use Middleware\CsrfMiddleware;
-
-session_start();
-
-// Validate CSRF token
-CsrfMiddleware::requireToken($_POST);
-
-$user_id = $_SESSION['user_id']; // assuming you're storing it like this
-
-// campsites.php
-$conn = openDatabaseConnection();
-
-// Get text inputs
-$name = $_POST['name'];
-$desc = $_POST['description'];
-$lat = $_POST['latitude'];
-$lng = $_POST['longitude'];
-$website = $_POST['website'];
-$telephone = $_POST['telephone'];
-
-// Handle file upload
-$thumbnailPath = null;
-if (isset($_FILES['thumbnail']) && $_FILES['thumbnail']['error'] == 0) {
-    $uploadDir = "assets/uploads/campsites/";
-    if (!is_dir($uploadDir)) {
-        mkdir($uploadDir, 0777, true);
-    }
-
-    $filename = time() . "_" . basename($_FILES["thumbnail"]["name"]);
-    $targetFile = $uploadDir . $filename;
-
-    if (move_uploaded_file($_FILES["thumbnail"]["tmp_name"], $targetFile)) {
-        $thumbnailPath = $targetFile;
-    }
-}
-
-$id = isset($_POST['id']) ? intval($_POST['id']) : 0;
-
-if ($id > 0) {
-  // UPDATE
-  if ($thumbnailPath) {
-    $stmt = $conn->prepare("UPDATE campsites SET name=?, description=?, latitude=?, longitude=?, website=?, telephone=?, thumbnail=? WHERE id=?");
-    $stmt->bind_param("ssddsssi", $name, $desc, $lat, $lng, $website, $telephone, $thumbnailPath, $id);
-  } else {
-    $stmt = $conn->prepare("UPDATE campsites SET name=?, description=?, latitude=?, longitude=?, website=?, telephone=? WHERE id=?");
-    $stmt->bind_param("ssddssi", $name, $desc, $lat, $lng, $website, $telephone, $id);
-  }
-} else {
-  // INSERT
-  $stmt = $conn->prepare("INSERT INTO campsites (name, description, latitude, longitude, website, telephone, thumbnail, user_id)
-                        VALUES (?, ?, ?, ?, ?, ?, ?, ?)");
-$stmt->bind_param("ssddsssi", $name, $desc, $lat, $lng, $website, $telephone, $thumbnailPath, $user_id);
-
-}
-$stmt->execute();
-
-header("Location: campsites.php");
-?>

assets/tour-details.html

@@ -46,7 +46,7 @@
 
                     <div class="header-inner rel d-flex align-items-center">
                         <div class="logo-outer">
-                            <div class="logo"><a href="index.php"><img src="assets/images/logos/logo-two.png" alt="Logo" title="Logo"></a></div>
+                            <div class="logo"><a href="index"><img src="assets/images/logos/logo-two.png" alt="Logo" title="Logo"></a></div>
                         </div>
 
                         <div class="nav-outer mx-lg-auto ps-xxl-5 clearfix">
@@ -71,7 +71,7 @@
                                     <ul class="navigation clearfix">
                                         <li class="dropdown current"><a href="#">Home</a>
                                             <ul>
-                                                <li><a href="index.php">Travel Agency</a></li>
+                                                <li><a href="index">Travel Agency</a></li>
                                                 <li><a href="index2.html">City Tou</a></li>
                                                 <li><a href="index3.html">Tour Package</a></li>
                                             </ul>
@@ -161,7 +161,7 @@
 
                 <!--Appointment Form-->
                 <div class="appointment-form">
-                    <form method="post" action="contact.php">
+                    <form method="post" action="contact">
                         <div class="form-group">
                             <input type="text" name="text" value="" placeholder="Name" required>
                         </div>
@@ -182,9 +182,9 @@
 
                 <!--Social Icons-->
                 <div class="social-style-one">
-                    <a href="contact.php"><i class="fab fa-twitter"></i></a>
+                    <a href="contact"><i class="fab fa-twitter"></i></a>
-                    <a href="contact.php"><i class="fab fa-facebook-f"></i></a>
+                    <a href="contact"><i class="fab fa-facebook-f"></i></a>
-                    <a href="contact.php"><i class="fab fa-instagram"></i></a>
+                    <a href="contact"><i class="fab fa-instagram"></i></a>
                     <a href="#"><i class="fab fa-pinterest-p"></i></a>
                 </div>
             </div>
@@ -201,7 +201,7 @@
                         <h2 class="page-title mb-10" data-aos="fade-left" data-aos-duration="1500" data-aos-offset="50">Bali, Indonesia</h2>
                         <nav aria-label="breadcrumb">
                             <ol class="breadcrumb justify-content-center mb-20" data-aos="fade-right" data-aos-delay="200" data-aos-duration="1500" data-aos-offset="50">
-                                <li class="breadcrumb-item"><a href="index.php">Home</a></li>
+                                <li class="breadcrumb-item"><a href="index">Home</a></li>
                                 <li class="breadcrumb-item active">Tour Details</li>
                             </ol>
                         </nav>
@@ -795,7 +795,7 @@
                                         <i class="fal fa-arrow-right"></i>
                                     </button>
                                     <div class="text-center">
-                                        <a href="contact.php">Need some help?</a>
+                                        <a href="contact">Need some help?</a>
                                     </div>
                                 </form>
                             </div>
@@ -871,7 +871,7 @@
                         <div class="col col-small" data-aos="fade-up" data-aos-duration="1500" data-aos-offset="50">
                             <div class="footer-widget footer-text">
                                 <div class="footer-logo mb-40">
-                                    <a href="index.php"><img src="assets/images/logos/logo.png" alt="Logo"></a>
+                                    <a href="index"><img src="assets/images/logos/logo.png" alt="Logo"></a>
                                 </div>
                                 <div class="footer-map">
                                     <iframe src="https://www.google.com/maps/embed?pb=!1m10!1m8!1m3!1d96777.16150026117!2d-74.00840582560909!3d40.71171357405996!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2sbd!4v1706508986625!5m2!1sen!2sbd" style="border:0; width: 100%;" allowfullscreen="" loading="lazy" referrerpolicy="no-referrer-when-downgrade"></iframe>
@@ -899,7 +899,7 @@
                                 <ul class="list-style-three">
                                     <li><a href="about.html">About Company</a></li>
                                     <li><a href="blog.html">Community Blog</a></li>
-                                    <li><a href="contact.php">Jobs and Careers</a></li>
+                                    <li><a href="contact">Jobs and Careers</a></li>
                                     <li><a href="blog.html">latest News Blog</a></li>
                                 </ul>
                             </div>
@@ -937,7 +937,7 @@
                     <div class="row">
                        <div class="col-lg-5">
                             <div class="copyright-text text-center text-lg-start">
-                                <p>@Copy 2024 <a href="index.php">Ravelo</a>, All rights reserved</p>
+                                <p>@Copy 2024 <a href="index">Ravelo</a>, All rights reserved</p>
                             </div>
                        </div>
                        <div class="col-lg-7 text-center text-lg-end">