MDL-10905 iterating properly through readdir()

moodle · Oct 15, 2007 · f60ecf6 · f60ecf6
1 parent f0af72d
commit f60ecf6
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/admin/delete.php b/admin/delete.php
@@ -54,7 +54,7 @@ function delete_subdirectories($rootdir) {
 
     $dir = opendir($rootdir);
 
-    while ($file = readdir($dir)) {
+    while (false !== ($file = readdir($dir))) {
         if ($file != '.' and $file != '..') {
             $fullfile = $rootdir .'/'. $file;
             if (filetype($fullfile) == 'dir') {

diff --git a/backup/bb/restore_bb.php b/backup/bb/restore_bb.php
@@ -9,7 +9,7 @@
 
 function get_subdirs($directory){
     $opendirectory = opendir( $directory );
-    while($filename = readdir($opendirectory)) {
+    while(false !== ($filename = readdir($opendirectory))) {
         if (is_dir($directory.$filename) and $filename != ".." and $filename != "."){
             $subdirs[] = $filename;
         }

diff --git a/backup/lib.php b/backup/lib.php
@@ -119,7 +119,7 @@ function delete_dir_contents ($dir,$excludeddir="") {
         }
 
         // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
             if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != "." && $entry != $excludeddir) {
                 $dir_subdirs[] = $dir. $slash .$entry;
             }
@@ -196,7 +196,7 @@ function list_directories ($rootdir) {
         $results = null;
 
         $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }
@@ -215,7 +215,7 @@ function list_directories_and_files ($rootdir) {
         $results = "";
 
         $dir = opendir($rootdir);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }
@@ -302,7 +302,7 @@ function backup_copy_dir($from_file,$to_file) {
             $status = check_dir_exists($to_file, true, true);
         }
         $dir = opendir($from_file);
-        while ($file=readdir($dir)) {
+        while (false !== ($file=readdir($dir))) {
             if ($file=="." || $file=="..") {
                 continue;
             }

diff --git a/mod/assignment/db/mysql.php b/mod/assignment/db/mysql.php
@@ -62,7 +62,7 @@ function assignment_upgrade($oldversion) {
         notify("Moving location of assignment files...");
 
         $basedir = opendir("$CFG->dataroot");
-        while ($dir = readdir($basedir)) {
+        while (false !== ($dir = readdir($basedir))) {
             if ($dir == "." || $dir == ".." || $dir == "users") {
                 continue;
             }

diff --git a/mod/assignment/db/postgres7.php b/mod/assignment/db/postgres7.php
@@ -60,7 +60,7 @@ function assignment_upgrade($oldversion) {
         notify("Moving location of assignment files...");
 
         $basedir = opendir("$CFG->dataroot");
-        while ($dir = readdir($basedir)) {
+        while (false !== ($dir = readdir($basedir))) {
             if ($dir == "." || $dir == ".." || $dir == "users") {
                 continue;
             }

diff --git a/mod/hotpot/lib.php b/mod/hotpot/lib.php
@@ -476,7 +476,7 @@ function hotpot_add_chain(&$hotpot) {
 
         // get list of hotpot files in this folder
         if ($dh = @opendir($xml_quiz->filepath)) {
-            while ($file = @readdir($dh)) {
+            while (false !== ($file = @readdir($dh))) {
                 if (preg_match('/\.(jbc|jcl|jcw|jmt|jmx|jqz|htm|html)$/', $file)) {
                     $hotpot->references[] = "$xml_quiz->reference/$file";
                 }

diff --git a/mod/resource/type/ims/finder.php b/mod/resource/type/ims/finder.php
@@ -30,7 +30,7 @@
 
 /// Loops though dir building a list of all relevent entries. Ignores files.
 /// Asks for deploy if admin user AND no serialized file found.
-    while (false != ($filename = readdir($repository_dir))) {
+    while (false !== ($filename = readdir($repository_dir))) {
         if ($filename != '.' && $filename != '..' && is_dir("$CFG->repository/$directory/$filename")) {
             unset($item);
             $item->type = '';

diff --git a/mod/resource/type/ims/repository_deploy.php b/mod/resource/type/ims/repository_deploy.php
@@ -68,7 +68,7 @@ function ims_deploy_folder($file, $all='') {
 
         $dirpath = "$CFG->repository/$file";
         $dir = opendir($dirpath);
-        while (false != ($filename = readdir($dir))) {
+        while (false !== ($filename = readdir($dir))) {
             if ($filename != '.' && $filename != '..') {
                 $path = $dirpath.'/'.$filename;
                 if (is_dir($path) && file_exists("$path/imsmanifest.xml")) {

diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
@@ -3189,7 +3189,7 @@ function ewiki_eventually_initialize(&$id, &$data, &$action) {
       $path=EWIKI_INIT_PAGES;
       if (!empty($path)) {
         if ($dh = @opendir($path=EWIKI_INIT_PAGES)) {
-         while ($filename = readdir($dh)) {
+         while (false !== ($filename = readdir($dh))) {
 #### MOODLE CHANGE TO SOLVE BUG #3830. Original doesn't support dots in names.
     //Orig->if (preg_match('/^(['.EWIKI_CHARS_U.']+['.EWIKI_CHARS_L.']+\w*)+/', $filename)) {
             if ($filename == clean_filename($filename) && !is_dir($path.'/'.$filename)) {

diff --git a/mod/wiki/ewiki/plugins/init.php b/mod/wiki/ewiki/plugins/init.php
@@ -79,7 +79,7 @@ function ewiki_initialization_wizard($id, &$data, &$action) {
       else {
          ewiki_database("INIT", array());
          if ($dh = @opendir($path=EWIKI_INIT_PAGES)) {
-            while ($filename = readdir($dh)) {
+            while (false !== ($filename = readdir($dh))) {
                if (preg_match('/^(['.EWIKI_CHARS_U.']+['.EWIKI_CHARS_L.']+\w*)+/', $filename)) {
                   $found = ewiki_database("FIND", array($filename));
                   if (! $found[$filename]) {

diff --git a/mod/wiki/ewiki/plugins/spages.php b/mod/wiki/ewiki/plugins/spages.php
@@ -141,7 +141,7 @@ function ewiki_init_spages($dirs, $idprep="") {
 
       #-- read in one directory
       $dh = opendir($dir);
-      while ($fn = readdir($dh)) {
+      while (false !== ($fn = readdir($dh))) {
 
          #-- skip over . and ..
          if ($fn[0] == ".") { continue; }

diff --git a/question/format/blackboard_6/format.php b/question/format/blackboard_6/format.php
@@ -57,7 +57,7 @@ function clean_temp_dir($dir='') {
         }
 
         // Loop through all directory entries, and construct two temporary arrays containing files and sub directories
-        while($entry = readdir($handle)) {
+        while(false !== ($entry = readdir($handle))) {
             if (is_dir($dir. $slash .$entry) && $entry != ".." && $entry != ".") {
                 $dir_subdirs[] = $dir. $slash .$entry;
             }

diff --git a/question/format/coursetestmanager/format.php b/question/format/coursetestmanager/format.php
@@ -427,7 +427,7 @@ function err($message, $dsn) {
     function fulldelete($location) {
         if (is_dir($location)) {
             $currdir = opendir($location);
-            while ($file = readdir($currdir)) {
+            while (false !== ($file = readdir($currdir))) {
                 if ($file <> ".." && $file <> ".") {
                     $fullfile = $location."/".$file;
                     if (is_dir($fullfile)) {