Commit: ae843f94ad43ceff88dd5402b1d1c9471507bf72 - pukiwiki_auth (git)

Commit MetaInfo

• Revision: ae843f94ad43ceff88dd5402b1d1c9471507bf72 (tree)
• Time: 2014-11-30 13:00:19
• Author: henoheno <henoheno>
• Commiter: umorigu

Log Message

BugTrack2/236: Care for readdir() returns FALSE

Change Summary

• modified: plugin/rename.inc.php

Incremental Difference

--- a/plugin/rename.inc.php
+++ b/plugin/rename.inc.php
@@ -307,21 +307,20 @@ function plugin_rename_get_files($pages)
 	$matches = array();
 	foreach ($dirs as $path) {
 		$dir = opendir($path);
-		if (! $dir) continue;
-
-		while ($file = readdir($dir)) {
+		if (! $dir) continue;	// TODO: !== FALSE or die()?
+		while (($file = readdir($dir)) !== FALSE) {
 			if ($file == '.' || $file == '..') continue;
-
-			foreach ($pages as $from=>$to) {
+			foreach ($pages as $from => $to) {
+				// TODO: preg_quote()?
 				$pattern = '/^' . str_replace('/', '\/', $from) . '([._].+)$/';
-				if (! preg_match($pattern, $file, $matches))
-					continue;
-
-				$newfile = $to . $matches[1];
-				$files[$from][$path . $file] = $path . $newfile;
+				if (preg_match($pattern, $file, $matches)) {
+					$newfile = $to . $matches[1];
+					$files[$from][$path . $file] = $path . $newfile;
+				}
 			}
 		}
 	}
+
 	return $files;
 }