X-Git-Url: http://git.onelab.eu/?p=www-register-wizard.git;a=blobdiff_plain;f=helpers%2Fdirectory_helper.php;h=a6fb7841e680bfbd41c9df0c3e26ee759ced8ccc;hp=be365909b849eb8d09eb9774b5d907770f4cffb5;hb=47598daa8c32dbbd72db83dc33f2ce91b3f6f7b0;hpb=4afb2fe256f094a1caf6bff14f51c6a88938cc9f

diff --git a/helpers/directory_helper.php b/helpers/directory_helper.php
index be36590..a6fb784 100644
--- a/helpers/directory_helper.php
+++ b/helpers/directory_helper.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
@@ -41,7 +41,7 @@
  */	
 if ( ! function_exists('directory_map'))
 {
-	function directory_map($source_dir, $top_level_only = FALSE)
+	function directory_map($source_dir, $top_level_only = FALSE, $hidden = FALSE)
 	{	
 		if ($fp = @opendir($source_dir))
 		{
@@ -50,7 +50,7 @@ if ( ! function_exists('directory_map'))
 			
 			while (FALSE !== ($file = readdir($fp)))
 			{
-				if (strncmp($file, '.', 1) == 0)
+				if (($hidden == FALSE && strncmp($file, '.', 1) == 0) OR ($file == '.' OR $file == '..'))
 				{
 					continue;
 				}
@@ -59,7 +59,7 @@ if ( ! function_exists('directory_map'))
 				{
 					$temp_array = array();
 				
-					$temp_array = directory_map($source_dir.$file.DIRECTORY_SEPARATOR);
+					$temp_array = directory_map($source_dir.$file.DIRECTORY_SEPARATOR, $top_level_only, $hidden);
 				
 					$filedata[$file] = $temp_array;
 				}
@@ -72,6 +72,10 @@ if ( ! function_exists('directory_map'))
 			closedir($fp);
 			return $filedata;
 		}
+		else
+		{
+			return FALSE;
+		}
 	}
 }