From: X! <soxred93@users.mediawiki.org>
Date: Thu, 23 Dec 2010 18:20:13 +0000 (+0000)
Subject: Per discussion on mailing list, modifying some uses of opendir()/readdir()/closedir... 
X-Git-Tag: 1.31.0-rc.0~33146
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=c4bdc6f4a1c98e6b14fec19d072a90bedc39f6dd;p=lhc%2Fweb%2Fwiklou.git

Per discussion on mailing list, modifying some uses of opendir()/readdir()/closedir() to use new sfFinder class.
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 9f273f86c7..500f8e5959 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -476,7 +476,10 @@ $wgAutoloadLocalClasses = array(
 	# includes/libs
 	'IEContentAnalyzer' => 'includes/libs/IEContentAnalyzer.php',
 	'Spyc' => 'includes/libs/spyc.php',
-
+	'sfFinder' => 'includes/libs/sfFinder.php',
+	'sfGlobToRegex' => 'includes/libs/sfFinder.php',
+	'sfNumberCompare' => 'includes/libs/sfFinder.php',
+	
 	# includes/media
 	'BitmapHandler' => 'includes/media/Bitmap.php',
 	'BitmapHandler_ClientOnly' => 'includes/media/Bitmap_ClientOnly.php',
diff --git a/includes/filerepo/ForeignAPIFile.php b/includes/filerepo/ForeignAPIFile.php
index 9869188721..07b652622a 100644
--- a/includes/filerepo/ForeignAPIFile.php
+++ b/includes/filerepo/ForeignAPIFile.php
@@ -168,16 +168,9 @@ class ForeignAPIFile extends File {
 		$files = array();
 		$dir = $this->getThumbPath( $this->getName() );
 		if ( is_dir( $dir ) ) {
-			$handle = opendir( $dir );
-			if ( $handle ) {
-				while ( false !== ( $file = readdir($handle) ) ) {
-					if ( $file{0} != '.'  ) {
-						$files[] = $file;
-					}
-				}
-				closedir( $handle );
-			}
+			$files = array_map( 'basename', sfFinder::type('file')->maxdepth(0)->discard('.*')->in($dir) );
 		}
+		
 		return $files;
 	}
 	
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index 51b5ab8a09..18bcf931a1 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -599,19 +599,9 @@ class LocalFile extends File {
 		$dir = $this->getThumbPath();
 
 		if ( is_dir( $dir ) ) {
-			$handle = opendir( $dir );
-
-			if ( $handle ) {
-				while ( false !== ( $file = readdir( $handle ) ) ) {
-					if ( $file { 0 } != '.' ) {
-						$files[] = $file;
-					}
-				}
-
-				closedir( $handle );
-			}
+			$files = array_map( 'basename', sfFinder::type('file')->maxdepth(0)->discard('.*')->in($dir) );
 		}
-
+		
 		return $files;
 	}
 
diff --git a/languages/Language.php b/languages/Language.php
index c9d578bef1..702811b3e7 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -476,14 +476,14 @@ class Language {
 
 		global $IP;
 		$names = array();
-		$dir = opendir( "$IP/languages/messages" );
-		while ( false !== ( $file = readdir( $dir ) ) ) {
+		
+		foreach( sfFinder::type('file')->maxdepth(0)->in( "$IP/languages/messages" ) as $file ) {
 			$code = self::getCodeFromFileName( $file, 'Messages' );
 			if ( $code && isset( $allNames[$code] ) ) {
 				$names[$code] = $allNames[$code];
 			}
 		}
-		closedir( $dir );
+		
 		return $names;
 	}