Deltacms/Deltacms
Deltacms
/
Deltacms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

corrections album v4.4

This commit is contained in:
Deltacms 2023-11-01 15:05:22 +01:00
parent ab9f2ecdf4
commit 5bb1c14c6e
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
module/album/album.php
View File

@ -131,8 +131,9 @@ class album extends common {
$param = ''; $param = '';
include('./module/album/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_album.php'); include('./module/album/lang/'. $this->getData(['config', 'i18n', 'langAdmin']) . '/lex_album.php');
//Affichage de l'album triée //Affichage de l'album triée sauf le faux tableau 'config'
$g = $this->getData(['module', $this->getUrl(0)]); $g = $this->getData(['module', $this->getUrl(0)]);
unset($g['config']);
$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position'); $p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
asort($p,SORT_NUMERIC); asort($p,SORT_NUMERIC);
$galleries = []; $galleries = [];
@ -495,8 +496,9 @@ class album extends common {
} }
// Liste des galeries // Liste des galeries
else { else {
// Tri des galeries suivant l'ordre défini // Tri des galeries suivant l'ordre défini sauf pour la fausse galerie 'config'
$g = $this->getData(['module', $this->getUrl(0)]); $g = $this->getData(['module', $this->getUrl(0)]);
unset($g['config']);
$p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position'); $p = helper::arrayCollumn(helper::arrayCollumn($g,'config'),'position');
asort($p,SORT_NUMERIC); asort($p,SORT_NUMERIC);
$galleries = []; $galleries = [];
@ -505,16 +507,19 @@ class album extends common {
} }
// Construire le tableau // Construire le tableau
foreach((array) $galleries as $galleryId => $gallery) { foreach((array) $galleries as $galleryId => $gallery) {
if(is_dir($gallery['config']['directory'])) { // pour ne pas prendre en compte la fausse galerie 'config'
$iterator = new DirectoryIterator($gallery['config']['directory']); if(isset($gallery['config']['directory'])){
foreach($iterator as $fileInfos) { if(is_dir($gallery['config']['directory'])) {
if($fileInfos->isDot() === false AND $fileInfos->isFile() AND substr(mime_content_type($fileInfos->getPathname()), 0, 5) == 'image') { $iterator = new DirectoryIterator($gallery['config']['directory']);
// contrôle et traite éventuellement les images affichées dans l'index de la galerie foreach($iterator as $fileInfos) {
$imgalerie = str_replace('\\','/',$fileInfos->getPathname()); if($fileInfos->isDot() === false AND $fileInfos->isFile() AND substr(mime_content_type($fileInfos->getPathname()), 0, 5) == 'image') {
albumHelper::controle($imgalerie); // contrôle et traite éventuellement les images affichées dans l'index de la galerie
self::$galleries[$galleryId] = $gallery; $imgalerie = str_replace('\\','/',$fileInfos->getPathname());
self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename(); albumHelper::controle($imgalerie);
continue(2); self::$galleries[$galleryId] = $gallery;
self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename();
continue(2);
}
} }
} }
} }