fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 20:44:28 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix UnexpectedValueException if there are permission problems deep inside a directory tree

Browse source
This commit is contained in:
Kijin Sung 2024-02-04 22:51:57 +09:00
parent 06f4eca47a
commit 178add54e8
1 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
common/framework/Storage.php
View file

@ -672,12 +672,6 @@ class Storage
try try
{ {
$iterator = new \FilesystemIterator($dirname, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS); $iterator = new \FilesystemIterator($dirname, \FilesystemIterator::CURRENT_AS_PATHNAME | \FilesystemIterator::SKIP_DOTS);
}
catch (\UnexpectedValueException $e)
{
trigger_error('Cannot read directory: ' . $dirname, \E_USER_WARNING);
return false;
}
$result = array(); $result = array();
foreach ($iterator as $fileinfo) foreach ($iterator as $fileinfo)
@ -691,6 +685,13 @@ class Storage
} }
} }
} }
}
catch (\UnexpectedValueException $e)
{
trigger_error($e->getMessage(), \E_USER_WARNING);
return false;
}
sort($result); sort($result);
return $result; return $result;
} }
@ -720,6 +721,9 @@ class Storage
$rdi_options = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS; $rdi_options = \FilesystemIterator::KEY_AS_PATHNAME | \FilesystemIterator::CURRENT_AS_FILEINFO | \FilesystemIterator::SKIP_DOTS;
$rii_options = \RecursiveIteratorIterator::CHILD_FIRST; $rii_options = \RecursiveIteratorIterator::CHILD_FIRST;
try
{
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($source, $rdi_options), $rii_options); $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($source, $rdi_options), $rii_options);
foreach ($iterator as $path) foreach ($iterator as $path)
@ -752,6 +756,12 @@ class Storage
} }
} }
} }
}
catch (\UnexpectedValueException $e)
{
trigger_error($e->getMessage(), \E_USER_WARNING);
return false;
}
return true; return true;
} }