X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fio%2Fclass_FrameworkDirectoryPointer.php;h=ba9b58c24945b44cb914d2a5cd55c45e94ebc336;hp=782d51f39b65bdd0f840b8c2d11793364014e6ae;hb=178bf871182d5e4b5f02378674a0f9504db555c8;hpb=4b88c118b615335d06bd74e444173d21aef4406c

diff --git a/inc/classes/main/io/class_FrameworkDirectoryPointer.php b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
index 782d51f3..ba9b58c2 100644
--- a/inc/classes/main/io/class_FrameworkDirectoryPointer.php
+++ b/inc/classes/main/io/class_FrameworkDirectoryPointer.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -30,7 +30,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	/**
 	 * The directory pointer
 	 */
-	private $dirPointer = null;
+	private $dirPointer = NULL;
 
 	/**
 	 * Protected constructor
@@ -79,28 +79,28 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		if (is_null($pathName)) {
 			// No pathname given
 			if ($inConstructor) {
-				return null;
+				return NULL;
 			} else {
 				throw new PathIsEmptyException(null, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
 			}
 		} elseif (!is_string($pathName)) {
 			// Is not a string
 			if ($inConstructor) {
-				return null;
+				return NULL;
 			} else {
 				throw new InvalidPathStringException(null, self::EXCEPTION_INVALID_STRING);
 			}
 		} elseif (!is_dir($pathName)) {
 			// Not a directory
 			if ($inConstructor) {
-				return null;
+				return NULL;
 			} else {
 				throw new PathIsNoDirectoryException($pathName, self::EXCEPTION_INVALID_PATH_NAME);
 			}
 		} elseif (!is_readable($pathName)) {
 			// Not readable
 			if ($inConstructor) {
-				return null;
+				return NULL;
 			} else {
 				throw new PathReadProtectedException($pathName, self::EXCEPTION_READ_PROTECED_PATH);
 			}
@@ -111,7 +111,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 		if (!is_resource($dirPointer)) {
 			// Something bad happend
 			if ($inConstructor) {
-				return null;
+				return NULL;
 			} else {
 				throw new DirPointerNotOpenedException($pathName, self::EXCEPTION_DIR_POINTER_INVALID);
 			}
@@ -148,26 +148,29 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	 * @return	string	Directory and/or file names read from the current
 	 *					directory pointer
 	 */
-	public function readDirectoryExcept ($except = '') {
-		if ((empty($except)) || (!is_array($except)) || (count($except) == 0)) {
+	public function readDirectoryExcept (array $except = array()) {
+		if (count($except) == 0) {
 			// No exception given, so read all data
 			return $this->readRawDirectory();
-		}
+		} // END - if
 
 		// Read a raw line...
 		$rawLine = $this->readRawDirectory();
 
 		// Shall we exclude directories?
-		if ((!is_null($rawLine)) && ($rawLine !== false) && (in_array($rawLine, $except))) {
-			// Exclude this part
-			return $this->readDirectoryExcept($except);
-		} elseif ((!is_null($rawLine)) && ($rawLine !== false)) {
+		if ((!is_null($rawLine)) && ($rawLine !== false) && (!in_array($rawLine, $except))) {
 			// Return read data
+			//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawLine[' . gettype($rawLine) . ']=' . $rawLine);
 			return $rawLine;
+		} elseif ((!is_null($rawLine)) && ($rawLine !== false)) {
+			// Exclude this part
+			//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: rawline[' . gettype($rawLine) . ']=' . $rawLine . ' - Recursive call!');
+			return $this->readDirectoryExcept($except);
 		}
 
 		// End pointer reached
-		return null;
+		//* NOISY-DEBUG: */ $this->debugOutput('DIRECTORY: Returning NULL!');
+		return NULL;
 	}
 
 	/**
@@ -179,7 +182,7 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem {
 	public function closeDirectory () {
 		// Close the directory pointer and reset the instance variable
 		@closedir($this->getPointer());
-		$this->setPointer(null);
+		$this->setPointer(NULL);
 		$this->setPathName('');
 	}