corrections album v4.4
This commit is contained in:
parent
ab9f2ecdf4
commit
5bb1c14c6e
|
@ -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,6 +507,8 @@ class album extends common {
|
||||||
}
|
}
|
||||||
// Construire le tableau
|
// Construire le tableau
|
||||||
foreach((array) $galleries as $galleryId => $gallery) {
|
foreach((array) $galleries as $galleryId => $gallery) {
|
||||||
|
// pour ne pas prendre en compte la fausse galerie 'config'
|
||||||
|
if(isset($gallery['config']['directory'])){
|
||||||
if(is_dir($gallery['config']['directory'])) {
|
if(is_dir($gallery['config']['directory'])) {
|
||||||
$iterator = new DirectoryIterator($gallery['config']['directory']);
|
$iterator = new DirectoryIterator($gallery['config']['directory']);
|
||||||
foreach($iterator as $fileInfos) {
|
foreach($iterator as $fileInfos) {
|
||||||
|
@ -519,6 +523,7 @@ class album extends common {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Valeurs en sortie
|
// Valeurs en sortie
|
||||||
$this->addOutput([
|
$this->addOutput([
|
||||||
'showBarEditButton' => true,
|
'showBarEditButton' => true,
|
||||||
|
|
Loading…
Reference in New Issue