Merge pull request ampache#649 from brownl/develop

Loop over directories the "correct" way
nan4k7 · Jan 3, 2015 · ab8ce35 · ab8ce35
2 parents 0ee3d5d + 4476479
commit ab8ce35
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/lib/class/art.class.php b/lib/class/art.class.php
@@ -1031,7 +1031,7 @@ public function gather_folder($limit = 5)
             $processed[$dir] = true;
 
             // Recurse through this dir and create the files array
-            while ($file = readdir($handle)) {
+            while (false !== ($file = readdir($handle))) {
                 $extension = pathinfo($file);
                 $extension = $extension['extension'];
 

diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
@@ -293,7 +293,7 @@ public static function get_catalog_types()
 
         $results = array();
 
-        while ($file = readdir($handle)) {
+        while (false !== ($file = readdir($handle))) {
 
             if (substr($file, -11, 11) != 'catalog.php') { continue; }
 

diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
@@ -150,7 +150,7 @@ public static function get_controllers()
 
         $results = array();
 
-        while ($file = readdir($handle)) {
+        while (false !== ($file = readdir($handle))) {
 
             if (substr($file,-14,14) != 'controller.php') { continue; }
 

diff --git a/lib/class/plugin.class.php b/lib/class/plugin.class.php
@@ -88,7 +88,7 @@ public static function get_plugins($type='')
         }
 
         // Recurse the directory
-        while ($file = readdir($handle)) {
+        while (false !== ($file = readdir($handle))) {
             // Ignore non-plugin files
             if (substr($file,-10,10) != 'plugin.php') { continue; }
             if (is_dir($file)) { continue; }

diff --git a/lib/general.lib.php b/lib/general.lib.php
@@ -166,7 +166,7 @@ function get_languages()
     /* Prepend English */
     $results['en_US'] = 'English (US)';
 
-    while ($file = readdir($handle)) {
+    while (false !== ($file = readdir($handle))) {
 
         $full_file = AmpConfig::get('prefix') . '/locale/' . $file;
 

diff --git a/modules/Auth/OpenID/FileStore.php b/modules/Auth/OpenID/FileStore.php
@@ -482,7 +482,7 @@ function _rmtree($dir)
         }
 
         if ($handle = opendir($dir)) {
-            while ($item = readdir($handle)) {
+            while (false !== ($item = readdir($handle))) {
                 if (!in_array($item, array('.', '..'))) {
                     if (is_dir($dir . $item)) {
 

diff --git a/modules/captcha/captcha.php b/modules/captcha/captcha.php
@@ -394,7 +394,7 @@ function straighten_temp_dir() {
       // clean up old files
       if ((rand(0,100) <= 5) && ($dh = opendir($dir))) {
          $t_kill = time() - CAPTCHA_TIMEOUT * 1.2;
-         while($fn = readdir($dh)) if ($fn[0] != ".") {
+         while(false !== ($fn = readdir($dh))) if ($fn[0] != ".") {
             if (filemtime("$dir/$fn") < $t_kill) {
                @unlink("$dir/$fn");
             }
@@ -1258,4 +1258,4 @@ function canonical_path($url) {
 
 
 
-?>
+?>