-
Loading…
-
-
diff --git a/resources/dark-client-portal1.png b/resources/dark-client-portal1.png
index a4cdca1..9c4c848 100644
Binary files a/resources/dark-client-portal1.png and b/resources/dark-client-portal1.png differ
diff --git a/resources/dark-client-portal2.png b/resources/dark-client-portal2.png
index 8b2f570..db1e132 100644
Binary files a/resources/dark-client-portal2.png and b/resources/dark-client-portal2.png differ
diff --git a/resources/dark-client-portal3.png b/resources/dark-client-portal3.png
new file mode 100644
index 0000000..2e0dc41
Binary files /dev/null and b/resources/dark-client-portal3.png differ
diff --git a/resources/dark-client-portal4.png b/resources/dark-client-portal4.png
new file mode 100644
index 0000000..2a20420
Binary files /dev/null and b/resources/dark-client-portal4.png differ
diff --git a/src/controllers/AdminController.php b/src/controllers/AdminController.php
index d3a91eb..89e655e 100644
--- a/src/controllers/AdminController.php
+++ b/src/controllers/AdminController.php
@@ -314,7 +314,6 @@ public function saveProPortals(array $portalsPayload): void
throw new InvalidArgumentException('Invalid portals format.');
}
- // Minimal normalization; deeper validation can live inside ProPortals
$data = ['portals' => []];
foreach ($portalsPayload as $slug => $info) {
@@ -334,55 +333,100 @@ public function saveProPortals(array $portalsPayload): void
? !empty($info['allowDownload'])
: true;
$expiresAt = trim((string)($info['expiresAt'] ?? ''));
-
- // Optional branding + form behavior
- $title = trim((string)($info['title'] ?? ''));
- $introText = trim((string)($info['introText'] ?? ''));
- $requireForm = !empty($info['requireForm']);
- $brandColor = trim((string)($info['brandColor'] ?? ''));
- $footerText = trim((string)($info['footerText'] ?? ''));
- $formDefaults = isset($info['formDefaults']) && is_array($info['formDefaults'])
- ? $info['formDefaults']
- : [];
+ // Branding + form behavior
+ $title = trim((string)($info['title'] ?? ''));
+ $introText = trim((string)($info['introText'] ?? ''));
+ $requireForm = !empty($info['requireForm']);
+ $brandColor = trim((string)($info['brandColor'] ?? ''));
+ $footerText = trim((string)($info['footerText'] ?? ''));
- // Normalize defaults for known keys
- $formDefaults = [
- 'name' => trim((string)($formDefaults['name'] ?? '')),
- 'email' => trim((string)($formDefaults['email'] ?? '')),
- 'reference' => trim((string)($formDefaults['reference'] ?? '')),
- 'notes' => trim((string)($formDefaults['notes'] ?? '')),
- ];
- $formRequired = isset($info['formRequired']) && is_array($info['formRequired'])
- ? $info['formRequired']
- : [];
+ // Optional logo info
+ $logoFile = trim((string)($info['logoFile'] ?? ''));
+ $logoUrl = trim((string)($info['logoUrl'] ?? ''));
+
+ // Upload rules / thank-you behavior
+ $uploadMaxSizeMb = isset($info['uploadMaxSizeMb']) ? (int)$info['uploadMaxSizeMb'] : 0;
+ $uploadExtWhitelist = trim((string)($info['uploadExtWhitelist'] ?? ''));
+ $uploadMaxPerDay = isset($info['uploadMaxPerDay']) ? (int)$info['uploadMaxPerDay'] : 0;
+ $showThankYou = !empty($info['showThankYou']);
+ $thankYouText = trim((string)($info['thankYouText'] ?? ''));
+
+ // Form defaults
+ $formDefaults = isset($info['formDefaults']) && is_array($info['formDefaults'])
+ ? $info['formDefaults']
+ : [];
+
+ $formDefaults = [
+ 'name' => trim((string)($formDefaults['name'] ?? '')),
+ 'email' => trim((string)($formDefaults['email'] ?? '')),
+ 'reference' => trim((string)($formDefaults['reference'] ?? '')),
+ 'notes' => trim((string)($formDefaults['notes'] ?? '')),
+ ];
+
+ // Required flags
+ $formRequired = isset($info['formRequired']) && is_array($info['formRequired'])
+ ? $info['formRequired']
+ : [];
+
+ $formRequired = [
+ 'name' => !empty($formRequired['name']),
+ 'email' => !empty($formRequired['email']),
+ 'reference' => !empty($formRequired['reference']),
+ 'notes' => !empty($formRequired['notes']),
+ ];
+
+ // Labels
+ $formLabels = isset($info['formLabels']) && is_array($info['formLabels'])
+ ? $info['formLabels']
+ : [];
+
+ $formLabels = [
+ 'name' => trim((string)($formLabels['name'] ?? 'Name')),
+ 'email' => trim((string)($formLabels['email'] ?? 'Email')),
+ 'reference' => trim((string)($formLabels['reference'] ?? 'Reference / Case / Order #')),
+ 'notes' => trim((string)($formLabels['notes'] ?? 'Notes')),
+ ];
+
+ // Visibility
+ $formVisible = isset($info['formVisible']) && is_array($info['formVisible'])
+ ? $info['formVisible']
+ : [];
+
+ $formVisible = [
+ 'name' => !array_key_exists('name', $formVisible) || !empty($formVisible['name']),
+ 'email' => !array_key_exists('email', $formVisible) || !empty($formVisible['email']),
+ 'reference' => !array_key_exists('reference', $formVisible) || !empty($formVisible['reference']),
+ 'notes' => !array_key_exists('notes', $formVisible) || !empty($formVisible['notes']),
+ ];
- $formRequired = [
- 'name' => !empty($formRequired['name']),
- 'email' => !empty($formRequired['email']),
- 'reference' => !empty($formRequired['reference']),
- 'notes' => !empty($formRequired['notes']),
-];
-
if ($folder === '') {
continue;
}
-
+
$data['portals'][$slug] = [
- 'label' => $label,
- 'folder' => $folder,
- 'clientEmail' => $clientEmail,
- 'uploadOnly' => $uploadOnly,
- 'allowDownload' => $allowDownload,
- 'expiresAt' => $expiresAt,
- // NEW
- 'title' => $title,
- 'introText' => $introText,
- 'requireForm' => $requireForm,
- 'brandColor' => $brandColor,
- 'footerText' => $footerText,
- 'formDefaults' => $formDefaults,
- 'formRequired' => $formRequired,
+ 'label' => $label,
+ 'folder' => $folder,
+ 'clientEmail' => $clientEmail,
+ 'uploadOnly' => $uploadOnly,
+ 'allowDownload' => $allowDownload,
+ 'expiresAt' => $expiresAt,
+ 'title' => $title,
+ 'introText' => $introText,
+ 'requireForm' => $requireForm,
+ 'brandColor' => $brandColor,
+ 'footerText' => $footerText,
+ 'logoFile' => $logoFile,
+ 'logoUrl' => $logoUrl,
+ 'uploadMaxSizeMb' => $uploadMaxSizeMb,
+ 'uploadExtWhitelist' => $uploadExtWhitelist,
+ 'uploadMaxPerDay' => $uploadMaxPerDay,
+ 'showThankYou' => $showThankYou,
+ 'thankYouText' => $thankYouText,
+ 'formDefaults' => $formDefaults,
+ 'formRequired' => $formRequired,
+ 'formLabels' => $formLabels,
+ 'formVisible' => $formVisible,
];
}
diff --git a/src/controllers/PortalController.php b/src/controllers/PortalController.php
index af4cf8c..c978ff4 100644
--- a/src/controllers/PortalController.php
+++ b/src/controllers/PortalController.php
@@ -11,16 +11,29 @@ final class PortalController
*
* Returns:
* [
- * 'slug' => string,
- * 'label' => string,
- * 'folder' => string,
- * 'clientEmail' => string,
- * 'uploadOnly' => bool,
- * 'allowDownload' => bool,
- * 'expiresAt' => string,
- * 'title' => string,
- * 'introText' => string,
- * 'requireForm' => bool
+ * 'slug' => string,
+ * 'label' => string,
+ * 'folder' => string,
+ * 'clientEmail' => string,
+ * 'uploadOnly' => bool,
+ * 'allowDownload' => bool,
+ * 'expiresAt' => string,
+ * 'title' => string,
+ * 'introText' => string,
+ * 'requireForm' => bool,
+ * 'brandColor' => string,
+ * 'footerText' => string,
+ * 'formDefaults' => array,
+ * 'formRequired' => array,
+ * 'formLabels' => array,
+ * 'formVisible' => array,
+ * 'logoFile' => string,
+ * 'logoUrl' => string,
+ * 'uploadMaxSizeMb' => int,
+ * 'uploadExtWhitelist' => string,
+ * 'uploadMaxPerDay' => int,
+ * 'showThankYou' => bool,
+ * 'thankYouText' => string,
* ]
*/
public static function getPortalBySlug(string $slug): array
@@ -62,13 +75,14 @@ final class PortalController
: true;
$expiresAt = trim((string)($p['expiresAt'] ?? ''));
- // NEW: optional branding + intake behavior
- $title = trim((string)($p['title'] ?? ''));
- $introText = trim((string)($p['introText'] ?? ''));
- $requireForm = !empty($p['requireForm']);
- $brandColor = trim((string)($p['brandColor'] ?? ''));
- $footerText = trim((string)($p['footerText'] ?? ''));
+ // Branding + intake behavior
+ $title = trim((string)($p['title'] ?? ''));
+ $introText = trim((string)($p['introText'] ?? ''));
+ $requireForm = !empty($p['requireForm']);
+ $brandColor = trim((string)($p['brandColor'] ?? ''));
+ $footerText = trim((string)($p['footerText'] ?? ''));
+ // Defaults / required
$fd = isset($p['formDefaults']) && is_array($p['formDefaults'])
? $p['formDefaults']
: [];
@@ -79,16 +93,52 @@ final class PortalController
'reference' => trim((string)($fd['reference'] ?? '')),
'notes' => trim((string)($fd['notes'] ?? '')),
];
- $fr = isset($p['formRequired']) && is_array($p['formRequired'])
- ? $p['formRequired']
- : [];
- $formRequired = [
- 'name' => !empty($fr['name']),
- 'email' => !empty($fr['email']),
- 'reference' => !empty($fr['reference']),
- 'notes' => !empty($fr['notes']),
- ];
+ $fr = isset($p['formRequired']) && is_array($p['formRequired'])
+ ? $p['formRequired']
+ : [];
+
+ $formRequired = [
+ 'name' => !empty($fr['name']),
+ 'email' => !empty($fr['email']),
+ 'reference' => !empty($fr['reference']),
+ 'notes' => !empty($fr['notes']),
+ ];
+
+ // Optional formLabels
+ $fl = isset($p['formLabels']) && is_array($p['formLabels'])
+ ? $p['formLabels']
+ : [];
+
+ $formLabels = [
+ 'name' => trim((string)($fl['name'] ?? 'Name')),
+ 'email' => trim((string)($fl['email'] ?? 'Email')),
+ 'reference' => trim((string)($fl['reference'] ?? 'Reference / Case / Order #')),
+ 'notes' => trim((string)($fl['notes'] ?? 'Notes')),
+ ];
+
+ // Optional visibility
+ $fv = isset($p['formVisible']) && is_array($p['formVisible'])
+ ? $p['formVisible']
+ : [];
+
+ $formVisible = [
+ 'name' => !array_key_exists('name', $fv) || !empty($fv['name']),
+ 'email' => !array_key_exists('email', $fv) || !empty($fv['email']),
+ 'reference' => !array_key_exists('reference', $fv) || !empty($fv['reference']),
+ 'notes' => !array_key_exists('notes', $fv) || !empty($fv['notes']),
+ ];
+
+ // Optional per-portal logo
+ $logoFile = trim((string)($p['logoFile'] ?? ''));
+ $logoUrl = trim((string)($p['logoUrl'] ?? ''));
+
+ // Upload rules / thank-you behavior
+ $uploadMaxSizeMb = isset($p['uploadMaxSizeMb']) ? (int)$p['uploadMaxSizeMb'] : 0;
+ $uploadExtWhitelist = trim((string)($p['uploadExtWhitelist'] ?? ''));
+ $uploadMaxPerDay = isset($p['uploadMaxPerDay']) ? (int)$p['uploadMaxPerDay'] : 0;
+ $showThankYou = !empty($p['showThankYou']);
+ $thankYouText = trim((string)($p['thankYouText'] ?? ''));
if ($folder === '') {
throw new RuntimeException('Portal misconfigured: empty folder.');
@@ -103,21 +153,29 @@ final class PortalController
}
return [
- 'slug' => $slug,
- 'label' => $label,
- 'folder' => $folder,
- 'clientEmail' => $clientEmail,
- 'uploadOnly' => $uploadOnly,
- 'allowDownload' => $allowDownload,
- 'expiresAt' => $expiresAt,
-
- 'title' => $title,
- 'introText' => $introText,
- 'requireForm' => $requireForm,
- 'brandColor' => $brandColor,
- 'footerText' => $footerText,
- 'formDefaults' => $formDefaults,
- 'formRequired' => $formRequired,
+ 'slug' => $slug,
+ 'label' => $label,
+ 'folder' => $folder,
+ 'clientEmail' => $clientEmail,
+ 'uploadOnly' => $uploadOnly,
+ 'allowDownload' => $allowDownload,
+ 'expiresAt' => $expiresAt,
+ 'title' => $title,
+ 'introText' => $introText,
+ 'requireForm' => $requireForm,
+ 'brandColor' => $brandColor,
+ 'footerText' => $footerText,
+ 'formDefaults' => $formDefaults,
+ 'formRequired' => $formRequired,
+ 'formLabels' => $formLabels,
+ 'formVisible' => $formVisible,
+ 'logoFile' => $logoFile,
+ 'logoUrl' => $logoUrl,
+ 'uploadMaxSizeMb' => $uploadMaxSizeMb,
+ 'uploadExtWhitelist' => $uploadExtWhitelist,
+ 'uploadMaxPerDay' => $uploadMaxPerDay,
+ 'showThankYou' => $showThankYou,
+ 'thankYouText' => $thankYouText,
];
}
}
\ No newline at end of file
diff --git a/src/controllers/UserController.php b/src/controllers/UserController.php
index 92712a0..a504f50 100644
--- a/src/controllers/UserController.php
+++ b/src/controllers/UserController.php
@@ -797,6 +797,90 @@ class UserController
exit;
}
+ /**
+ * Upload a logo for a specific client portal (Pro-only; admin, CSRF).
+ * Stores the file in UPLOAD_DIR/profile_pics and returns filename + URL.
+ */
+ public function uploadPortalLogo(): void
+ {
+ self::jsonHeaders();
+
+ // Auth, admin & CSRF
+ self::requireAuth();
+ self::requireAdmin();
+ self::requireCsrf();
+
+ if (empty($_FILES['portal_logo']) || $_FILES['portal_logo']['error'] !== UPLOAD_ERR_OK) {
+ http_response_code(400);
+ echo json_encode(['success' => false, 'error' => 'No file uploaded or error']);
+ exit;
+ }
+
+ $file = $_FILES['portal_logo'];
+
+ // Optional: which portal (used only for filename prefix)
+ $slugRaw = isset($_POST['slug']) ? (string)$_POST['slug'] : '';
+ $slug = preg_replace('/[^a-zA-Z0-9_\-]/', '', $slugRaw) ?: 'portal';
+
+ // Validate MIME & size (same rules as uploadPicture / uploadBrandLogo)
+ $allowed = [
+ 'image/jpeg' => 'jpg',
+ 'image/png' => 'png',
+ 'image/gif' => 'gif',
+ ];
+
+ $finfo = finfo_open(FILEINFO_MIME_TYPE);
+ $mime = finfo_file($finfo, $file['tmp_name']);
+ finfo_close($finfo);
+
+ if (!isset($allowed[$mime])) {
+ http_response_code(400);
+ echo json_encode(['success' => false, 'error' => 'Invalid file type']);
+ exit;
+ }
+
+ if ($file['size'] > 2 * 1024 * 1024) { // 2MB
+ http_response_code(400);
+ echo json_encode(['success' => false, 'error' => 'File too large']);
+ exit;
+ }
+
+ // Destination: reuse profile_pics directory
+ $uploadDir = rtrim(UPLOAD_DIR, '/\\') . '/profile_pics';
+ if (!is_dir($uploadDir) && !mkdir($uploadDir, 0755, true)) {
+ http_response_code(500);
+ echo json_encode(['success' => false, 'error' => 'Cannot create upload folder']);
+ exit;
+ }
+
+ $ext = $allowed[$mime];
+ $filename = 'portal_' . $slug . '_' . bin2hex(random_bytes(8)) . '.' . $ext;
+ $dest = $uploadDir . '/' . $filename;
+
+ if (!move_uploaded_file($file['tmp_name'], $dest)) {
+ http_response_code(500);
+ echo json_encode(['success' => false, 'error' => 'Failed to save file']);
+ exit;
+ }
+
+ // Build a web path similar to uploadBrandLogo
+ $fsPath = $uploadDir . '/' . $filename;
+
+ $root = rtrim(PROJECT_ROOT, '/\\');
+ $url = preg_replace('#^' . preg_quote($root, '#') . '#', '', $fsPath);
+
+ if ($url === '' || $url[0] !== '/') {
+ $url = '/' . ltrim($url, '/\\');
+ }
+
+ echo json_encode([
+ 'success' => true,
+ 'fileName' => $filename,
+ 'url' => $url,
+ ]);
+ exit;
+ }
+
public function siteConfig(): void
{
header('Content-Type: application/json');
-