ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

scandir original

This commit is contained in:
fredtempez 2021-02-10 17:58:08 +01:00
parent ddb0f4f4a5
commit 8dff1cd069
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/class/helper.class.php
View File

@ -165,23 +165,6 @@ class helper {
}
/**
* Scanne le contenu d'un dossier et de ses sous-dossiers
* @param string $dir Dossier à scanner
* @return array liste de dossiers contenus dans le répertoire cible.
*/
public static function scanSubDir($dir) {
$dirContent = [];
$iterator = new DirectoryIterator($dir);
foreach($iterator as $fileInfos) {
if($fileInfos->isDot() === false AND $fileInfos->isDir()) {
$dirContent[] = $dir . '/' . $fileInfos->getBasename();
$dirContent = array_merge($dirContent, self::scanSubDir($dir . '/' . $fileInfos->getBasename()));
}
}
return $dirContent;
}
/**
* Retourne true si le protocole est en TLS

2
core/core.php
View File

@ -44,7 +44,7 @@ class common {
const ACCESS_TIMER = 1800;
// Numéro de version
const ZWII_VERSION = '10.4.01';
const ZWII_VERSION = '10.4.02.modules';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];

22
module/gallery/gallery.php
View File

@ -324,7 +324,7 @@ class gallery extends common {
// Valeurs en sortie
$this->addOutput([
'display' => self::DISPLAY_JSON,
'content' => helper::scanSubDir(self::FILE_DIR.'source')
'content' => galleriesHelper::scanDir(self::FILE_DIR.'source')
]);
}
@ -674,3 +674,23 @@ class gallery extends common {
}
}
class galleriesHelper extends helper {
/**
* Scan le contenu d'un dossier et de ses sous-dossiers
* @param string $dir Dossier à scanner
* @return array
*/
public static function scanDir($dir) {
$dirContent = [];
$iterator = new DirectoryIterator($dir);
foreach($iterator as $fileInfos) {
if($fileInfos->isDot() === false AND $fileInfos->isDir()) {
$dirContent[] = $dir . '/' . $fileInfos->getBasename();
$dirContent = array_merge($dirContent, self::scanDir($dir . '/' . $fileInfos->getBasename()));
}
}
return $dirContent;
}
}