mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6540 from rubencm/ticket/17184

Browse Source 
[ticket/17184] Remove subfolders option in local storage
This commit is contained in:
Marc Alexander
2023-10-23 21:24:34 +02:00
committed by GitHub
parent 88385d6da2 94279d8ead
commit a86f64fbe9
7 changed files with 44 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
phpBB/phpbb/db/migration/data/v400/storage_adapter_local_subfolders_remove.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v400;
use phpbb\db\migration\migration;
class storage_adapter_local_subfolders_remove extends migration
{
public function effectively_installed()
{
return !$this->config->offsetExists('storage\\attachment\\config\\subfolders') &&
!$this->config->offsetExists('storage\\avatar\\config\\subfolders') &&
!$this->config->offsetExists('storage\\backup\\config\\subfolders');
}
public static function depends_on()
{
return [
'\phpbb\db\migration\data\v400\storage_adapter_local_subfolders',
];
}
public function update_data()
{
return [
['config.remove', ['storage\\attachment\\config\\subfolders']],
['config.remove', ['storage\\avatar\\config\\subfolders']],
['config.remove', ['storage\\backup\\config\\subfolders']],
];
}
}

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

@@ -73,29 +73,6 @@ class local implements adapter_interface, stream_interface
*/
protected $path;
/*
* Subdirectories depth
*
* Instead of storing all folders in the same directory, they can be divided
* into smaller directories. The variable describes the number of subdirectories
* to be used for storing the files. For example:
* depth = 0 -> /images/avatars/upload/my_avatar.jpg
* depth = 2 -> /images/avatars/upload/d9/8c/my_avatar.jpg
* This is for those who have problems storing a large number of files in
* a single directory.
* More info: https://tracker.phpbb.com/browse/PHPBB3-15371
*/
/*
* @var bool subfolders
*/
protected $subfolders;
/*
* @var int dir_depth
*/
protected $dir_depth = 2;
/**
* Constructor
*
@@ -125,7 +102,6 @@ class local implements adapter_interface, stream_interface
}
$this->root_path = filesystem_helper::realpath($this->phpbb_root_path . $options['path']) . DIRECTORY_SEPARATOR;
$this->subfolders = (bool) $options['subfolders'];
}
/**
@@ -181,8 +157,6 @@ class local implements adapter_interface, stream_interface
{
throw new exception('STORAGE_CANNOT_DELETE', $path, array(), $e);
}
$this->remove_empty_dirs($path);
}
/**
@@ -200,8 +174,6 @@ class local implements adapter_interface, stream_interface
{
throw new exception('STORAGE_CANNOT_RENAME', $path_orig, array(), $e);
}
$this->remove_empty_dirs($path_orig);
}
/**
@@ -259,31 +231,7 @@ class local implements adapter_interface, stream_interface
}
/**
* Removes the directory tree ascending until it finds a non empty directory.
*
* @param string $path The file path
*/
protected function remove_empty_dirs(string $path): void
{
if ($this->subfolders)
{
$dirpath = dirname($this->root_path . $path);
$filepath = dirname($this->root_path . $this->get_path($path) . $this->get_filename($path));
$path = filesystem_helper::make_path_relative($filepath, $dirpath);
do
{
$parts = explode('/', $path);
$parts = array_slice($parts, 0, -1);
$path = implode('/', $parts);
}
while ($path && @rmdir($dirpath . '/' . $path));
}
}
/**
* Get the path to the file, appending subdirectories for directory depth
* if $dir_depth > 0.
* Get the path to the file
*
* @param string $path The file path
* @return string
@@ -293,19 +241,6 @@ class local implements adapter_interface, stream_interface
$dirname = dirname($path);
$dirname = ($dirname != '.') ? $dirname . DIRECTORY_SEPARATOR : '';
if ($this->subfolders)
{
$hash = md5(basename($path));
$parts = str_split($hash, 2);
$parts = array_slice($parts, 0, $this->dir_depth);
if (!empty($parts))
{
$dirname .= implode(DIRECTORY_SEPARATOR, $parts) . DIRECTORY_SEPARATOR;
}
}
return $dirname;
}

7
phpBB/phpbb/storage/provider/local.php
View File

@@ -38,13 +38,6 @@ class local implements provider_interface
{
return [
'path' => ['type' => 'text'],
'subfolders' => [
'type' => 'radio',
'options' => [
'ENABLE' => '1',
'DISABLE' => '0',
],
],
];
}