mirror of
https://codeberg.org/PostERG/xamxam.git
synced 2026-06-25 16:19:19 +02:00
79eddf5d5a
1. note_intention: Delete old file only when a genuinely new upload arrives
(32-char hex file_id), not when the FilePond pool preserves an existing
file by sending its DB integer ID. Previously the DB integer ID
triggered $hasNewNote=true, which deleted the existing note_intention
from disk+DB, then handleFilePondSingleFile couldn't re-process it
because the regex requires a hex pattern. Same fix applied to cover.
2. All file deletions now use deleteThesisFileToTrash() which renames
files to tmp/_trash/ instead of unlinking. The trash preserves
original filenames prefixed with DB id for traceability. Skips
website URLs and PeerTube refs (no disk file).
3. Storage prefix changed from theses/ to documents/ to reflect that
the folder holds all document types (determined by file_type in DB).
MediaController visibility gate supports both prefixes for backward
compat with existing files.
4. File browser + relink feature for orphaned files:
- /admin/fragments/file-browser.php — HTMX tree browser for
storage/documents/ and storage/theses/
- /admin/actions/filepond/relink.php — POST endpoint that inserts
a thesis_files row pointing to existing on-disk file
- Per-pool "📂 Relier" buttons (edit mode only)
- JS: XamxamOpenFileBrowser / XamxamRelinkFile with FilePond integration
- CSS: .relink-modal dialog + .file-browser tree styles
205 lines
9.7 KiB
PHP
205 lines
9.7 KiB
PHP
<?php
|
|
/**
|
|
* fichiers-fragment.php
|
|
*
|
|
* Shared HTMX fragment: returns the combined Format(s) + Fichiers block.
|
|
* Used by both the partage and admin forms.
|
|
*
|
|
* All slots (Couverture, Note d'intention, TFE, Annexes, Site web) are
|
|
* always visible — decorelated from the format checkboxes. The checkboxes
|
|
* serve only as metadata selectors; they no longer trigger HTMX swaps.
|
|
*
|
|
* Expected POST:
|
|
* formats[] — array of selected format_type IDs
|
|
* website_url — current value (repopulation)
|
|
* website_label — current value (repopulation)
|
|
* admin_mode — '1' for admin context (removes required attrs)
|
|
* edit_mode — '1' for edit context (preloads existing files)
|
|
*/
|
|
|
|
require_once APP_ROOT . '/src/PeerTubeService.php';
|
|
|
|
$_ptDb = Database::getInstance();
|
|
$peerTubeEnabled = PeerTubeService::isEnabled($_ptDb);
|
|
$peerTubeSettings = PeerTubeService::getSettings($_ptDb);
|
|
|
|
$db = $_ptDb->getConnection();
|
|
|
|
// Exclude removed format types (Écriture, Image)
|
|
$allFormats = $db->query("SELECT id, name FROM format_types WHERE name NOT IN ('Écriture', 'Image') ORDER BY sort_order, id")
|
|
->fetchAll(PDO::FETCH_ASSOC);
|
|
|
|
$selectedFormats = isset($_POST['formats']) && is_array($_POST['formats'])
|
|
? array_map('intval', $_POST['formats'])
|
|
: [];
|
|
|
|
$adminMode = ($_POST['admin_mode'] ?? '0') === '1';
|
|
$editMode = ($_POST['edit_mode'] ?? '0') === '1';
|
|
|
|
$websiteUrl = htmlspecialchars($_POST['website_url'] ?? '');
|
|
$websiteLabel = htmlspecialchars($_POST['website_label'] ?? '');
|
|
?>
|
|
<!-- ═══════════════════ Format(s) + Fichiers ═══════════════════ -->
|
|
<div id="format-fichiers-block">
|
|
<input type="hidden" name="admin_mode" value="<?= $adminMode ? '1' : '0' ?>">
|
|
<input type="hidden" name="edit_mode" value="<?= $editMode ? '1' : '0' ?>">
|
|
|
|
<!-- ═══════════════════ Format(s) — sticky ═══════════════════ -->
|
|
<fieldset id="fieldset-formats">
|
|
<legend>Format(s)</legend>
|
|
<div>
|
|
<span class="admin-row-label">Format(s) du TFE :<?= !$adminMode ? ' <span class="asterisk">*</span>' : '' ?></span>
|
|
<fieldset class="admin-checkbox-group"
|
|
<?= !$adminMode ? 'required aria-required="true"' : '' ?> >
|
|
<legend class="sr-only">Format(s) du TFE</legend>
|
|
<ul>
|
|
<?php foreach ($allFormats as $opt): ?>
|
|
<li>
|
|
<label class="admin-checkbox-label">
|
|
<input type="checkbox"
|
|
name="formats[]"
|
|
value="<?= htmlspecialchars((string)$opt['id']) ?>"
|
|
<?= in_array((int)$opt['id'], $selectedFormats, true) ? 'checked' : '' ?>>
|
|
<?= htmlspecialchars($opt['name']) ?>
|
|
</label>
|
|
</li>
|
|
<?php endforeach; ?>
|
|
</ul>
|
|
</fieldset>
|
|
</div>
|
|
</fieldset>
|
|
|
|
<!-- ═══════════════════ Fichiers ═══════════════════ -->
|
|
<fieldset>
|
|
<legend>Fichiers</legend>
|
|
|
|
<!-- ── 1. Couverture ── -->
|
|
<div class="admin-form-group">
|
|
<label for="couverture">Image de couverture (optionnel)</label>
|
|
<div class="admin-file-input">
|
|
<input type="file" id="couverture"
|
|
name="queue_file[cover][]"
|
|
class="tfe-file-picker tfe-file-picker--single"
|
|
data-queue-type="cover"
|
|
data-existing-files='<?= htmlspecialchars(json_encode($existingFilesJsonForCover ?? []), ENT_QUOTES) ?>'>
|
|
<small>JPG, PNG ou WEBP. Format 4:3 recommandé. Max 20 MB.</small>
|
|
</div>
|
|
<?php if ($editMode): ?>
|
|
<button type="button" class="btn btn--sm btn--ghost file-browser-trigger"
|
|
data-queue-type="cover"
|
|
data-thesis-id="<?= htmlspecialchars((string)($thesisId ?? $_GET['id'] ?? '')) ?>"
|
|
onclick="XamxamOpenFileBrowser(this)">
|
|
📂 Relier un fichier existant
|
|
</button>
|
|
<?php endif; ?>
|
|
</div>
|
|
|
|
<!-- ── 2. Note d'intention ── -->
|
|
<div class="admin-form-group">
|
|
<label for="note_intention">Note d'intention<?= !$adminMode ? ' <span class="asterisk">*</span>' : '' ?></label>
|
|
<div class="admin-file-input">
|
|
<input type="file" id="note_intention"
|
|
name="queue_file[note_intention][]"
|
|
class="tfe-file-picker tfe-file-picker--single"
|
|
data-queue-type="note_intention"
|
|
data-existing-files='<?= htmlspecialchars(json_encode($existingFilesJsonForNoteIntention ?? []), ENT_QUOTES) ?>'
|
|
<?= !$adminMode ? 'required' : '' ?>>
|
|
<small>PDF uniquement. Max 100 MB. Si votre fichier est trop lourd, compressez-le avec <a href="https://www.bentopdf.com" target="_blank" rel="noopener">bentopdf.com</a>.</small>
|
|
</div>
|
|
<?php if ($editMode): ?>
|
|
<button type="button" class="btn btn--sm btn--ghost file-browser-trigger"
|
|
data-queue-type="note_intention"
|
|
data-thesis-id="<?= htmlspecialchars((string)($thesisId ?? $_GET['id'] ?? '')) ?>"
|
|
onclick="XamxamOpenFileBrowser(this)">
|
|
📂 Relier un fichier existant
|
|
</button>
|
|
<?php endif; ?>
|
|
</div>
|
|
|
|
<!-- ── 3. TFE (all files: PDF, images, video, audio, VTT, archives) ── -->
|
|
<div class="admin-form-group admin-files-fieldgroup">
|
|
<label for="tfe-files-input">TFE<?= !$adminMode ? ' <span class="asterisk">*</span>' : '' ?></label>
|
|
<div class="admin-file-input">
|
|
<input type="file" id="tfe-files-input"
|
|
name="queue_file[tfe][]"
|
|
multiple
|
|
class="tfe-file-picker"
|
|
data-queue-type="tfe"
|
|
<?= !$adminMode ? 'required' : '' ?>
|
|
data-existing-files='<?= htmlspecialchars(json_encode($existingFilesJsonForTfe ?? []), ENT_QUOTES) ?>'>
|
|
<small class="admin-file-hint">
|
|
Glissez pour réordonner.
|
|
<br>
|
|
<br>
|
|
PDF (max 100 MB) · Images (max 500 MB) · Vidéo & Audio (max 2 GB) · VTT · Archives (max 500 MB).
|
|
<br>→ PDFs trop lourds ? <a href="https://www.bentopdf.com" target="_blank" rel="noopener">https://bentopdf.com/</a>
|
|
<?php if ($peerTubeEnabled): ?>
|
|
<br><br>Vidéos et audio hébergés sur <a href="<?= htmlspecialchars($peerTubeSettings['instance_url']) ?>" target="_blank" rel="noopener">PeerTube</a>.
|
|
<?php endif; ?>
|
|
</small>
|
|
</div>
|
|
<?php if ($editMode): ?>
|
|
<button type="button" class="btn btn--sm btn--ghost file-browser-trigger"
|
|
data-queue-type="tfe"
|
|
data-thesis-id="<?= htmlspecialchars((string)($thesisId ?? $_GET['id'] ?? '')) ?>"
|
|
onclick="XamxamOpenFileBrowser(this)">
|
|
📂 Relier un fichier existant
|
|
</button>
|
|
<?php endif; ?>
|
|
</div>
|
|
|
|
<!-- ── 4. Annexes ── -->
|
|
<div id="annexes-input-block">
|
|
<input type="hidden" name="has_annexes" value="0">
|
|
<div class="admin-form-group admin-files-fieldgroup">
|
|
<label for="annexe-files-input">Annexes (optionnel)</label>
|
|
<div class="admin-file-input">
|
|
<input type="file" id="annexe-files-input"
|
|
name="queue_file[annexe][]"
|
|
multiple
|
|
class="tfe-file-picker"
|
|
data-queue-type="annexe"
|
|
data-existing-files='<?= htmlspecialchars(json_encode($existingFilesJsonForAnnexe ?? []), ENT_QUOTES) ?>'>
|
|
<small class="admin-file-hint">PDF ou archives ZIP/TAR. Max 500 MB. Glissez pour réordonner.</small>
|
|
</div>
|
|
<?php if ($editMode): ?>
|
|
<button type="button" class="btn btn--sm btn--ghost file-browser-trigger"
|
|
data-queue-type="annexe"
|
|
data-thesis-id="<?= htmlspecialchars((string)($thesisId ?? $_GET['id'] ?? '')) ?>"
|
|
onclick="XamxamOpenFileBrowser(this)">
|
|
📂 Relier un fichier existant
|
|
</button>
|
|
<?php endif; ?>
|
|
</div>
|
|
</div>
|
|
|
|
<!-- ── 5. Site web url ── -->
|
|
<div id="slot-siteweb" class="admin-form-group">
|
|
<label for="website_url">URL du site (optionnel)</label>
|
|
<div class="admin-file-input">
|
|
<input type="url" id="website_url" name="website_url"
|
|
value="<?= $websiteUrl ?>"
|
|
placeholder="https://mon-tfe.erg.be">
|
|
<small>Le TFE sera affiché comme un site embarqué sur sa page publique.</small>
|
|
</div>
|
|
</div>
|
|
|
|
</fieldset><!-- /Fichiers -->
|
|
</div><!-- #format-fichiers-block -->
|
|
|
|
<!-- ═══════════════════ File Browser Modal (edit mode only) ═══════════════════ -->
|
|
<?php if ($editMode): ?>
|
|
<dialog id="relink-modal" class="relink-modal">
|
|
<div class="relink-modal-header">
|
|
<h3>Relier un fichier existant</h3>
|
|
<button type="button" class="btn btn--sm btn--ghost" onclick="document.getElementById('relink-modal').close()" aria-label="Fermer">✕</button>
|
|
</div>
|
|
<div id="relink-modal-body">
|
|
<p class="file-browser-loading">Chargement du navigateur de fichiers…</p>
|
|
</div>
|
|
<div class="relink-modal-footer">
|
|
<small>Seuls les fichiers déjà présents dans storage/documents/ ou storage/theses/ sont listés.</small>
|
|
</div>
|
|
</dialog>
|
|
<?php endif; ?>
|