makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12589] Search directly in $directory if it's an absolute sub-path

Browse source 
PHPBB3-12589
This commit is contained in:
Tristan Darricau 2014-05-24 17:57:01 +02:00
parent 42bc2612c4
commit f7896f46a5
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/phpbb/extension/finder.php
View file

@ -463,6 +463,7 @@ class finder
} }
else if ($directory && $directory[0] === '/') else if ($directory && $directory[0] === '/')
{ {
$path .= substr($directory, 1);
$directory_pattern = '^' . preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#'); $directory_pattern = '^' . preg_quote(str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR, '#');
} }
else else
@ -494,7 +495,11 @@ class finder
if ($is_dir) if ($is_dir)
{ {
$relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($filename) . DIRECTORY_SEPARATOR; $relative_path = $iterator->getInnerIterator()->getSubPath() . DIRECTORY_SEPARATOR . basename($filename) . DIRECTORY_SEPARATOR;
if ($relative_path[0] !== DIRECTORY_SEPARATOR) if ($directory && $directory[0] === '/')
{
$relative_path = str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR . $relative_path;
}
else if ($relative_path[0] !== DIRECTORY_SEPARATOR)
{ {
$relative_path = DIRECTORY_SEPARATOR . $relative_path; $relative_path = DIRECTORY_SEPARATOR . $relative_path;
} }
@ -502,6 +507,14 @@ class finder
else else
{ {
$relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname(); $relative_path = DIRECTORY_SEPARATOR . $iterator->getInnerIterator()->getSubPathname();
if ($directory && $directory[0] === '/')
{
$relative_path = str_replace('/', DIRECTORY_SEPARATOR, $directory) . DIRECTORY_SEPARATOR . $relative_path;
}
else
{
$relative_path = DIRECTORY_SEPARATOR . $relative_path;
}
} }
if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) && if ((!$suffix || substr($relative_path, -strlen($suffix)) === $suffix) &&