diff --git a/api/auth/avatar.php b/api/auth/avatar.php index c70c80c..86b3470 100644 --- a/api/auth/avatar.php +++ b/api/auth/avatar.php @@ -15,10 +15,7 @@ if ($userId <= 0) { apiAbort(['OK' => false, 'ERROR' => 'not_logged_in', 'MESSAGE' => 'Authentication required']); } -$webroot = isDev() - ? '/opt/lucee/tomcat/webapps/ROOT' - : '/var/www/biz.payfrit.com'; -$uploadsDir = $webroot . '/uploads/users'; +$uploadsDir = luceeWebroot() . '/uploads/users'; $avatarUrl = baseUrl() . '/uploads/users/'; // Find existing avatar (check multiple extensions) diff --git a/api/helpers.php b/api/helpers.php index 14e4921..b16135f 100644 --- a/api/helpers.php +++ b/api/helpers.php @@ -191,6 +191,10 @@ function baseUrl(): string { return isDev() ? 'https://dev.payfrit.com' : 'https://biz.payfrit.com'; } +function luceeWebroot(): string { + return '/opt/lucee/tomcat/webapps/ROOT'; +} + // ============================================ // PHONE HELPERS // ============================================ diff --git a/api/menu/getForBuilder.php b/api/menu/getForBuilder.php index 453f2cd..9a84be9 100644 --- a/api/menu/getForBuilder.php +++ b/api/menu/getForBuilder.php @@ -292,10 +292,7 @@ try { // Build items lookup by CategoryID $itemsByCategory = []; - $webroot = isDev() - ? '/opt/lucee/tomcat/webapps/ROOT' - : '/var/www/biz.payfrit.com'; -$uploadsDir = $webroot . '/uploads/items'; + $uploadsDir = luceeWebroot() . '/uploads/items'; foreach ($qItemRows as $item) { $catID = (int) $item['CategoryItemID']; $itemID = (int) $item['ID']; diff --git a/api/menu/uploadHeader.php b/api/menu/uploadHeader.php index ca367e7..45da4a1 100644 --- a/api/menu/uploadHeader.php +++ b/api/menu/uploadHeader.php @@ -22,10 +22,7 @@ if (!isset($_FILES['header']) || $_FILES['header']['error'] !== UPLOAD_ERR_OK) { jsonResponse(['OK' => false, 'ERROR' => 'no_file', 'MESSAGE' => 'No file was uploaded']); } -$webroot = isDev() - ? '/opt/lucee/tomcat/webapps/ROOT' - : '/var/www/biz.payfrit.com'; -$headersDir = $webroot . '/uploads/headers'; +$headersDir = luceeWebroot() . '/uploads/headers'; if (!is_dir($headersDir)) { mkdir($headersDir, 0755, true); } diff --git a/api/menu/uploadItemPhoto.php b/api/menu/uploadItemPhoto.php index b040f79..8316ba9 100644 --- a/api/menu/uploadItemPhoto.php +++ b/api/menu/uploadItemPhoto.php @@ -26,10 +26,7 @@ if (!in_array($ext, $allowedExtensions)) { } // Determine uploads directory (must be in Lucee webroot, not PHP docroot) -$webroot = isDev() - ? '/opt/lucee/tomcat/webapps/ROOT' - : '/var/www/biz.payfrit.com'; -$itemsDir = $webroot . '/uploads/items'; +$itemsDir = luceeWebroot() . '/uploads/items'; if (!is_dir($itemsDir)) { mkdir($itemsDir, 0755, true); } diff --git a/api/tasks/getDetails.php b/api/tasks/getDetails.php index 310c161..08bc116 100644 --- a/api/tasks/getDetails.php +++ b/api/tasks/getDetails.php @@ -68,12 +68,9 @@ try { $customerPhotoUrl = ''; $customerUserID = (int) ($qTask['CustomerUserID'] ?? 0); if ($customerUserID > 0) { - $webroot = isDev() - ? '/opt/lucee/tomcat/webapps/ROOT' - : '/var/www/biz.payfrit.com'; $baseDir = '/uploads/users/'; foreach (['jpg', 'png', 'PNG'] as $ext) { - $checkPath = $webroot . $baseDir . $customerUserID . '.' . $ext; + $checkPath = luceeWebroot() . $baseDir . $customerUserID . '.' . $ext; if (file_exists($checkPath)) { $customerPhotoUrl = baseUrl() . $baseDir . $customerUserID . '.' . $ext; break;