From 37207927bd069b50be9491e02479ff41189304f8 Mon Sep 17 00:00:00 2001
From: Esenjin <esenjin@sangigi-fuchsia.fr>
Date: Tue, 7 Jan 2025 15:30:48 +0100
Subject: [PATCH] =?UTF-8?q?les=20albums=20sont=20tri=C3=A9s=20par=20ordre?=
 =?UTF-8?q?=20alphab=C3=A9tique?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 albums.php      |  10 ++++-
 arbre-prive.php | 103 ++++++++++++++++++++++++++----------------------
 arbre.php       |  93 +++++++++++++++++++++++--------------------
 3 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/albums.php b/albums.php
index ff65a9e..2f8e287 100644
--- a/albums.php
+++ b/albums.php
@@ -17,6 +17,7 @@ $currentAlbumInfo = getAlbumInfo($currentPath);
 
 // Récupérer tous les sous-dossiers
 $albums = [];
+$tempAlbums = [];
 foreach (new DirectoryIterator($currentPath) as $item) {
     if ($item->isDot()) continue;
     if ($item->isDir()) {
@@ -27,7 +28,7 @@ foreach (new DirectoryIterator($currentPath) as $item) {
                  getImagesRecursively($albumPath) : 
                  getLatestImages($albumPath);
         
-        $albums[] = [
+        $tempAlbums[] = [
             'path' => str_replace('\\', '/', $albumPath),
             'title' => $info['title'],
             '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
 $parentPath = dirname($currentPath);
 if (!isSecurePath($parentPath)) {
diff --git a/arbre-prive.php b/arbre-prive.php
index b0f2f1a..8f4032c 100644
--- a/arbre-prive.php
+++ b/arbre-prive.php
@@ -141,60 +141,69 @@ function generatePrivateTree($path, $currentPath) {
         $output .= '</div></div>';
     }
     
-    // Parcourir tous les sous-dossiers
+    // Récupérer et trier les sous-dossiers
+    $dirs = array();
     foreach (new DirectoryIterator($path) as $item) {
         if ($item->isDot()) continue;
         if ($item->isDir()) {
             $fullPath = $item->getPathname();
             $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>';
-                // 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>';
+            $dirs[$info['title']] = $fullPath;
         }
     }
+
+    // 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>';
     return $output;
diff --git a/arbre.php b/arbre.php
index f6dd2ad..0ad4407 100644
--- a/arbre.php
+++ b/arbre.php
@@ -112,55 +112,63 @@ function generateTree($path, $currentPath) {
         $output .= '</div></div>';
     }
     
-    // Parcourir tous les sous-dossiers
+    // Récupérer et trier les sous-dossiers
+    $dirs = array();
     foreach (new DirectoryIterator($path) as $item) {
         if ($item->isDot()) continue;
         if ($item->isDir()) {
             $fullPath = $item->getPathname();
             $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>';
-            }
-            // 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>';
+            $dirs[$info['title']] = $fullPath;
         }
     }
+
+    // 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>';
     return $output;
@@ -168,7 +176,6 @@ function generateTree($path, $currentPath) {
 
 $config = getSiteConfig();
 ?>
-
 <!DOCTYPE html>
 <html lang="fr">
 <head>