mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
[ticket/16705] Fix check_disk_space function
PHPBB3-16705
This commit is contained in:
parent
0daf4b6b1c
commit
91a5a73dca
2 changed files with 14 additions and 1 deletions
|
@ -46,6 +46,7 @@ $lang = array_merge($lang, array(
|
|||
'ATTACH_COMMENT_NO_EMOJIS' => 'The attachment comment contains forbidden characters (Emoji).',
|
||||
'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.',
|
||||
'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.',
|
||||
'ATTACH_DISK_FREE_SPACE' => 'Sorry, the PHP <samp>disk_free_space</samp> function is disabled in this system.',
|
||||
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',
|
||||
|
||||
'BBCODE_A_HELP' => 'Inline uploaded attachment: [attachment=]filename.ext[/attachment]',
|
||||
|
|
|
@ -296,8 +296,10 @@ class upload
|
|||
*/
|
||||
protected function check_disk_space()
|
||||
{
|
||||
if ($free_space = @disk_free_space($this->phpbb_root_path . $this->config['upload_path']))
|
||||
if (function_exists('disk_free_space'))
|
||||
{
|
||||
$free_space = disk_free_space($this->phpbb_root_path);
|
||||
|
||||
if ($free_space <= $this->file->get('filesize'))
|
||||
{
|
||||
if ($this->auth->acl_get('a_'))
|
||||
|
@ -315,6 +317,16 @@ class upload
|
|||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->file_data['error'][] = $this->language->lang('ATTACH_DISK_FREE_SPACE');
|
||||
|
||||
$this->file_data['post_attach'] = false;
|
||||
|
||||
$this->file->remove();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue