Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103 from marc1706/develop-2.1.x

Browse Source 
Use flag SKIP_DOTS for RecursiveDirectoryIterator
This commit is contained in:
Marc Alexander
2012-12-19 15:05:52 -08:00
parent 96e0180f6e 6422c7925b
commit 2c2c0ad9ee
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
root/portal/includes/functions_upload.php
View File

@@ -105,7 +105,7 @@ class portal_upload
// Now we need to get the files inside the folders // Now we need to get the files inside the folders
//$folder_contents = $this->cut_folder(scandir($mod_dir)); //$folder_contents = $this->cut_folder(scandir($mod_dir));
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($mod_dir)); // requires PHP 5 $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($mod_dir, FilesystemIterator::SKIP_DOTS)); // requires PHP 5
foreach($iterator as $cur_file) foreach($iterator as $cur_file)
{ {
@@ -114,16 +114,6 @@ class portal_upload
$cur_path = str_replace($mod_dir . '/', '', $cur_path); $cur_path = str_replace($mod_dir . '/', '', $cur_path);
$cut_pos = strpos($cur_path, '/'); $cut_pos = strpos($cur_path, '/');
/*
* We only copy files. The recursive iterator might grab paths depending on
* the PHP version. This will trigger our error handle with trigger_error()
* though. If we are trying to copy a directory just move on.
*/
if (is_dir($cur_path))
{
continue;
}
// Only allow files in adm, language, portal and styles folder and a license.txt // Only allow files in adm, language, portal and styles folder and a license.txt
if(!in_array(substr($cur_path, 0, $cut_pos), array('adm', 'language', 'portal', 'styles')) && $cur_file->getFilename() != 'license.txt') if(!in_array(substr($cur_path, 0, $cut_pos), array('adm', 'language', 'portal', 'styles')) && $cur_file->getFilename() != 'license.txt')
{ {