X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffile_directories%2Fdirectory%2Fclass_FrameworkDirectoryPointer.php;fp=inc%2Fclasses%2Fmain%2Ffile_directories%2Fdirectory%2Fclass_FrameworkDirectoryPointer.php;h=b855a62c52e820f63f4b6806f4a3c92d22c3582a;hp=1cc296ca2a72761fd546ba2a6b5e07795dd75be9;hb=70a00fd84fd8d07e075a3479d3475e1a8f36a772;hpb=ca6e07fa5a4112a968891e3331a771fea7cebd4d diff --git a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php index 1cc296ca..b855a62c 100644 --- a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php +++ b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php @@ -128,9 +128,6 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework // Can the next entry be read? assert($this->getDirectoryIteratorInstance()->valid()); - // Default is FALSE - $currentEntry = FALSE; - // Read data from the directory pointer and return it $currentEntry = $this->getDirectoryIteratorInstance()->current(); @@ -153,6 +150,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework return $this->readRawDirectory(); } elseif (!$this->getDirectoryIteratorInstance()->valid()) { // No more left to read + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: EOD reached.'); return NULL; } @@ -167,10 +165,10 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem implements Framework if (is_object($currentEntry)) { // Get file name $rawLine = $currentEntry->getFilename(); - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: rawLine[' . gettype($rawLine) . ']=' . $rawLine); + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('DIRECTORY[' . __METHOD__ . ':' . __LINE__ . ']: rawLine[' . gettype($rawLine) . ']=' . $rawLine . ',isDot=' . intval($this->getDirectoryIteratorInstance()->isDot())); - // Is it not excluded? - if (in_array($rawLine, $except)) { + // Is it a dot-directory or excluded? + if (($this->getDirectoryIteratorInstance()->isDot()) || (in_array($rawLine, $except))) { // To next entry $this->getDirectoryIteratorInstance()->next();