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

Merge branch '3.2.x' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2020-02-15 16:46:02 +01:00
commit b1f0276307
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_attachments.php
View file

@ -1478,7 +1478,7 @@ class acp_attachments
try try
{ {
$this->filesystem->phpbb_chmod($phpbb_root_path . $upload_dir, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($phpbb_root_path . $upload_dir, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {

8
phpBB/includes/constants.php
View file

@ -221,10 +221,10 @@ define('REFERER_VALIDATE_HOST', 1);
define('REFERER_VALIDATE_PATH', 2); define('REFERER_VALIDATE_PATH', 2);
// phpbb_chmod() permissions // phpbb_chmod() permissions
@define('CHMOD_ALL', 7); @define('CHMOD_ALL', 7); // @deprecated 3.2.10
@define('CHMOD_READ', 4); @define('CHMOD_READ', 4); // @deprecated 3.2.10
@define('CHMOD_WRITE', 2); @define('CHMOD_WRITE', 2); // @deprecated 3.2.10
@define('CHMOD_EXECUTE', 1); @define('CHMOD_EXECUTE', 1); // @deprecated 3.2.10
// Captcha code length // Captcha code length
define('CAPTCHA_MIN_CHARS', 4); define('CAPTCHA_MIN_CHARS', 4);

10
phpBB/includes/functions_compress.php
View file

@ -296,7 +296,7 @@ class compress_zip extends compress
try try
{ {
$this->filesystem->phpbb_chmod($str, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($str, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
@ -333,7 +333,7 @@ class compress_zip extends compress
try try
{ {
$this->filesystem->phpbb_chmod($str, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($str, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
@ -636,7 +636,7 @@ class compress_tar extends compress
try try
{ {
$this->filesystem->phpbb_chmod($str, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($str, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
@ -671,7 +671,7 @@ class compress_tar extends compress
try try
{ {
$this->filesystem->phpbb_chmod($str, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($str, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
@ -688,7 +688,7 @@ class compress_tar extends compress
try try
{ {
$this->filesystem->phpbb_chmod($target_filename, CHMOD_READ); $this->filesystem->phpbb_chmod($target_filename, \phpbb\filesystem\filesystem_interface::CHMOD_READ);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {

4
phpBB/includes/functions_messenger.php
View file

@ -1013,7 +1013,7 @@ class queue
try try
{ {
$this->filesystem->phpbb_chmod($this->cache_file, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
@ -1067,7 +1067,7 @@ class queue
try try
{ {
$this->filesystem->phpbb_chmod($this->cache_file, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {

2
phpBB/includes/functions_posting.php
View file

@ -683,7 +683,7 @@ function create_thumbnail($source, $destination, $mimetype)
try try
{ {
$phpbb_filesystem->phpbb_chmod($destination, CHMOD_READ | CHMOD_WRITE); $phpbb_filesystem->phpbb_chmod($destination, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {

2
phpBB/phpbb/cache/driver/file.php vendored
View file

@ -581,7 +581,7 @@ class file extends \phpbb\cache\driver\base
try try
{ {
$this->filesystem->phpbb_chmod($file, CHMOD_READ | CHMOD_WRITE); $this->filesystem->phpbb_chmod($file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE);
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {

2
phpBB/phpbb/files/filespec.php
View file

@ -408,7 +408,7 @@ class filespec
return false; return false;
} }
$chmod = ($chmod === false) ? CHMOD_READ | CHMOD_WRITE : $chmod; $chmod = ($chmod === false) ? \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE : $chmod;
// We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it... // We need to trust the admin in specifying valid upload directories and an attacker not being able to overwrite it...
$this->destination_path = $this->phpbb_root_path . $destination; $this->destination_path = $this->phpbb_root_path . $destination;