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/includes/acp/acp_database.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/includes/acp/acp_database.php')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 4cbbdf750b..2e75e59456 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -1212,24 +1212,28 @@ class acp_database } $dir = $phpbb_root_path . 'store/'; - $dh = opendir($dir); - while (($file = readdir($dh)) !== false) + $dh = @opendir($dir); + + if ($dh) { - if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) + while (($file = readdir($dh)) !== false) { - $supported = in_array($matches[2], $methods); - - if ($supported == 'true') + if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) { - $template->assign_block_vars('files', array( - 'FILE' => $file, - 'NAME' => gmdate("d-m-Y H:i:s", $matches[1]), - 'SUPPORTED' => $supported - )); + $supported = in_array($matches[2], $methods); + + if ($supported == 'true') + { + $template->assign_block_vars('files', array( + 'FILE' => $file, + 'NAME' => gmdate("d-m-Y H:i:s", $matches[1]), + 'SUPPORTED' => $supported + )); + } } } + closedir($dh); } - closedir($dh); $template->assign_vars(array( 'U_ACTION' => $this->u_action . '&action=submit' |