allègement du code
This commit is contained in:
parent
5bb1c14c6e
commit
9bff608b98
|
@ -143,38 +143,35 @@ class album extends common {
|
||||||
// Traitement de l'affichage
|
// Traitement de l'affichage
|
||||||
if($galleries) {
|
if($galleries) {
|
||||||
foreach($galleries as $galleryId => $gallery) {
|
foreach($galleries as $galleryId => $gallery) {
|
||||||
// pour ne pas prendre en compte la fausse galerie 'config'
|
// pour ne pas prendre en compte la fausse galerie 'config'
|
||||||
if(isset($gallery['config']['directory'])){
|
if (isset($gallery['config']['directory']) && is_dir($gallery['config']['directory'])) {
|
||||||
// Erreur dossier vide
|
if(count(scandir($gallery['config']['directory'])) === 2) {
|
||||||
if(is_dir($gallery['config']['directory'])) {
|
$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . $text['gallery']['config'][0].'</span>';
|
||||||
if(count(scandir($gallery['config']['directory'])) === 2) {
|
|
||||||
$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . $text['gallery']['config'][0].'</span>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Erreur dossier supprimé
|
|
||||||
else {
|
|
||||||
$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . $text['gallery']['config'][1].'</span>';
|
|
||||||
}
|
|
||||||
// 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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Erreur dossier supprimé
|
||||||
|
else {
|
||||||
|
$gallery['config']['directory'] = '<span class="galleryConfigError">' . $gallery['config']['directory'] . $text['gallery']['config'][1].'</span>';
|
||||||
|
}
|
||||||
|
// 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
|
// Soumission du formulaire d'ajout d'un album
|
||||||
if($this->isPost()) {
|
if($this->isPost()) {
|
||||||
|
@ -508,18 +505,16 @@ 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'
|
// pour ne pas prendre en compte la fausse galerie 'config'
|
||||||
if(isset($gallery['config']['directory'])){
|
if (isset($gallery['config']['directory']) && 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) {
|
if($fileInfos->isDot() === false AND $fileInfos->isFile() AND substr(mime_content_type($fileInfos->getPathname()), 0, 5) == 'image') {
|
||||||
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
|
||||||
// contrôle et traite éventuellement les images affichées dans l'index de la galerie
|
$imgalerie = str_replace('\\','/',$fileInfos->getPathname());
|
||||||
$imgalerie = str_replace('\\','/',$fileInfos->getPathname());
|
albumHelper::controle($imgalerie);
|
||||||
albumHelper::controle($imgalerie);
|
self::$galleries[$galleryId] = $gallery;
|
||||||
self::$galleries[$galleryId] = $gallery;
|
self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename();
|
||||||
self::$firstPictures[$galleryId] = $gallery['config']['directory'] . '/' . $fileInfos->getFilename();
|
continue(2);
|
||||||
continue(2);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue