les albums sont triés par ordre alphabétique
This commit is contained in:
parent
ca32d05ce6
commit
37207927bd
10
albums.php
10
albums.php
@ -17,6 +17,7 @@ $currentAlbumInfo = getAlbumInfo($currentPath);
|
|||||||
|
|
||||||
// Récupérer tous les sous-dossiers
|
// Récupérer tous les sous-dossiers
|
||||||
$albums = [];
|
$albums = [];
|
||||||
|
$tempAlbums = [];
|
||||||
foreach (new DirectoryIterator($currentPath) as $item) {
|
foreach (new DirectoryIterator($currentPath) as $item) {
|
||||||
if ($item->isDot()) continue;
|
if ($item->isDot()) continue;
|
||||||
if ($item->isDir()) {
|
if ($item->isDir()) {
|
||||||
@ -27,7 +28,7 @@ foreach (new DirectoryIterator($currentPath) as $item) {
|
|||||||
getImagesRecursively($albumPath) :
|
getImagesRecursively($albumPath) :
|
||||||
getLatestImages($albumPath);
|
getLatestImages($albumPath);
|
||||||
|
|
||||||
$albums[] = [
|
$tempAlbums[] = [
|
||||||
'path' => str_replace('\\', '/', $albumPath),
|
'path' => str_replace('\\', '/', $albumPath),
|
||||||
'title' => $info['title'],
|
'title' => $info['title'],
|
||||||
'description' => $info['description'],
|
'description' => $info['description'],
|
||||||
@ -39,6 +40,13 @@ foreach (new DirectoryIterator($currentPath) as $item) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tri alphabétique des albums par titre
|
||||||
|
usort($tempAlbums, function($a, $b) {
|
||||||
|
return strcasecmp($a['title'], $b['title']);
|
||||||
|
});
|
||||||
|
|
||||||
|
$albums = $tempAlbums;
|
||||||
|
|
||||||
// Déterminer le chemin parent pour le bouton retour
|
// Déterminer le chemin parent pour le bouton retour
|
||||||
$parentPath = dirname($currentPath);
|
$parentPath = dirname($currentPath);
|
||||||
if (!isSecurePath($parentPath)) {
|
if (!isSecurePath($parentPath)) {
|
||||||
|
|||||||
103
arbre-prive.php
103
arbre-prive.php
@ -141,60 +141,69 @@ function generatePrivateTree($path, $currentPath) {
|
|||||||
$output .= '</div></div>';
|
$output .= '</div></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parcourir tous les sous-dossiers
|
// Récupérer et trier les sous-dossiers
|
||||||
|
$dirs = array();
|
||||||
foreach (new DirectoryIterator($path) as $item) {
|
foreach (new DirectoryIterator($path) as $item) {
|
||||||
if ($item->isDot()) continue;
|
if ($item->isDot()) continue;
|
||||||
if ($item->isDir()) {
|
if ($item->isDir()) {
|
||||||
$fullPath = $item->getPathname();
|
$fullPath = $item->getPathname();
|
||||||
$info = getAlbumInfo($fullPath);
|
$info = getAlbumInfo($fullPath);
|
||||||
$isCurrentPath = realpath($fullPath) === $currentPath;
|
$dirs[$info['title']] = $fullPath;
|
||||||
$hasSubfolders = hasSubfolders($fullPath);
|
|
||||||
$hasImages = hasImages($fullPath);
|
|
||||||
|
|
||||||
$output .= '<li class="tree-item' . ($isCurrentPath ? ' active' : '') . '">';
|
|
||||||
$output .= '<div class="tree-item-content">';
|
|
||||||
$output .= '<span class="tree-link">';
|
|
||||||
$output .= '<span class="folder-icon">🔒</span> ' . htmlspecialchars($info['title']);
|
|
||||||
if ($info['mature_content']) {
|
|
||||||
$output .= ' <span class="mature-warning">🔞</span>';
|
|
||||||
}
|
|
||||||
$output .= '</span>';
|
|
||||||
$output .= '<div class="tree-actions">';
|
|
||||||
if (!$hasSubfolders) {
|
|
||||||
$output .= '<a href="arbre-img-prive.php?path=' . urlencode($fullPath) . '&private=1" class="tree-button" style="text-decoration: none">🖼️</a>';
|
|
||||||
// Ajout du bouton de génération de lien si le dossier contient des images
|
|
||||||
if ($hasImages) {
|
|
||||||
$output .= '<button onclick="generateShareLink(\'' . htmlspecialchars($fullPath) . '\', \''
|
|
||||||
. htmlspecialchars($info['title'])
|
|
||||||
. '\')" class="tree-button tree-button-share" title="Générer un lien de partage">🔗</button>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!$hasSubfolders) {
|
|
||||||
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
|
||||||
. rawurlencode($info['title']) . '\', \''
|
|
||||||
. rawurlencode($info['description']) . '\', '
|
|
||||||
. ($info['mature_content'] ? 'true' : 'false') . ', \''
|
|
||||||
. rawurlencode($info['more_info_url']) . '\', '
|
|
||||||
. ($hasImages ? 'true' : 'false')
|
|
||||||
. ')" class="tree-button">✏️</button>';
|
|
||||||
} else {
|
|
||||||
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
|
||||||
. rawurlencode($info['title']) . '\', \''
|
|
||||||
. rawurlencode($info['description']) . '\', '
|
|
||||||
. ($info['mature_content'] ? 'true' : 'false') . ', \'\', false)" class="tree-button">✏️</button>';
|
|
||||||
}
|
|
||||||
if (!$hasImages) {
|
|
||||||
$output .= '<button onclick="createSubfolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button">➕</button>';
|
|
||||||
}
|
|
||||||
if ($fullPath !== './liste_albums_prives') {
|
|
||||||
$output .= '<button onclick="deleteFolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button tree-button-danger">🗑️</button>';
|
|
||||||
}
|
|
||||||
$output .= '</div></div>';
|
|
||||||
|
|
||||||
$output .= generatePrivateTree($fullPath, $currentPath);
|
|
||||||
$output .= '</li>';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tri alphabétique par titre
|
||||||
|
ksort($dirs, SORT_STRING | SORT_FLAG_CASE);
|
||||||
|
|
||||||
|
// Parcourir les dossiers triés
|
||||||
|
foreach ($dirs as $title => $fullPath) {
|
||||||
|
$info = getAlbumInfo($fullPath);
|
||||||
|
$isCurrentPath = realpath($fullPath) === $currentPath;
|
||||||
|
$hasSubfolders = hasSubfolders($fullPath);
|
||||||
|
$hasImages = hasImages($fullPath);
|
||||||
|
|
||||||
|
$output .= '<li class="tree-item' . ($isCurrentPath ? ' active' : '') . '">';
|
||||||
|
$output .= '<div class="tree-item-content">';
|
||||||
|
$output .= '<span class="tree-link">';
|
||||||
|
$output .= '<span class="folder-icon">🔒</span> ' . htmlspecialchars($info['title']);
|
||||||
|
if ($info['mature_content']) {
|
||||||
|
$output .= ' <span class="mature-warning">🔞</span>';
|
||||||
|
}
|
||||||
|
$output .= '</span>';
|
||||||
|
$output .= '<div class="tree-actions">';
|
||||||
|
if (!$hasSubfolders) {
|
||||||
|
$output .= '<a href="arbre-img-prive.php?path=' . urlencode($fullPath) . '&private=1" class="tree-button" style="text-decoration: none">🖼️</a>';
|
||||||
|
if ($hasImages) {
|
||||||
|
$output .= '<button onclick="generateShareLink(\'' . htmlspecialchars($fullPath) . '\', \''
|
||||||
|
. htmlspecialchars($info['title'])
|
||||||
|
. '\')" class="tree-button tree-button-share" title="Générer un lien de partage">🔗</button>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!$hasSubfolders) {
|
||||||
|
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
||||||
|
. rawurlencode($info['title']) . '\', \''
|
||||||
|
. rawurlencode($info['description']) . '\', '
|
||||||
|
. ($info['mature_content'] ? 'true' : 'false') . ', \''
|
||||||
|
. rawurlencode($info['more_info_url']) . '\', '
|
||||||
|
. ($hasImages ? 'true' : 'false')
|
||||||
|
. ')" class="tree-button">✏️</button>';
|
||||||
|
} else {
|
||||||
|
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
||||||
|
. rawurlencode($info['title']) . '\', \''
|
||||||
|
. rawurlencode($info['description']) . '\', '
|
||||||
|
. ($info['mature_content'] ? 'true' : 'false') . ', \'\', false)" class="tree-button">✏️</button>';
|
||||||
|
}
|
||||||
|
if (!$hasImages) {
|
||||||
|
$output .= '<button onclick="createSubfolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button">➕</button>';
|
||||||
|
}
|
||||||
|
if ($fullPath !== './liste_albums_prives') {
|
||||||
|
$output .= '<button onclick="deleteFolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button tree-button-danger">🗑️</button>';
|
||||||
|
}
|
||||||
|
$output .= '</div></div>';
|
||||||
|
|
||||||
|
$output .= generatePrivateTree($fullPath, $currentPath);
|
||||||
|
$output .= '</li>';
|
||||||
|
}
|
||||||
|
|
||||||
$output .= '</ul>';
|
$output .= '</ul>';
|
||||||
return $output;
|
return $output;
|
||||||
|
|||||||
93
arbre.php
93
arbre.php
@ -112,55 +112,63 @@ function generateTree($path, $currentPath) {
|
|||||||
$output .= '</div></div>';
|
$output .= '</div></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parcourir tous les sous-dossiers
|
// Récupérer et trier les sous-dossiers
|
||||||
|
$dirs = array();
|
||||||
foreach (new DirectoryIterator($path) as $item) {
|
foreach (new DirectoryIterator($path) as $item) {
|
||||||
if ($item->isDot()) continue;
|
if ($item->isDot()) continue;
|
||||||
if ($item->isDir()) {
|
if ($item->isDir()) {
|
||||||
$fullPath = $item->getPathname();
|
$fullPath = $item->getPathname();
|
||||||
$info = getAlbumInfo($fullPath);
|
$info = getAlbumInfo($fullPath);
|
||||||
$isCurrentPath = realpath($fullPath) === $currentPath;
|
$dirs[$info['title']] = $fullPath;
|
||||||
$hasSubfolders = hasSubfolders($fullPath);
|
|
||||||
|
|
||||||
$output .= '<li class="tree-item' . ($isCurrentPath ? ' active' : '') . '">';
|
|
||||||
$output .= '<div class="tree-item-content">';
|
|
||||||
$output .= '<span class="tree-link">';
|
|
||||||
$output .= '<span class="folder-icon">📁</span> ' . htmlspecialchars($info['title']);
|
|
||||||
if ($info['mature_content']) {
|
|
||||||
$output .= ' <span class="mature-warning">🔞</span>';
|
|
||||||
}
|
|
||||||
$output .= '</span>';
|
|
||||||
$output .= '<div class="tree-actions">';
|
|
||||||
if (!$hasSubfolders) {
|
|
||||||
$output .= '<a href="arbre-img.php?path=' . urlencode($fullPath) . '" class="tree-button" style="text-decoration: none">🖼️</a>';
|
|
||||||
}
|
|
||||||
// Pour les dossiers avec des images
|
|
||||||
if (!$hasSubfolders) {
|
|
||||||
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
|
||||||
. rawurlencode($info['title']) . '\', \''
|
|
||||||
. rawurlencode($info['description']) . '\', '
|
|
||||||
. ($info['mature_content'] ? 'true' : 'false') . ', \''
|
|
||||||
. rawurlencode($info['more_info_url']) . '\', '
|
|
||||||
. (hasImages($fullPath) ? 'true' : 'false')
|
|
||||||
. ')" class="tree-button">✏️</button>';
|
|
||||||
} else {
|
|
||||||
// Pour les dossiers sans images
|
|
||||||
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
|
||||||
. rawurlencode($info['title']) . '\', \''
|
|
||||||
. rawurlencode($info['description']) . '\', '
|
|
||||||
. ($info['mature_content'] ? 'true' : 'false') . ', \'\', false)" class="tree-button">✏️</button>';
|
|
||||||
}
|
|
||||||
if (!hasImages($fullPath)) {
|
|
||||||
$output .= '<button onclick="createSubfolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button">➕</button>';
|
|
||||||
}
|
|
||||||
if ($fullPath !== './liste_albums') {
|
|
||||||
$output .= '<button onclick="deleteFolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button tree-button-danger">🗑️</button>';
|
|
||||||
}
|
|
||||||
$output .= '</div></div>';
|
|
||||||
|
|
||||||
$output .= generateTree($fullPath, $currentPath);
|
|
||||||
$output .= '</li>';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tri alphabétique par titre
|
||||||
|
ksort($dirs, SORT_STRING | SORT_FLAG_CASE);
|
||||||
|
|
||||||
|
// Parcourir les dossiers triés
|
||||||
|
foreach ($dirs as $title => $fullPath) {
|
||||||
|
$info = getAlbumInfo($fullPath);
|
||||||
|
$isCurrentPath = realpath($fullPath) === $currentPath;
|
||||||
|
$hasSubfolders = hasSubfolders($fullPath);
|
||||||
|
|
||||||
|
$output .= '<li class="tree-item' . ($isCurrentPath ? ' active' : '') . '">';
|
||||||
|
$output .= '<div class="tree-item-content">';
|
||||||
|
$output .= '<span class="tree-link">';
|
||||||
|
$output .= '<span class="folder-icon">📁</span> ' . htmlspecialchars($info['title']);
|
||||||
|
if ($info['mature_content']) {
|
||||||
|
$output .= ' <span class="mature-warning">🔞</span>';
|
||||||
|
}
|
||||||
|
$output .= '</span>';
|
||||||
|
$output .= '<div class="tree-actions">';
|
||||||
|
if (!$hasSubfolders) {
|
||||||
|
$output .= '<a href="arbre-img.php?path=' . urlencode($fullPath) . '" class="tree-button" style="text-decoration: none">🖼️</a>';
|
||||||
|
}
|
||||||
|
if (!$hasSubfolders) {
|
||||||
|
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
||||||
|
. rawurlencode($info['title']) . '\', \''
|
||||||
|
. rawurlencode($info['description']) . '\', '
|
||||||
|
. ($info['mature_content'] ? 'true' : 'false') . ', \''
|
||||||
|
. rawurlencode($info['more_info_url']) . '\', '
|
||||||
|
. (hasImages($fullPath) ? 'true' : 'false')
|
||||||
|
. ')" class="tree-button">✏️</button>';
|
||||||
|
} else {
|
||||||
|
$output .= '<button onclick="editFolder(\'' . htmlspecialchars($fullPath) . '\', \''
|
||||||
|
. rawurlencode($info['title']) . '\', \''
|
||||||
|
. rawurlencode($info['description']) . '\', '
|
||||||
|
. ($info['mature_content'] ? 'true' : 'false') . ', \'\', false)" class="tree-button">✏️</button>';
|
||||||
|
}
|
||||||
|
if (!hasImages($fullPath)) {
|
||||||
|
$output .= '<button onclick="createSubfolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button">➕</button>';
|
||||||
|
}
|
||||||
|
if ($fullPath !== './liste_albums') {
|
||||||
|
$output .= '<button onclick="deleteFolder(\'' . htmlspecialchars($fullPath) . '\')" class="tree-button tree-button-danger">🗑️</button>';
|
||||||
|
}
|
||||||
|
$output .= '</div></div>';
|
||||||
|
|
||||||
|
$output .= generateTree($fullPath, $currentPath);
|
||||||
|
$output .= '</li>';
|
||||||
|
}
|
||||||
|
|
||||||
$output .= '</ul>';
|
$output .= '</ul>';
|
||||||
return $output;
|
return $output;
|
||||||
@ -168,7 +176,6 @@ function generateTree($path, $currentPath) {
|
|||||||
|
|
||||||
$config = getSiteConfig();
|
$config = getSiteConfig();
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="fr">
|
<html lang="fr">
|
||||||
<head>
|
<head>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user