admin/39038-vm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

styling email

Browse Source
This commit is contained in:
Flatlogic Bot 2026-03-08 17:36:49 +00:00
parent f510b10571
commit 031d73aec7
3 changed files with 133 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin_platform_users.php
View File

@ -12,7 +12,8 @@ if (!isset($_SESSION['user_id']) || ($_SESSION['user_role'] ?? '') !== 'admin')
// Check permission // Check permission
if (!has_permission('manage_platform_users')) { if (!has_permission('manage_platform_users')) {
render_header(t('nav_platform_users'), 'platform_users'); render_header(t('nav_platform_users'), 'platform_users');
echo '<div class="container py-5"><div class="alert alert-danger">Access Denied. You do not have permission to manage platform users.</div></div>'; $uid = $_SESSION['user_id'] ?? 'unknown';
echo '<div class="container py-5"><div class="alert alert-danger">Access Denied. You do not have permission to manage platform users. (Error Code: 403-U' . $uid . ')</div></div>';
render_footer(); render_footer();
exit; exit;
} }

2
login.php
View File

@ -75,7 +75,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
render_header('Login / Reset Password', 'login', false, false); render_header('Login / Reset Password', 'login', false, false);
?> ?>
<div class="row justify-content-center"> <div class="row justify-content-center align-items-center" style="min-height: 75vh;">
<div class="col-md-6 col-lg-5"> <div class="col-md-6 col-lg-5">
<?php if ($errors): ?> <?php if ($errors): ?>

146
mail/MailService.php
View File

