3 files changed, 16 insertions, 12 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index 97864d0e27..537c0425a2 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -89,15 +89,17 @@ class acp_icons
 			}
 			unset($imglist);
 
-			$dir = @opendir($phpbb_root_path . $img_path);
-			while (($file = @readdir($dir)) !== false)
+			if ($dir = @opendir($phpbb_root_path . $img_path))
 			{
-				if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file))
+				while (($file = readdir($dir)) !== false)
 				{
-					$_paks[] = $file;
+					if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file))
+					{
+						$_paks[] = $file;
+					}
 				}
+				closedir($dir);
 			}
-			@closedir($dir);
 		}
 
 		// What shall we do today? Oops, I believe that's trademarked ...
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 06385fd97b..74369d2d92 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -322,7 +322,7 @@ class acp_main
 					$avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file);
 				}
 			}
-			@closedir($avatar_dir);
+			closedir($avatar_dir);
 
 			// This bit of code translates the avatar directory size into human readable format
 			// Borrowed the code from the PHP.net annoted manual, origanally written by:
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index f4f7f8e56b..31e99a6b0c 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -637,7 +637,7 @@ parse_css_file = {PARSE_CSS_FILE}
 					}
 				}
 			}
-			@closedir($dp);
+			closedir($dp);
 		}
 
 		unset($installed);
@@ -1860,15 +1860,17 @@ parse_css_file = {PARSE_CSS_FILE}
 
 				$imageset_root = "{$phpbb_root_path}styles/{$style_row['imageset_path']}/imageset/";
 
-				$dh = @opendir($imageset_root);
-				while (($fname = readdir($dh)) !== false)
+				if ($dh = @opendir($imageset_root))
 				{
-					if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname"))
+					while (($fname = readdir($dh)) !== false)
 					{
-						$files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg';
+						if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname"))
+						{
+							$files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg';
+						}
 					}
+					closedir($dh);
 				}
-				@closedir($dh);
 
 				$imageset_lang = array();