mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-05-06 19:19:19 +02:00
feat: multi-type file upload with sort order, labels, and expanded MIME support
- DB migration 007: add sort_order + display_label to thesis_files - Database: getThesisFiles ordered by sort_order; insertThesisFile accepts label/order; new reorderThesisFiles() and updateThesisFileLabel() methods - ThesisCreateController + ThesisEditController: expand allowed MIME/exts to include audio (mp3/ogg/wav/flac/aac/m4a), video (webm/mov/ogv), image (gif/webp), archives (tar/gz), any-ext via octet-stream; max size raised to 500 MB; accept file_labels[] and file_orders[] POST fields; detectFileType() helper - MediaController: expanded MIME allowlist; HTTP Range support for audio/video; force-download for unknown types; inline for known displayable types - fieldset-files.php: sortable queue UI with SortableJS, per-file labels, 500 MB hint - templates/admin/edit.php: existing files as sortable list with drag handles, type icons, label inputs, delete checkboxes, hidden sort-order fields - file-upload-queue.js: new JS replacing file-preview.js — sortable new-file queue, per-file labels, hidden order fields on submit, backward-compat legacy preview - tfe.php: renders audio (<audio>), all video formats, images, PDF, and download-only 'other' files; reads display_label; sorted by sort_order - tfe.css + form.css: styles for audio player, download files, sortable queue, drag handles, file type badges, label inputs - .htaccess + .user.ini: upload_max_filesize=512M / post_max_size=520M
This commit is contained in:
@@ -275,6 +275,20 @@ class ThesisEditController
|
||||
}
|
||||
}
|
||||
|
||||
// ── Reorder existing files ────────────────────────────────────────────
|
||||
if (!empty($post['file_sort_order']) && is_array($post['file_sort_order'])) {
|
||||
$this->db->reorderThesisFiles($thesisId, $post['file_sort_order']);
|
||||
}
|
||||
|
||||
// ── Update display labels for existing files ──────────────────────────
|
||||
if (!empty($post['file_label']) && is_array($post['file_label'])) {
|
||||
foreach ($post['file_label'] as $fileId => $label) {
|
||||
$fileId = (int)$fileId;
|
||||
if ($fileId <= 0) continue;
|
||||
$this->db->updateThesisFileLabel($fileId, $thesisId, trim($label) ?: null);
|
||||
}
|
||||
}
|
||||
|
||||
// ── New thesis files upload ───────────────────────────────────────────
|
||||
if (!empty($files['files']['name'][0])) {
|
||||
$this->handleThesisFiles($thesisId, $post, $files['files']);
|
||||
@@ -293,16 +307,34 @@ class ThesisEditController
|
||||
private function handleThesisFiles(int $thesisId, array $post, array $uploads): void
|
||||
{
|
||||
$allowedMimes = [
|
||||
'image/jpeg', 'image/png', 'application/pdf',
|
||||
'video/mp4', 'application/zip', 'text/vtt',
|
||||
'image/jpeg', 'image/png', 'image/gif', 'image/webp',
|
||||
'application/pdf',
|
||||
'video/mp4', 'video/webm', 'video/ogg', 'video/quicktime',
|
||||
'audio/mpeg', 'audio/mp3', 'audio/ogg', 'audio/wav',
|
||||
'audio/flac', 'audio/aac', 'audio/x-m4a', 'audio/mp4',
|
||||
'text/vtt',
|
||||
'application/zip', 'application/x-zip-compressed',
|
||||
'application/x-tar', 'application/gzip',
|
||||
'application/octet-stream',
|
||||
];
|
||||
$allowedExts = ['jpg', 'jpeg', 'png', 'pdf', 'mp4', 'zip', 'vtt'];
|
||||
$maxBytes = 50 * 1024 * 1024; // 50 MB
|
||||
$allowedExts = [
|
||||
'jpg', 'jpeg', 'png', 'gif', 'webp',
|
||||
'pdf',
|
||||
'mp4', 'webm', 'ogv', 'mov',
|
||||
'mp3', 'ogg', 'oga', 'wav', 'flac', 'aac', 'm4a',
|
||||
'vtt',
|
||||
'zip', 'tar', 'gz', 'tgz',
|
||||
];
|
||||
$maxBytes = 500 * 1024 * 1024; // 500 MB
|
||||
|
||||
$year = (int)($post['année'] ?? date('Y'));
|
||||
$authorName = trim($post['auteurice'] ?? 'unknown');
|
||||
$authorSlug = $this->generateAuthorSlug($authorName);
|
||||
|
||||
// Per-file labels and sort orders submitted alongside the upload inputs
|
||||
$fileLabels = $post['file_labels'] ?? [];
|
||||
$fileOrders = $post['file_orders'] ?? [];
|
||||
|
||||
// Reuse existing folder if possible
|
||||
$existingFiles = $this->db->getThesisFiles($thesisId);
|
||||
$uploadDir = null;
|
||||
@@ -342,8 +374,9 @@ class ThesisEditController
|
||||
$mimeType = 'text/vtt';
|
||||
}
|
||||
|
||||
if (!in_array($mimeType, $allowedMimes, true) || !in_array($ext, $allowedExts, true)) {
|
||||
error_log("ThesisEditController: invalid type {$uploads['name'][$i]} ($mimeType), skipping");
|
||||
// Allow any ext-matched file even if finfo returns application/octet-stream
|
||||
if (!in_array($mimeType, $allowedMimes, true) && !in_array($ext, $allowedExts, true)) {
|
||||
error_log("ThesisEditController: invalid type {$uploads['name'][$i]} ($mimeType / $ext), skipping");
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -370,17 +403,34 @@ class ThesisEditController
|
||||
|
||||
chmod($targetPath, 0644);
|
||||
|
||||
$fileType = 'other';
|
||||
if ($ext === 'vtt') $fileType = 'caption';
|
||||
elseif (stripos($originalName, 'annex') !== false) $fileType = 'annex';
|
||||
elseif ($ext === 'pdf') $fileType = 'main';
|
||||
$fileType = $this->detectFileType($mimeType, $ext, $originalName);
|
||||
$label = trim($fileLabels[$i] ?? '');
|
||||
$sortOrder = isset($fileOrders[$i]) ? (int)$fileOrders[$i] : null;
|
||||
|
||||
$relPath = "theses/{$year}/{$folderName}/" . $candidate;
|
||||
$this->db->insertThesisFile($thesisId, $fileType, $relPath, basename($originalName), $uploads['size'][$i], $mimeType);
|
||||
$this->db->insertThesisFile(
|
||||
$thesisId, $fileType, $relPath,
|
||||
basename($originalName), $uploads['size'][$i], $mimeType,
|
||||
$label !== '' ? $label : null,
|
||||
$sortOrder
|
||||
);
|
||||
error_log("ThesisEditController: uploaded → $candidate ($fileType)");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine the logical file_type from MIME type, extension, and original filename.
|
||||
*/
|
||||
private function detectFileType(string $mimeType, string $ext, string $originalName): string
|
||||
{
|
||||
if ($ext === 'vtt' || $mimeType === 'text/vtt') return 'caption';
|
||||
if (str_starts_with($mimeType, 'audio/') || in_array($ext, ['mp3','ogg','oga','wav','flac','aac','m4a'], true)) return 'audio';
|
||||
if (str_starts_with($mimeType, 'video/') || in_array($ext, ['mp4','webm','ogv','mov'], true)) return 'video';
|
||||
if ($mimeType === 'application/pdf' || $ext === 'pdf') return 'main';
|
||||
if (str_starts_with($mimeType, 'image/') || in_array($ext, ['jpg','jpeg','png','gif','webp'], true)) return 'image';
|
||||
return 'other';
|
||||
}
|
||||
|
||||
// ── Private: string helpers ───────────────────────────────────────────────
|
||||
|
||||
private function generateAuthorSlug(string $authorName): string
|
||||
|
||||
Reference in New Issue
Block a user