mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-16 04:19:41 +02:00
Code Issues Releases Wiki Activity

[ticket/15171] Update logic

Browse Source 
PHPBB3-15171
This commit is contained in:
Rubén Calvo 2018-02-08 09:20:57 +01:00
parent 7a4dd368b5
commit 837a333ef2
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
phpBB/phpbb/storage/adapter/local.php
View File

@ -107,7 +107,7 @@ class local implements adapter_interface, stream_interface
try try
{ {
$this->filesystem->dump_file($this->root_path . $this->get_subfolder($path) . $path, $content); $this->filesystem->dump_file($this->root_path . $this->get_filepath($path), $content);
} }
catch (filesystem_exception $e) catch (filesystem_exception $e)
{ {
@ -125,7 +125,7 @@ class local implements adapter_interface, stream_interface
throw new exception('STORAGE_FILE_NO_EXIST', $path); throw new exception('STORAGE_FILE_NO_EXIST', $path);
} }
$content = @file_get_contents($this->root_path . $this->get_subfolder($path) . $path); $content = @file_get_contents($this->root_path . $this->get_filepath($path));
if ($content === false) if ($content === false)
{ {
@ -140,7 +140,7 @@ class local implements adapter_interface, stream_interface
*/ */
public function exists($path) public function exists($path)
{ {
return $this->filesystem->exists($this->root_path . $this->get_subfolder($path) . $path); return $this->filesystem->exists($this->root_path . $this->get_filepath($path));
} }
/** /**
@ -150,7 +150,7 @@ class local implements adapter_interface, stream_interface
{ {
try try
{ {
$this->filesystem->remove($this->root_path . $this->get_subfolder($path) . $path); $this->filesystem->remove($this->root_path . $this->get_filepath($path));
} }
catch (filesystem_exception $e) catch (filesystem_exception $e)
{ {
@ -169,7 +169,7 @@ class local implements adapter_interface, stream_interface
try try
{ {
$this->filesystem->rename($this->root_path . $this->get_subfolder($path) . $path_orig, $this->root_path . $this->get_subfolder($path) . $path_dest, false); $this->filesystem->rename($this->root_path . $this->get_filepath($path_orig), $this->root_path . $this->get_filepath($path_dest), false);
} }
catch (filesystem_exception $e) catch (filesystem_exception $e)
{ {
@ -188,7 +188,7 @@ class local implements adapter_interface, stream_interface
try try
{ {
$this->filesystem->copy($this->root_path . $this->get_subfolder($path) . $path_orig, $this->root_path . $this->get_subfolder($path) . $path_dest, false); $this->filesystem->copy($this->root_path . $this->get_filepath($path_orig), $this->root_path . $this->get_filepath($path_dest), false);
} }
catch (filesystem_exception $e) catch (filesystem_exception $e)
{ {
@ -222,7 +222,7 @@ class local implements adapter_interface, stream_interface
*/ */
protected function ensure_directory_exists($path) protected function ensure_directory_exists($path)
{ {
$path = dirname($this->root_path . $this->get_subfolder($path) . $path); $path = dirname($this->root_path . $this->get_filepath($path));
$path = filesystem_helper::make_path_relative($path, $this->root_path); $path = filesystem_helper::make_path_relative($path, $this->root_path);
if (!$this->exists($path)) if (!$this->exists($path))
@ -238,8 +238,9 @@ class local implements adapter_interface, stream_interface
*/ */
protected function remove_empty_dirs($path) protected function remove_empty_dirs($path)
{ {
$path = dirname($this->root_path . $this->get_subfolder($path) . $path); $dirpath = dirname($this->root_path . $path);
$path = filesystem_helper::make_path_relative($path, $this->root_path); $filepath = dirname($this->root_path . $this->get_filepath($path));
$path = filesystem_helper::make_path_relative($filepath, $dirpath);
do do
{ {
@ -247,17 +248,29 @@ class local implements adapter_interface, stream_interface
$parts = array_slice($parts, 0, -1); $parts = array_slice($parts, 0, -1);
$path = implode(DIRECTORY_SEPARATOR, $parts); $path = implode(DIRECTORY_SEPARATOR, $parts);
} }
while (@rmdir($this->root_path . $path)); while ($path && @rmdir($dirpath . $path));
} }
protected function get_subfolder($path) protected function get_filepath($path)
{ {
$hash = md5($path); $pathinfo = pathinfo($path);
$dirname = $pathinfo['dirname'];
$filename = $pathinfo['basename'];
$hash = md5($filename);
$parts = str_split($hash, 2); $parts = str_split($hash, 2);
$parts = array_slice($parts, 0, $this->dir_depth); $parts = array_slice($parts, 0, $this->dir_depth);
return (!empty($parts)) ? implode(DIRECTORY_SEPARATOR, $parts) . DIRECTORY_SEPARATOR : ''; // Create path
$path = $dirname . DIRECTORY_SEPARATOR;
if (!empty($parts))
{
$path .= implode(DIRECTORY_SEPARATOR, $parts) . DIRECTORY_SEPARATOR;
}
return $path . $filename;
} }
/** /**
@ -265,7 +278,7 @@ class local implements adapter_interface, stream_interface
*/ */
public function read_stream($path) public function read_stream($path)
{ {
$stream = @fopen($this->root_path . $this->get_subfolder($path) . $path, 'rb'); $stream = @fopen($this->root_path . $this->get_filepath($path), 'rb');
if (!$stream) if (!$stream)
{ {
@ -287,7 +300,7 @@ class local implements adapter_interface, stream_interface
throw new exception('STORAGE_FILE_EXISTS', $path); throw new exception('STORAGE_FILE_EXISTS', $path);
} }
$stream = @fopen($this->root_path . $this->get_subfolder($path) . $path, 'w+b'); $stream = @fopen($this->root_path . $this->get_filepath($path), 'w+b');
if (!$stream) if (!$stream)
{ {
@ -312,7 +325,7 @@ class local implements adapter_interface, stream_interface
*/ */
public function file_size($path) public function file_size($path)
{ {
$size = filesize($this->root_path . $this->get_subfolder($path) . $path); $size = filesize($this->root_path . $this->get_filepath($path));
if ($size === null) if ($size === null)
{ {
@ -331,7 +344,7 @@ class local implements adapter_interface, stream_interface
*/ */
public function file_mimetype($path) public function file_mimetype($path)
{ {
return ['mimetype' => $this->mimetype_guesser->guess($this->root_path . $this->get_subfolder($path) . $path)]; return ['mimetype' => $this->mimetype_guesser->guess($this->root_path . $this->get_filepath($path))];
} }
/** /**
@ -343,12 +356,12 @@ class local implements adapter_interface, stream_interface
*/ */
protected function image_dimensions($path) protected function image_dimensions($path)
{ {
$size = $this->imagesize->getImageSize($this->root_path . $this->get_subfolder($path) . $path); $size = $this->imagesize->getImageSize($this->root_path . $this->get_filepath($path));
// For not supported types like swf // For not supported types like swf
if ($size === false) if ($size === false)
{ {
$imsize = getimagesize($this->root_path . $this->get_subfolder($path) . $path); $imsize = getimagesize($this->root_path . $this->get_filepath($path));
$size = ['width' => $imsize[0], 'height' => $imsize[1]]; $size = ['width' => $imsize[0], 'height' => $imsize[1]];
} }