mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-06-25 16:19:19 +02:00
- Replace fetch(redirect:manual) with XMLHttpRequest in file-upload-queue.js. The previous fetch-based redirect detection was broken because opaque redirects hide the Location header. XHR's responseURL reliably exposes the final URL after server-side redirects. - Add console.log tracing at every decision point in submit interception: entry, hasFiles check, enctype check, double-submit guard, XHR status, redirect detection, error fallback. - Add error_log entry-point logging to all 16 admin action files plus the partage/index.php submission handler and password gate. Each logs: request method, content type/length, POST keys, file counts, and queue-specific file counts where applicable. - Add double-submit guard (_xamxamActiveSubmit) to prevent duplicate XHR sends when the native submit handler fires after interception.
496 lines
16 KiB
JavaScript
496 lines
16 KiB
JavaScript
/**
|
|
* file-upload-queue.js
|
|
*
|
|
* Client-side file upload queues for TFE, Video, Audio, and Annexe files.
|
|
* Replaces the old HTMX+PHP session-backed queue system.
|
|
*
|
|
* Queues:
|
|
* tfe — main thesis files (multi-format)
|
|
* video — video files (non-PeerTube path)
|
|
* audio — audio files (non-PeerTube path)
|
|
* annexe — annex files
|
|
*
|
|
* Architecture:
|
|
* 1. Intercept 'change' on all .tfe-file-picker inputs.
|
|
* 2. Validate MIME/extension/size client-side.
|
|
* 3. Store File objects in window.__xamxamQueues.
|
|
* 4. Render queue UI with SortableJS drag-to-reorder.
|
|
* 5. On form submit: inject all queued files into FormData and POST normally.
|
|
*
|
|
* The queue containers are rendered server-side by fichiers-fragment.php
|
|
* as empty <ul> elements with standard IDs. This script populates them.
|
|
*/
|
|
|
|
(function () {
|
|
"use strict";
|
|
|
|
// ── Constants ──────────────────────────────────────────────────────────
|
|
|
|
var ICON = {
|
|
pdf: "\uD83D\uDCC4",
|
|
video: "\uD83C\uDFAC",
|
|
audio: "\uD83D\uDD0A",
|
|
zip: "\uD83D\uDDDC\uFE0F",
|
|
vtt: "\uD83D\uDCAC",
|
|
image: "\uD83D\uDDBC\uFE0F",
|
|
other: "\uD83D\uDCCE",
|
|
};
|
|
|
|
var QUEUE_TYPES = ["tfe", "video", "audio", "annexe"];
|
|
|
|
var ALLOWED_BY_TYPE = {
|
|
tfe: {
|
|
exts: ["jpg","jpeg","png","gif","webp","pdf","mp4","webm","ogv","mov","mp3","ogg","oga","wav","flac","aac","m4a","vtt","zip","tar","gz","tgz"],
|
|
maxSize: function (f) { return (/\.pdf$/i.test(f.name) ? 100 : 500) * 1024 * 1024; },
|
|
},
|
|
video: {
|
|
exts: ["mp4","webm","ogv","mov"],
|
|
maxSize: function () { return 500 * 1024 * 1024; },
|
|
},
|
|
audio: {
|
|
exts: ["mp3","ogg","oga","wav","flac","aac","m4a"],
|
|
maxSize: function () { return 500 * 1024 * 1024; },
|
|
},
|
|
annexe: {
|
|
exts: ["pdf","zip","tar","gz","tgz"],
|
|
maxSize: function () { return 500 * 1024 * 1024; },
|
|
},
|
|
};
|
|
|
|
// ── State ──────────────────────────────────────────────────────────────
|
|
|
|
if (!window.__xamxamQueues) {
|
|
window.__xamxamQueues = {};
|
|
}
|
|
var queues = window.__xamxamQueues;
|
|
QUEUE_TYPES.forEach(function (qt) {
|
|
if (!Array.isArray(queues[qt])) queues[qt] = [];
|
|
});
|
|
|
|
// ── Helpers ────────────────────────────────────────────────────────────
|
|
|
|
function iconFor(file) {
|
|
var t = (file.type || "").toLowerCase(),
|
|
n = (file.name || "").toLowerCase();
|
|
if (/^image\//.test(t)) return ICON.image;
|
|
if (t === "application/pdf" || /\.pdf$/.test(n)) return ICON.pdf;
|
|
if (/^video\//.test(t) || /\.(mp4|webm|mov|ogv)$/.test(n)) return ICON.video;
|
|
if (/^audio\//.test(t) || /\.(mp3|ogg|oga|wav|flac|aac|m4a)$/.test(n)) return ICON.audio;
|
|
if (/\.(zip|tar|gz|tgz)$/.test(n)) return ICON.zip;
|
|
if (/\.vtt$/.test(n)) return ICON.vtt;
|
|
return ICON.other;
|
|
}
|
|
|
|
function humanSize(b) {
|
|
return b >= 1073741824
|
|
? (b / 1073741824).toFixed(2) + " GB"
|
|
: b >= 1048576
|
|
? (b / 1048576).toFixed(2) + " MB"
|
|
: b >= 1024
|
|
? (b / 1024).toFixed(1) + " KB"
|
|
: b + " B";
|
|
}
|
|
|
|
function esc(s) {
|
|
return s.replace(/[&<>"]/g, function (c) {
|
|
return { "&": "&", "<": "<", ">": ">", '"': """ }[c];
|
|
});
|
|
}
|
|
|
|
function ext(fn) {
|
|
var m = fn.match(/\.([^./]+)$/);
|
|
return m ? m[1].toLowerCase() : "";
|
|
}
|
|
|
|
function genFileId() {
|
|
return "fq_" + Math.random().toString(36).slice(2, 10) + "_" + Date.now().toString(36);
|
|
}
|
|
|
|
// ── Validation ─────────────────────────────────────────────────────────
|
|
|
|
function validateFile(file, queueType) {
|
|
var rules = ALLOWED_BY_TYPE[queueType];
|
|
if (!rules) return "Type de file d'attente inconnu.";
|
|
|
|
var fileExt = ext(file.name);
|
|
if (fileExt && rules.exts.indexOf(fileExt) === -1) {
|
|
return "Type de fichier non accepté : ." + fileExt + " (" + file.name + ")";
|
|
}
|
|
|
|
var max = rules.maxSize(file);
|
|
if (file.size > max) {
|
|
var maxMb = Math.round(max / 1024 / 1024);
|
|
return "Fichier trop volumineux (" + (file.size / 1024 / 1024).toFixed(1) + " MB). Maximum : " + maxMb + " MB.";
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
// ── Rendering ──────────────────────────────────────────────────────────
|
|
|
|
function getQueueContainerId(qt) {
|
|
return {
|
|
tfe: "tfe-file-queue-container",
|
|
video: "video-file-queue-container",
|
|
audio: "audio-file-queue-container",
|
|
annexe: "annexe-file-queue-container",
|
|
}[qt];
|
|
}
|
|
|
|
function getQueueUlId(qt) {
|
|
return {
|
|
tfe: "tfe-file-queue",
|
|
video: "video-file-queue",
|
|
audio: "audio-file-queue",
|
|
annexe: "annexe-file-queue",
|
|
}[qt];
|
|
}
|
|
|
|
function getEmptyId(qt) {
|
|
return {
|
|
tfe: "tfe-file-queue-empty",
|
|
video: "video-file-queue-empty",
|
|
audio: "audio-file-queue-empty",
|
|
annexe: "annexe-file-queue-empty",
|
|
}[qt];
|
|
}
|
|
|
|
function renderQueue(queueType) {
|
|
var container = document.getElementById(getQueueContainerId(queueType));
|
|
if (!container) return;
|
|
|
|
var files = queues[queueType];
|
|
var ulId = getQueueUlId(queueType);
|
|
var emptyId = getEmptyId(queueType);
|
|
|
|
var html = '<ul id="' + ulId + '" class="tfe-file-queue" aria-label="Fichiers sélectionnés">';
|
|
for (var i = 0; i < files.length; i++) {
|
|
var f = files[i];
|
|
var ic = iconFor(f);
|
|
var id = f.__xamxamId || "";
|
|
html += '<li class="fq-item" data-fq-id="' + id + '">' +
|
|
'<span class="fq-drag-handle" aria-hidden="true">⋮</span>' +
|
|
'<span class="fq-icon">' + ic + '</span>' +
|
|
'<span class="fq-info">' +
|
|
'<span class="fq-name">' + esc(f.name) + '</span>' +
|
|
'<span class="fq-size">' + humanSize(f.size) + '</span>' +
|
|
'</span>' +
|
|
'<button type="button" class="admin-btn-remove fq-remove"' +
|
|
' aria-label="Retirer ' + esc(f.name) + '"' +
|
|
' data-action="xamxam-remove"' +
|
|
' data-queue="' + queueType + '"' +
|
|
' data-file-id="' + id + '">✕</button>' +
|
|
'</li>';
|
|
}
|
|
html += '</ul>';
|
|
|
|
var emptyStyle = files.length > 0 ? ' style="display:none"' : '';
|
|
html += '<p id="' + emptyId + '" class="tfe-queue-empty"' + emptyStyle + '>Aucun fichier sélectionné.</p>';
|
|
|
|
container.innerHTML = html;
|
|
|
|
// Wire Sortable
|
|
if (window.Sortable && files.length > 1) {
|
|
var list = container.querySelector("ul.tfe-file-queue");
|
|
if (list) {
|
|
Sortable.create(list, {
|
|
handle: ".fq-drag-handle",
|
|
animation: 150,
|
|
onEnd: function () {
|
|
reorderFromDOM(queueType);
|
|
},
|
|
});
|
|
}
|
|
}
|
|
|
|
// Mark form as dirty
|
|
markDirty();
|
|
}
|
|
|
|
function reorderFromDOM(queueType) {
|
|
var container = document.getElementById(getQueueContainerId(queueType));
|
|
if (!container) return;
|
|
var ids = Array.from(container.querySelectorAll("[data-fq-id]")).map(function (li) { return li.dataset.fqId; });
|
|
var files = queues[queueType];
|
|
var byId = {};
|
|
files.forEach(function (f) { byId[f.__xamxamId] = f; });
|
|
var reordered = ids.map(function (id) { return byId[id]; }).filter(Boolean);
|
|
files.forEach(function (f) {
|
|
if (reordered.indexOf(f) === -1) reordered.push(f);
|
|
});
|
|
queues[queueType] = reordered;
|
|
markDirty();
|
|
}
|
|
|
|
// ── Operations ─────────────────────────────────────────────────────────
|
|
|
|
function addFiles(queueType, newFiles) {
|
|
var errors = [];
|
|
var addedFiles = [];
|
|
for (var i = 0; i < newFiles.length; i++) {
|
|
var err = validateFile(newFiles[i], queueType);
|
|
if (err) {
|
|
errors.push(err);
|
|
} else {
|
|
newFiles[i].__xamxamId = genFileId();
|
|
addedFiles.push(newFiles[i]);
|
|
}
|
|
}
|
|
|
|
if (addedFiles.length > 0) {
|
|
queues[queueType] = queues[queueType].concat(addedFiles);
|
|
renderQueue(queueType);
|
|
}
|
|
|
|
return errors;
|
|
}
|
|
|
|
function removeFile(queueType, fileId) {
|
|
var idx = -1;
|
|
for (var i = 0; i < queues[queueType].length; i++) {
|
|
if (queues[queueType][i].__xamxamId === fileId) { idx = i; break; }
|
|
}
|
|
if (idx >= 0) {
|
|
queues[queueType].splice(idx, 1);
|
|
renderQueue(queueType);
|
|
}
|
|
}
|
|
|
|
// ── FormData injection on submit ───────────────────────────────────────
|
|
|
|
function injectQueuesIntoFormData(form, nativeFormData) {
|
|
var fd = nativeFormData || new FormData();
|
|
QUEUE_TYPES.forEach(function (qt) {
|
|
var files = queues[qt];
|
|
for (var i = 0; i < files.length; i++) {
|
|
fd.append("queue_file[" + qt + "][]", files[i], files[i].name);
|
|
}
|
|
});
|
|
|
|
// Append queue order hints so the server can validate user ordering
|
|
QUEUE_TYPES.forEach(function (qt) {
|
|
var ids = queues[qt].map(function (f) { return f.__xamxamId; });
|
|
if (ids.length > 0) {
|
|
fd.append("queue_order[" + qt + "]", JSON.stringify(ids));
|
|
}
|
|
});
|
|
|
|
return fd;
|
|
}
|
|
|
|
// ── Dirty tracking integration ─────────────────────────────────────────
|
|
|
|
function markDirty() {
|
|
// Set a global flag that beforeunload-guard.js can check
|
|
window.__xamxamDirty = true;
|
|
}
|
|
|
|
function markClean() {
|
|
window.__xamxamDirty = false;
|
|
}
|
|
|
|
// ── Validate callback for inline validation fragments ──────────────────
|
|
|
|
function showValidationMsg(input, msg) {
|
|
// Find the .file-validation-msg element scoped to this input's form
|
|
var form = input.closest(".file-validation-form");
|
|
var msgEl = form ? form.querySelector(".file-validation-msg") : null;
|
|
if (msgEl) {
|
|
msgEl.innerHTML = '<span class="file-validation-error">' + esc(msg) + '</span>';
|
|
}
|
|
}
|
|
|
|
function clearValidationMsg(input) {
|
|
var form = input.closest(".file-validation-form");
|
|
var msgEl = form ? form.querySelector(".file-validation-msg") : null;
|
|
if (msgEl) {
|
|
msgEl.innerHTML = "";
|
|
}
|
|
}
|
|
|
|
// ── Binding ────────────────────────────────────────────────────────────
|
|
|
|
function bindQueueInputs() {
|
|
document.querySelectorAll(".tfe-file-picker").forEach(function (input) {
|
|
if (input.dataset.xamxamBound) return;
|
|
input.dataset.xamxamBound = "1";
|
|
|
|
var queueType = null;
|
|
// Determine queue type from input attributes
|
|
if (input.id === "tfe-files-input") queueType = "tfe";
|
|
else if (input.id === "video-files-input") queueType = "video";
|
|
else if (input.id === "audio-files-input") queueType = "audio";
|
|
else if (input.id === "annexe-files-input") queueType = "annexe";
|
|
else if (input.getAttribute("hx-vals")) {
|
|
// Legacy: try to parse from hx-vals
|
|
try {
|
|
var vals = JSON.parse(input.getAttribute("hx-vals"));
|
|
if (vals && vals.queue_type && QUEUE_TYPES.indexOf(vals.queue_type) >= 0) {
|
|
queueType = vals.queue_type;
|
|
}
|
|
} catch (_) { /* ignore */ }
|
|
}
|
|
|
|
if (!queueType) return;
|
|
|
|
input.addEventListener("change", function () {
|
|
clearValidationMsg(input);
|
|
var files = Array.from(input.files || []);
|
|
var errors = addFiles(queueType, files);
|
|
if (errors.length > 0) {
|
|
showValidationMsg(input, errors.join("; "));
|
|
}
|
|
// Reset file input so the same file can be re-selected
|
|
input.value = "";
|
|
});
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Delegate click events for remove buttons (these are regenerated on
|
|
* every renderQueue call, so live delegation is needed).
|
|
*/
|
|
function bindRemoveButtons() {
|
|
document.addEventListener("click", function (e) {
|
|
var btn = e.target.closest("button[data-action='xamxam-remove']");
|
|
if (!btn) return;
|
|
e.preventDefault();
|
|
var qt = btn.getAttribute("data-queue");
|
|
var fid = btn.getAttribute("data-file-id");
|
|
if (qt && fid) removeFile(qt, fid);
|
|
});
|
|
}
|
|
|
|
// ── Form submit interception ───────────────────────────────────────────
|
|
|
|
// Track whether we've already intercepted this submit to prevent double-submit
|
|
var _xamxamActiveSubmit = false;
|
|
|
|
function bindFormSubmit() {
|
|
document.querySelectorAll("form[data-beforeunload-guard]").forEach(function (form) {
|
|
if (form.dataset.xamxamFormBound) return;
|
|
form.dataset.xamxamFormBound = "1";
|
|
|
|
form.addEventListener("submit", function (e) {
|
|
var hasFiles = QUEUE_TYPES.some(function (qt) { return queues[qt].length > 0; });
|
|
|
|
console.log("[file-upload-queue] submit event fired | action=" + (form.getAttribute("action") || "") + " | hasFiles=" + hasFiles + " | enctype=" + form.enctype);
|
|
|
|
if (!hasFiles) {
|
|
console.log("[file-upload-queue] no queued files, passing through native submit");
|
|
markClean();
|
|
return; // Normal submit
|
|
}
|
|
|
|
// Check if the form can accept multipart
|
|
if (form.enctype !== "multipart/form-data") {
|
|
console.log("[file-upload-queue] form enctype is not multipart/form-data, passing through");
|
|
markClean();
|
|
return;
|
|
}
|
|
|
|
// Prevent double-submit (in case native submit falls through)
|
|
if (_xamxamActiveSubmit) {
|
|
console.log("[file-upload-queue] already submitting, skipping");
|
|
e.preventDefault();
|
|
return;
|
|
}
|
|
_xamxamActiveSubmit = true;
|
|
|
|
e.preventDefault();
|
|
|
|
// Build FormData from form fields + inject queued files
|
|
var fd = new FormData(form);
|
|
|
|
// Remove stale file input artifacts (consumed by change handler)
|
|
QUEUE_TYPES.forEach(function (qt) {
|
|
fd.delete("tfe");
|
|
fd.delete("video");
|
|
fd.delete("audio");
|
|
fd.delete("annexe");
|
|
});
|
|
|
|
fd = injectQueuesIntoFormData(form, fd);
|
|
|
|
markClean();
|
|
|
|
console.log("[file-upload-queue] injecting " + QUEUE_TYPES.map(function(qt) { return qt + ":" + queues[qt].length; }).join(", ") + " files into FormData");
|
|
|
|
// Use XMLHttpRequest instead of fetch so we can reliably read the
|
|
// final URL after redirects (fetch with redirect:manual hides headers).
|
|
var xhr = new XMLHttpRequest();
|
|
xhr.open("POST", form.getAttribute("action") || "", true);
|
|
xhr.responseType = "text";
|
|
|
|
xhr.onload = function () {
|
|
_xamxamActiveSubmit = false;
|
|
var finalUrl = xhr.responseURL || "";
|
|
|
|
console.log("[file-upload-queue] XHR status=" + xhr.status + " | finalUrl=" + finalUrl + " | responseLength=" + (xhr.responseText ? xhr.responseText.length : 0));
|
|
|
|
// If the server redirected us (responseURL differs from action), navigate there.
|
|
// This handles the 302 redirect pattern used by formulaire.php and edit.php.
|
|
var actionUrl = form.getAttribute("action") || "";
|
|
if (finalUrl && finalUrl !== actionUrl && finalUrl !== window.location.href) {
|
|
console.log("[file-upload-queue] redirecting to " + finalUrl);
|
|
window.location.href = finalUrl;
|
|
return;
|
|
}
|
|
|
|
// 200 with HTML — likely form errors, replace page
|
|
if (xhr.status >= 200 && xhr.status < 300 && xhr.responseText) {
|
|
console.log("[file-upload-queue] rendering error response HTML");
|
|
document.open();
|
|
document.write(xhr.responseText);
|
|
document.close();
|
|
// Re-bind after DOM replacement (for error re-renders)
|
|
setTimeout(window.XamxamInitFileUploads, 0);
|
|
return;
|
|
}
|
|
|
|
// Fallback: reload current page
|
|
console.log("[file-upload-queue] unexpected response, reloading page");
|
|
window.location.reload();
|
|
};
|
|
|
|
xhr.onerror = function () {
|
|
_xamxamActiveSubmit = false;
|
|
console.error("[file-upload-queue] XHR network error, falling back to native submit");
|
|
// Fall back to native submit
|
|
form.submit();
|
|
};
|
|
|
|
xhr.send(fd);
|
|
});
|
|
});
|
|
}
|
|
|
|
// ── Public API (called by HTMX afterSwap scripts) ──────────────────────
|
|
|
|
window.XamxamInitFileUploads = function () {
|
|
bindQueueInputs();
|
|
};
|
|
|
|
window.XamxamInitQueues = function () {
|
|
// Re-render all queues from in-memory state (used when format switching
|
|
// replaces the queues container via HTMX).
|
|
QUEUE_TYPES.forEach(function (qt) {
|
|
var container = document.getElementById(getQueueContainerId(qt));
|
|
if (container && queues[qt].length > 0) {
|
|
renderQueue(qt);
|
|
}
|
|
});
|
|
};
|
|
|
|
// ── Bootstrap ──────────────────────────────────────────────────────────
|
|
|
|
bindRemoveButtons();
|
|
bindFormSubmit();
|
|
|
|
if (document.readyState === "loading") {
|
|
document.addEventListener("DOMContentLoaded", window.XamxamInitFileUploads);
|
|
} else {
|
|
window.XamxamInitFileUploads();
|
|
}
|
|
})();
|