mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 13:28:55 +00:00
some opendir/closedir fixes
git-svn-id: file:///svn/phpbb/trunk@6908 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
2c4a82fdd3
commit
84c3a073df
2 changed files with 13 additions and 6 deletions
|
@ -147,7 +147,7 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !$language)
|
|||
// dir, this may or may not be English
|
||||
if (!$language)
|
||||
{
|
||||
$dir = @opendir($phpbb_root_path . 'language');
|
||||
$dir = opendir($phpbb_root_path . 'language');
|
||||
while (($file = readdir($dir)) !== false)
|
||||
{
|
||||
$path = $phpbb_root_path . 'language/' . $file;
|
||||
|
@ -158,6 +158,7 @@ if (!$language)
|
|||
break;
|
||||
}
|
||||
}
|
||||
closedir($dir);
|
||||
}
|
||||
|
||||
// And finally, load the relevant language files
|
||||
|
@ -220,7 +221,12 @@ class module
|
|||
$module = array();
|
||||
|
||||
// Grab module information using Bart's "neat-o-module" system (tm)
|
||||
$dir = @opendir('.');
|
||||
$dir = opendir('.');
|
||||
|
||||
if (!$dir)
|
||||
{
|
||||
$this->error('Unable to access the installation directory', __LINE__, __FILE__);
|
||||
}
|
||||
|
||||
$setmodules = 1;
|
||||
while (($file = readdir($dir)) !== false)
|
||||
|
@ -230,7 +236,7 @@ class module
|
|||
include($file);
|
||||
}
|
||||
}
|
||||
@closedir($dir);
|
||||
closedir($dir);
|
||||
|
||||
unset($setmodules);
|
||||
|
||||
|
@ -648,7 +654,7 @@ class module
|
|||
{
|
||||
global $phpbb_root_path, $phpEx;
|
||||
|
||||
$dir = @opendir($phpbb_root_path . 'language');
|
||||
$dir = opendir($phpbb_root_path . 'language');
|
||||
|
||||
while ($file = readdir($dir))
|
||||
{
|
||||
|
@ -665,7 +671,7 @@ class module
|
|||
$lang[$localname] = $file;
|
||||
}
|
||||
}
|
||||
@closedir($dir);
|
||||
closedir($dir);
|
||||
|
||||
@asort($lang);
|
||||
@reset($lang);
|
||||
|
|
|
@ -1603,7 +1603,7 @@ class install_install extends module
|
|||
{
|
||||
global $db, $lang, $phpbb_root_path, $phpEx;
|
||||
|
||||
$dir = @opendir($phpbb_root_path . 'language');
|
||||
$dir = opendir($phpbb_root_path . 'language');
|
||||
while (($file = readdir($dir)) !== false)
|
||||
{
|
||||
$path = $phpbb_root_path . 'language/' . $file;
|
||||
|
@ -1629,6 +1629,7 @@ class install_install extends module
|
|||
}
|
||||
}
|
||||
}
|
||||
closedir($dir);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue