diff --git a/module/album/album.php b/module/album/album.php index b0087ab..d75109e 100644 --- a/module/album/album.php +++ b/module/album/album.php @@ -143,38 +143,35 @@ class album extends common { // Traitement de l'affichage if($galleries) { foreach($galleries as $galleryId => $gallery) { - // pour ne pas prendre en compte la fausse galerie 'config' - if(isset($gallery['config']['directory'])){ - // Erreur dossier vide - if(is_dir($gallery['config']['directory'])) { - if(count(scandir($gallery['config']['directory'])) === 2) { - $gallery['config']['directory'] = '' . $gallery['config']['directory'] . $text['gallery']['config'][0].''; - } - } - // Erreur dossier supprimé - else { - $gallery['config']['directory'] = '' . $gallery['config']['directory'] . $text['gallery']['config'][1].''; - } - // Met en forme le tableau - self::$galleries[] = [ - template::ico('sort'), - $gallery['config']['name'], - str_replace('site/file/source/','',$gallery['config']['directory']), - template::button('galleryConfigEdit' . $galleryId , [ - 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $galleryId . '/' . $_SESSION['csrf'], - 'value' => template::ico('pencil') - ]), - template::button('galleryConfigDelete' . $galleryId, [ - 'class' => 'galleryConfigDelete buttonRed', - 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $galleryId . '/' . $_SESSION['csrf'], - 'value' => template::ico('cancel'), - 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true - ]) - ]; - // Tableau des id des galleries pour le drag and drop - self::$galleriesId[] = $galleryId; + // pour ne pas prendre en compte la fausse galerie 'config' + if (isset($gallery['config']['directory']) && is_dir($gallery['config']['directory'])) { + if(count(scandir($gallery['config']['directory'])) === 2) { + $gallery['config']['directory'] = '' . $gallery['config']['directory'] . $text['gallery']['config'][0].''; } } + // Erreur dossier supprimé + else { + $gallery['config']['directory'] = '' . $gallery['config']['directory'] . $text['gallery']['config'][1].''; + } + // Met en forme le tableau + self::$galleries[] = [ + template::ico('sort'), + $gallery['config']['name'], + str_replace('site/file/source/','',$gallery['config']['directory']), + template::button('galleryConfigEdit' . $galleryId , [ + 'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $galleryId . '/' . $_SESSION['csrf'], + 'value' => template::ico('pencil') + ]), + template::button('galleryConfigDelete' . $galleryId, [ + 'class' => 'galleryConfigDelete buttonRed', + 'href' => helper::baseUrl() . $this->getUrl(0) . '/delete/' . $galleryId . '/' . $_SESSION['csrf'], + 'value' => template::ico('cancel'), + 'disabled' => $this->getUser('group') >= self::GROUP_MODERATOR ? false : true + ]) + ]; + // Tableau des id des galleries pour le drag and drop + self::$galleriesId[] = $galleryId; + } } // Soumission du formulaire d'ajout d'un album if($this->isPost()) { @@ -508,18 +505,16 @@ class album extends common { // Construire le tableau 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'])) { - $iterator = new DirectoryIterator($gallery['config']['directory']); - foreach($iterator as $fileInfos) { - if($fileInfos->isDot() === false AND $fileInfos->isFile() AND substr(mime_content_type($fileInfos->getPathname()), 0, 5) == 'image') { - // contrôle et traite éventuellement les images affichées dans l'index de la galerie - $imgalerie = str_replace('\\','/',$fileInfos->getPathname()); - albumHelper::controle($imgalerie); - self::$galleries[$galleryId] = $gallery; - self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename(); - continue(2); - } + if (isset($gallery['config']['directory']) && is_dir($gallery['config']['directory'])) { + $iterator = new DirectoryIterator($gallery['config']['directory']); + foreach($iterator as $fileInfos) { + if($fileInfos->isDot() === false AND $fileInfos->isFile() AND substr(mime_content_type($fileInfos->getPathname()), 0, 5) == 'image') { + // contrôle et traite éventuellement les images affichées dans l'index de la galerie + $imgalerie = str_replace('\\','/',$fileInfos->getPathname()); + albumHelper::controle($imgalerie); + self::$galleries[$galleryId] = $gallery; + self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename(); + continue(2); } } }