diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-20 17:58:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-20 17:58:27 +0000 |
| commit | 31e546c5e4ecd012ef9d93fa68f42c793e417303 (patch) | |
| tree | 205934c32a9aff1bf4369b1f157d5d55abc1f3f6 /phpBB/install/index.php | |
| parent | fae887b3a106fef9fb5828f636402d5323ba300d (diff) | |
| download | forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.gz forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.bz2 forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.tar.xz forums-31e546c5e4ecd012ef9d93fa68f42c793e417303.zip | |
- 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
Diffstat (limited to 'phpBB/install/index.php')
| -rwxr-xr-x | phpBB/install/index.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 24ae6c16a3..b02fc5d973 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -147,7 +147,14 @@ 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'); + + if (!$dir) + { + die('Unable to access the language directory'); + exit; + } + while (($file = readdir($dir)) !== false) { $path = $phpbb_root_path . 'language/' . $file; @@ -221,7 +228,7 @@ class module $module = array(); // Grab module information using Bart's "neat-o-module" system (tm) - $dir = opendir('.'); + $dir = @opendir('.'); if (!$dir) { @@ -654,7 +661,12 @@ class module { global $phpbb_root_path, $phpEx; - $dir = opendir($phpbb_root_path . 'language'); + $dir = @opendir($phpbb_root_path . 'language'); + + if (!$dir) + { + $this->error('Unable to access the language directory', __LINE__, __FILE__); + } while ($file = readdir($dir)) { |