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

[ticket/13981] Add events to capture avatar deletion or overwriting

Browse source 
An event to capture overwriting, and another to capture deletion.
Includes better error processing.

PHPBB3-13981
This commit is contained in:
javiexin 2015-07-09 16:33:56 +02:00
parent e0efd5ee57
commit 4b54df8d45
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/avatar/driver/upload.php
View file

@ -139,6 +139,15 @@ class upload extends \phpbb\avatar\driver\driver
$prefix = $this->config['avatar_salt'] . '_'; $prefix = $this->config['avatar_salt'] . '_';
$file->clean_filename('avatar', $prefix, $row['id']); $file->clean_filename('avatar', $prefix, $row['id']);
// If there was an error during upload, then abort operation
if (sizeof($file->error))
{
$file->remove();
$error = $file->error;
return false;
}
// Calculate new destination
$destination = $this->config['avatar_path']; $destination = $this->config['avatar_path'];
// Adjust destination path (no trailing slash) // Adjust destination path (no trailing slash)
@ -177,6 +186,7 @@ class upload extends \phpbb\avatar\driver\driver
$file->move_file($destination, true); $file->move_file($destination, true);
} }
// If there was an error during move, then clean up leftovers
$error = array_merge($error, $file->error); $error = array_merge($error, $file->error);
if (sizeof($error)) if (sizeof($error))
{ {