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

- fixing some bugs

Browse Source 
- 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:
Meik Sievertsen
2007-01-20 17:58:27 +00:00
parent fae887b3a1
commit 31e546c5e4
47 changed files with 253 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/convertors/functions_phpbb20.php
View File

@@ -1282,7 +1282,7 @@ function phpbb_import_avatar($user_avatar)
else if ($convert_row['user_avatar_type'] == 1)
{
// Uploaded avatar
return import_avatar($user_avatar, '');
return import_avatar($user_avatar);
}
else if ($convert_row['user_avatar_type'] == 2)
{

18
phpBB/install/index.php
View File

@@ -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))
{

8
phpBB/install/install_convert.php
View File

@@ -215,7 +215,13 @@ class install_convert extends module
$convertors = $sort = array();
$get_info = true;
$handle = opendir('./convertors/');
$handle = @opendir('./convertors/');
if (!$handle)
{
$this->error('Unable to access the convertors directory', __LINE__, __FILE__);
}
while ($entry = readdir($handle))
{
if (preg_match('/^convert_([a-z0-9_]+).' . $phpEx . '/i', $entry, $m))

8
phpBB/install/install_install.php
View File

@@ -1603,7 +1603,13 @@ class install_install extends module
{
global $db, $lang, $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)) !== false)
{
$path = $phpbb_root_path . 'language/' . $file;