penguin/utils

commit 10c48da98aeecf08bac94388775f17f5e6691f27

commit 10c48da98aeecf08bac94388775f17f5e6691f27
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date:   2014-01-24T05:48:13Z

    Fix recursive issue ( -r flag )
---
 php/regRename.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/php/regRename.php b/php/regRename.php
index cc0f33c..5712a78 100644
--- a/php/regRename.php
+++ b/php/regRename.php
@@ -49,16 +49,14 @@ function getFileList ( $dir ) {
 }
 
 function getDirList ( $dir ) {
-	$dirList = array();
-	$iterator = new DirectoryIterator ( getDirName ( $dir )  ) ;
+    $dirList = array();
+    $iterator = new DirectoryIterator ( getDirName ( $dir )  ) ;
 	foreach ( $iterator as $fileinfo ) {
-			if ( $fileinfo->isDir() ) {
+			if ( $fileinfo->isDir() && !$fileinfo->isDot()) {
 					$dirList[] = $fileinfo->getFilename();
 			}
-	}
-	//Chop dir "." and ".."
-	array_shift ( $dirList ) ;
-	array_shift ( $dirList ) ;
+    }
+
 	return $dirList;
 }
 
@@ -206,7 +204,7 @@ foreach ( $searchDirs as $dir ) {
 		}
 		if( $matches[2][0] != $newName ) {
 			if( $test ) {
-				echo "File \"{$matches[2][0]}\" will renamed to \"$newName\"\n";
+				echo "File \"{$matches[2][0]}\" will be renamed to \"$newName\"\n";
 			} else {
 				rename ( $file, "{$matches[1][0]}$newName" );
 			}
@@ -225,4 +223,4 @@ if ( $test ) echo "*** Test enabled ***\n\n";
 
 
 //------- End Operations -------*/
-?>
\ No newline at end of file
+?>