@ -7,6 +7,11 @@
// // Contact form helper: // // Contact form helper:
// MailService::sendContactMessage($name, $email, $message, $to = null, $subject = 'New contact form'); // MailService::sendContactMessage($name, $email, $message, $to = null, $subject = 'New contact form');
// Ensure DB config is loaded for settings
if (!function_exists('db') && file_exists(__DIR__ . '/../db/config.php')) {
require_once __DIR__ . '/../db/config.php';
}
class MailService class MailService
{ {
// Universal mail sender (no attachments by design) // Universal mail sender (no attachments by design)
@ -18,26 +23,26 @@ class MailService
if (file_exists($autoload)) { if (file_exists($autoload)) {
require_once $autoload; require_once $autoload;
} }
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'libphp-phpmailer/autoload.php'; @require_once 'libphp-phpmailer/autoload.php';
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'libphp-phpmailer/src/Exception.php'; @require_once 'libphp-phpmailer/src/Exception.php';
@require_once 'libphp-phpmailer/src/SMTP.php'; @require_once 'libphp-phpmailer/src/SMTP.php';
@require_once 'libphp-phpmailer/src/PHPMailer.php'; @require_once 'libphp-phpmailer/src/PHPMailer.php';
} }
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'PHPMailer/src/Exception.php'; @require_once 'PHPMailer/src/Exception.php';
@require_once 'PHPMailer/src/SMTP.php'; @require_once 'PHPMailer/src/SMTP.php';
@require_once 'PHPMailer/src/PHPMailer.php'; @require_once 'PHPMailer/src/PHPMailer.php';
} }
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'PHPMailer/Exception.php'; @require_once 'PHPMailer/Exception.php';
@require_once 'PHPMailer/SMTP.php'; @require_once 'PHPMailer/SMTP.php';
@require_once 'PHPMailer/PHPMailer.php'; @require_once 'PHPMailer/PHPMailer.php';
} }
} }
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
return [ 'success' => false, 'error' => 'PHPMailer not available' ]; return [ 'success' => false, 'error' => 'PHPMailer not available' ];
} }
@ -91,14 +96,18 @@ class MailService
$mail->isHTML(true); $mail->isHTML(true);
$mail->Subject = $subject; $mail->Subject = $subject;
$mail->Body = $htmlBody;
// Apply standardized HTML wrapper
$mail->Body = self::wrapHtml($htmlBody, $subject);
$mail->AltBody = $textBody ?? strip_tags($htmlBody); $mail->AltBody = $textBody ?? strip_tags($htmlBody);
$ok = $mail->send(); $ok = $mail->send();
return [ 'success' => $ok ]; return [ 'success' => $ok ];
} catch (\Throwable $e) { } catch (Throwable $e) {
return [ 'success' => false, 'error' => 'PHPMailer error: ' . $e->getMessage() ]; return [ 'success' => false, 'error' => 'PHPMailer error: ' . $e->getMessage() ];
} }
} }
private static function loadConfig(): array private static function loadConfig(): array
{ {
$configPath = __DIR__ . '/config.php'; $configPath = __DIR__ . '/config.php';
@ -124,21 +133,21 @@ class MailService
require_once $autoload; require_once $autoload;
} }
// Fallback to system-wide PHPMailer (installed via apt: libphp-phpmailer) // Fallback to system-wide PHPMailer (installed via apt: libphp-phpmailer)
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
// Debian/Ubuntu package layout (libphp-phpmailer) // Debian/Ubuntu package layout (libphp-phpmailer)
@require_once 'libphp-phpmailer/autoload.php'; @require_once 'libphp-phpmailer/autoload.php';
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'libphp-phpmailer/src/Exception.php'; @require_once 'libphp-phpmailer/src/Exception.php';
@require_once 'libphp-phpmailer/src/SMTP.php'; @require_once 'libphp-phpmailer/src/SMTP.php';
@require_once 'libphp-phpmailer/src/PHPMailer.php'; @require_once 'libphp-phpmailer/src/PHPMailer.php';
} }
// Alternative layout (older PHPMailer package names) // Alternative layout (older PHPMailer package names)
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'PHPMailer/src/Exception.php'; @require_once 'PHPMailer/src/Exception.php';
@require_once 'PHPMailer/src/SMTP.php'; @require_once 'PHPMailer/src/SMTP.php';
@require_once 'PHPMailer/src/PHPMailer.php'; @require_once 'PHPMailer/src/PHPMailer.php';
} }
if (!class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if (!class_exists('PHPMailer\PHPMailer\PHPMailer')) {
@require_once 'PHPMailer/Exception.php'; @require_once 'PHPMailer/Exception.php';
@require_once 'PHPMailer/SMTP.php'; @require_once 'PHPMailer/SMTP.php';
@require_once 'PHPMailer/PHPMailer.php'; @require_once 'PHPMailer/PHPMailer.php';
@ -146,7 +155,7 @@ class MailService
} }
$transport = $cfg['transport'] ?? 'smtp'; $transport = $cfg['transport'] ?? 'smtp';
if ($transport === 'smtp' && class_exists('PHPMailer\\PHPMailer\\PHPMailer')) { if ($transport === 'smtp' && class_exists('PHPMailer\PHPMailer\PHPMailer')) {
return self::sendViaPHPMailer($cfg, $name, $email, $message, $to, $subject); return self::sendViaPHPMailer($cfg, $name, $email, $message, $to, $subject);
} }
@ -216,12 +225,16 @@ class MailService
$safeName = htmlspecialchars($name, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); $safeName = htmlspecialchars($name, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
$safeEmail = htmlspecialchars($email, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); $safeEmail = htmlspecialchars($email, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
$safeBody = nl2br(htmlspecialchars($body, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')); $safeBody = nl2br(htmlspecialchars($body, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
$mail->Body = "<p><strong>Name:</strong> {$safeName}</p><p><strong>Email:</strong> {$safeEmail}</p><hr>{$safeBody}";
$innerHtml = "<p><strong>Name:</strong> {$safeName}</p><p><strong>Email:</strong> {$safeEmail}</p><hr>{$safeBody}";
// Apply standardized HTML wrapper
$mail->Body = self::wrapHtml($innerHtml, $subject);
$mail->AltBody = "Name: {$name}\nEmail: {$email}\n\n{$body}"; $mail->AltBody = "Name: {$name}\nEmail: {$email}\n\n{$body}";
$ok = $mail->send(); $ok = $mail->send();
return [ 'success' => $ok ]; return [ 'success' => $ok ];
} catch (\Throwable $e) { } catch (Throwable $e) {
return [ 'success' => false, 'error' => 'PHPMailer error: ' . $e->getMessage() ]; return [ 'success' => false, 'error' => 'PHPMailer error: ' . $e->getMessage() ];
} }
} }
@ -229,7 +242,108 @@ class MailService
private static function sendViaNativeMail(array $cfg, string $name, string $email, string $body, $to, string $subject) private static function sendViaNativeMail(array $cfg, string $name, string $email, string $body, $to, string $subject)
{ {
$opts = ['reply_to' => $email]; $opts = ['reply_to' => $email];
$html = nl2br(htmlspecialchars($body, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8')); $safeName = htmlspecialchars($name, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
return self::sendMail($to, $subject, $html, $body, $opts); $safeEmail = htmlspecialchars($email, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
$safeBody = nl2br(htmlspecialchars($body, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'));
$innerHtml = "<p><strong>Name:</strong> {$safeName}</p><p><strong>Email:</strong> {$safeEmail}</p><hr>{$safeBody}";
// sendMail will wrap the HTML now
return self::sendMail($to, $subject, $innerHtml, $body, $opts);
}
private static function getSetting(string $key, string $default = ''): string
{
// Use global get_setting if available (requires includes/app.php)
if (function_exists('get_setting')) {
return get_setting($key, $default);
}
// Fallback: Direct DB query if db() helper is available
if (function_exists('db')) {
try {
$stmt = db()->prepare("SELECT setting_value FROM settings WHERE setting_key = ? LIMIT 1");
$stmt->execute([$key]);
$val = $stmt->fetchColumn();
return $val !== false ? (string)$val : $default;
} catch (Throwable $e) {
return $default;
}
}
return $default;
}
private static function wrapHtml(string $content, string $subject): string
{
$companyName = self::getSetting('company_name', 'CargoLink');
$logoPath = self::getSetting('logo_path', '');
$companyAddress = self::getSetting('company_address', '');
// Build absolute URL for logo
$logoUrl = '';
if ($logoPath) {
$scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') ? 'https' : 'http';
$host = $_SERVER['HTTP_HOST'] ?? 'localhost';
// Assuming logo_path is relative to public root (e.g., uploads/logos/...)
$logoUrl = "{$scheme}://{$host}/" . ltrim($logoPath, '/');
}
$year = date('Y');
$footerInfo = [];
if ($companyAddress) {
$footerInfo[] = nl2br(htmlspecialchars($companyAddress));
}
$footerHtml = implode('<br>', $footerInfo);
$logoHtml = '';
if ($logoUrl) {
$logoHtml = "<div style=\"text-align: center; margin-bottom: 20px;\"><img src=\"{$logoUrl}\" alt=\"{$companyName}\" style=\"max-height: 60px; max-width: 200px;\"></div>";
}
return <<<HTML
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{$subject}</title>
<style>
body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; background-color: #f4f7f6; margin: 0; padding: 0; color: #333; line-height: 1.6; }
.wrapper { width: 100%; table-layout: fixed; background-color: #f4f7f6; padding-bottom: 40px; }
.webkit { max-width: 600px; background-color: #ffffff; margin: 0 auto; border-radius: 8px; overflow: hidden; box-shadow: 0 4px 10px rgba(0,0,0,0.05); }
.outer { margin: 0 auto; width: 100%; max-width: 600px; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; }
.header { background-color: #ffffff; padding: 30px 30px 20px; text-align: center; border-bottom: 1px solid #eeeeee; }
.content { padding: 30px; text-align: left; font-size: 16px; color: #555555; }
.footer { padding: 20px; text-align: center; font-size: 12px; color: #999999; background-color: #f9f9f9; border-top: 1px solid #eeeeee; }
h1, h2, h3 { color: #2c3e50; margin-top: 0; }
a { color: #3498db; text-decoration: none; }
p { margin-bottom: 15px; }
</style>
</head>
<body>
<div class="wrapper">
<div class="webkit">
<!-- Header -->
<div class="header">
{$logoHtml}
<h2 style="margin: 0; font-size: 24px; color: #333;">{$companyName}</h2>
</div>
<!-- Content -->
<div class="content">
{$content}
</div>
<!-- Footer -->
<div class="footer">
<p>&copy; {$year} {$companyName}. All rights reserved.</p>
{$footerHtml}
</div>
</div>
</div>
</body>
</html>
HTML;
} }
} }