mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

make sure we always check for a valid directory handle

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8211 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-10-21 11:26:24 +00:00
parent 1006e76733
commit 19d3483c38
6 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_icons.php
View File

@@ -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 ...

2
phpBB/includes/acp/acp_main.php
View File

@@ -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:

14
phpBB/includes/acp/acp_styles.php
View File

@@ -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();