Fixes issues with complex background rules containing extra information after the...

[lhc/web/wiklou.git] / maintenance / importImages.inc

diff --git a/maintenance/importImages.inc b/maintenance/importImages.inc
index 7bb50eb..29a7fbc 100644 (file)
--- a/maintenance/importImages.inc
+++ b/maintenance/importImages.inc
@@ -17,13 +17,13 @@
  * @return mixed Array of filenames on success, or false on failure
  */
 function findFiles( $dir, $exts ) {
-       if( is_dir( $dir ) ) {
-               if( $dhl = opendir( $dir ) ) {
+       if ( is_dir( $dir ) ) {
+               if ( $dhl = opendir( $dir ) ) {
                        $files = array();
-                       while( ( $file = readdir( $dhl ) ) !== false ) {
-                               if( is_file( $dir . '/' . $file ) ) {
+                       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;
                                }
                        }
@@ -90,20 +90,20 @@ function findAuxFile( $file, $auxExtension, $maxStrip = 1 ) {
 }
 
 # FIXME: Access the api in a saner way and performing just one query (preferably batching files too).
-function getFileCommentFromSourceWiki($wiki_host, $file) {
+function getFileCommentFromSourceWiki( $wiki_host, $file ) {
     $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=comment';
-    $body = Http::get($url);
-    if (preg_match('#<ii comment="([^"]*)" />#', $body, $matches) == 0) {
+    $body = Http::get( $url );
+    if ( preg_match( '#<ii comment="([^"]*)" />#', $body, $matches ) == 0 ) {
         return false;
     }
 
     return html_entity_decode( $matches[1] );
 }
 
-function getFileUserFromSourceWiki($wiki_host, $file) {
+function getFileUserFromSourceWiki( $wiki_host, $file ) {
     $url = $wiki_host . '/api.php?action=query&format=xml&titles=File:' . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=user';
-    $body = Http::get($url);
-    if (preg_match('#<ii user="([^"]*)" />#', $body, $matches) == 0) {
+    $body = Http::get( $url );
+    if ( preg_match( '#<ii user="([^"]*)" />#', $body, $matches ) == 0 ) {
         return false;
     }