mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-08 01:36:57 +02:00
[ticket/13697] Moving filesystem related functions to filesystem service
* Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
This commit is contained in:
@@ -2316,7 +2316,10 @@ function convert_bbcode($message, $convert_size = true, $extended_bbcodes = fals
|
||||
|
||||
function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
|
||||
{
|
||||
global $convert, $phpbb_root_path, $config, $user, $db;
|
||||
global $convert, $phpbb_root_path, $config, $user, $db, $phpbb_filesystem;
|
||||
|
||||
/** @var \phpbb\filesystem\filesystem_interface $filesystem */
|
||||
$filesystem = $phpbb_filesystem;
|
||||
|
||||
if (substr($trg, -1) == '/')
|
||||
{
|
||||
@@ -2349,7 +2352,7 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
|
||||
}
|
||||
}
|
||||
|
||||
if (!phpbb_is_writable($path))
|
||||
if (!$filesystem->is_writable($path))
|
||||
{
|
||||
@chmod($path, 0777);
|
||||
}
|
||||
@@ -2370,7 +2373,10 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
|
||||
|
||||
function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
|
||||
{
|
||||
global $convert, $phpbb_root_path, $config, $user, $db;
|
||||
global $convert, $phpbb_root_path, $config, $user, $db, $phpbb_filesystem;
|
||||
|
||||
/** @var \phpbb\filesystem\filesystem_interface $filesystem */
|
||||
$filesystem = $phpbb_filesystem;
|
||||
|
||||
$dirlist = $filelist = $bad_dirs = array();
|
||||
$src = path($src, $source_relative_path);
|
||||
@@ -2384,7 +2390,7 @@ function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_
|
||||
@chmod($trg_path, 0777);
|
||||
}
|
||||
|
||||
if (!phpbb_is_writable($trg_path))
|
||||
if (!$filesystem->is_writable($trg_path))
|
||||
{
|
||||
$bad_dirs[] = path($config['script_path']) . $trg;
|
||||
}
|
||||
@@ -2451,7 +2457,7 @@ function copy_dir($src, $trg, $copy_subdirs = true, $overwrite = false, $die_on_
|
||||
@chmod($trg_path . $dir, 0777);
|
||||
}
|
||||
|
||||
if (!phpbb_is_writable($trg_path . $dir))
|
||||
if (!$filesystem->is_writable($trg_path . $dir))
|
||||
{
|
||||
$bad_dirs[] = $trg . $dir;
|
||||
$bad_dirs[] = $trg_path . $dir;
|
||||
|
Reference in New Issue
Block a user