mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-29 21:10:31 +02:00
- fixing some bugs
- removing utf8 characters from email files (has been discussed internally, you guys know why) - making sure some opendir calls are checked before calling readdir. git-svn-id: file:///svn/phpbb/trunk@6912 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -345,7 +345,13 @@ function filelist($rootdir, $dir = '', $type = 'gif|jpg|jpeg|png')
|
||||
return false;
|
||||
}
|
||||
|
||||
$dh = opendir($rootdir . $dir);
|
||||
$dh = @opendir($rootdir . $dir);
|
||||
|
||||
if (!$dh)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
while (($fname = readdir($dh)) !== false)
|
||||
{
|
||||
if (is_file("$rootdir$dir$fname"))
|
||||
@@ -2677,9 +2683,9 @@ function add_permission_language()
|
||||
// Now search in acp and mods folder for permissions_ files.
|
||||
foreach (array('acp/', 'mods/') as $path)
|
||||
{
|
||||
$dh = opendir($user->lang_path . $path);
|
||||
$dh = @opendir($user->lang_path . $path);
|
||||
|
||||
if ($dh !== false)
|
||||
if ($dh)
|
||||
{
|
||||
while (($file = readdir($dh)) !== false)
|
||||
{
|
||||
|
Reference in New Issue
Block a user