forked from ZwiiCMS-Team/ZwiiCMS
scanSubDir and check empty folder
This commit is contained in:
parent
c648d328d6
commit
3f68897639
@ -137,6 +137,8 @@ class helper {
|
||||
public static function getModules() {
|
||||
$dirs = array_diff(scandir('module'), array('..', '.'));
|
||||
foreach ($dirs as $key => $value) {
|
||||
// Dossier non vide
|
||||
if (file_exists('module/' . $value . '/' . $value . '.php')) {
|
||||
// Lire les constantes
|
||||
$class_reflex = new \ReflectionClass($value);
|
||||
$class_constants = $class_reflex->getConstants();
|
||||
@ -158,10 +160,29 @@ class helper {
|
||||
'version' => $version
|
||||
];
|
||||
}
|
||||
}
|
||||
return($modules);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Scanne le contenu d'un dossier et de ses sous-dossiers
|
||||
* @param string $dir Dossier à scanner
|
||||
* @return array
|
||||
*/
|
||||
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
|
||||
* @return bool
|
||||
|
@ -324,7 +324,7 @@ class gallery extends common {
|
||||
// Valeurs en sortie
|
||||
$this->addOutput([
|
||||
'display' => self::DISPLAY_JSON,
|
||||
'content' => galleriesHelper::scanDir(self::FILE_DIR.'source')
|
||||
'content' => helper::scanSubDir(self::FILE_DIR.'source')
|
||||
]);
|
||||
}
|
||||
|
||||
@ -674,23 +674,3 @@ 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;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user