X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FimportImages.inc;h=5ae6d6bec824c0664a3ebf0e755d7bc27da49282;hb=d8cb9695c6971975692808bb7cdc991e2abda0ab;hp=5eb68f20b3cf8ae67f9df154bbe7166e955f715b;hpb=10e91851b2568267e5ccb7bbd0ab24ec4f2a195a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.inc b/maintenance/importImages.inc
index 5eb68f20b3..5ae6d6bec8 100644
--- a/maintenance/importImages.inc
+++ b/maintenance/importImages.inc
@@ -1,6 +1,6 @@
 <?php
 /**
- * Support functions for the importImages script
+ * Support functions for the importImages.php script
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,9 +28,10 @@
  *
  * @param $dir string Path to directory to search
  * @param $exts Array of extensions to search for
+ * @param $recurse Bool Search subdirectories recursively
  * @return mixed Array of filenames on success, or false on failure
  */
-function findFiles( $dir, $exts ) {
+function findFiles( $dir, $exts, $recurse = false ) {
 	if ( is_dir( $dir ) ) {
 		$dhl = opendir( $dir );
 		if ( $dhl ) {
@@ -38,8 +39,11 @@ function findFiles( $dir, $exts ) {
 			while ( ( $file = readdir( $dhl ) ) !== false ) {
 				if ( is_file( $dir . '/' . $file ) ) {
 					list( /* $name */, $ext ) = splitFilename( $dir . '/' . $file );
-					if ( array_search( strtolower( $ext ), $exts ) !== false )
+					if ( array_search( strtolower( $ext ), $exts ) !== false ) {
 						$files[] = $dir . '/' . $file;
+					}
+				} elseif ( $recurse && is_dir( $dir . '/' . $file ) && $file !== '..' && $file !== '.' ) {
+					$files = array_merge( $files, findFiles( $dir . '/' . $file, $exts, true ) );
 				}
 			}
 			return $files;
@@ -95,7 +99,9 @@ function findAuxFile( $file, $auxExtension, $maxStrip = 1 ) {
 		}
 
 		$idx = strrpos( $n, '.' );
-		if ( !$idx ) break;
+		if ( !$idx ) {
+			break;
+		}
 
 		$n = substr( $n, 0, $idx );
 		$maxStrip -= 1;