makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58: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. Replaced global by dependency injection.

PHPBB3-13981
This commit is contained in:
javiexin 2015-07-17 19:40:33 +02:00
parent 4b54df8d45
commit 4d3188ba57
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/avatar.yml
View file

@ -60,6 +60,7 @@ services:
- %core.php_ext% - %core.php_ext%
- @path_helper - @path_helper
- @mimetype.guesser - @mimetype.guesser
- @dispatcher
- @cache.driver - @cache.driver
calls: calls:
- [set_name, [avatar.driver.upload]] - [set_name, [avatar.driver.upload]]

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

@ -23,6 +23,11 @@ class upload extends \phpbb\avatar\driver\driver
*/ */
protected $mimetype_guesser; protected $mimetype_guesser;
/**
* @var \phpbb\event\dispatcher_interface
*/
protected $dispatcher;
/** /**
* Construct a driver object * Construct a driver object
* *
@ -31,15 +36,17 @@ class upload extends \phpbb\avatar\driver\driver
* @param string $php_ext PHP file extension * @param string $php_ext PHP file extension
* @param \phpbb_path_helper $path_helper phpBB path helper * @param \phpbb_path_helper $path_helper phpBB path helper
* @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser * @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser
* @param \phpbb\event\dispatcher_interface $dispatcher phpBB Event dispatcher object
* @param \phpbb\cache\driver\driver_interface $cache Cache driver * @param \phpbb\cache\driver\driver_interface $cache Cache driver
*/ */
public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\mimetype\guesser $mimetype_guesser, \phpbb\cache\driver\driver_interface $cache = null) public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\mimetype\guesser $mimetype_guesser, \phpbb\cache\driver\driver_interface $dispatcher, \phpbb\cache\driver\driver_interface $cache = null)
{ {
$this->config = $config; $this->config = $config;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext; $this->php_ext = $php_ext;
$this->path_helper = $path_helper; $this->path_helper = $path_helper;
$this->mimetype_guesser = $mimetype_guesser; $this->mimetype_guesser = $mimetype_guesser;
$this->dispatcher = $dispatcher;
$this->cache = $cache; $this->cache = $cache;
} }
@ -80,8 +87,6 @@ class upload extends \phpbb\avatar\driver\driver
*/ */
public function process_form($request, $template, $user, $row, &$error) public function process_form($request, $template, $user, $row, &$error)
{ {
global $phpbb_dispatcher;
if (!$this->can_upload()) if (!$this->can_upload())
{ {
return false; return false;
@ -178,7 +183,7 @@ class upload extends \phpbb\avatar\driver\driver
'row', 'row',
'error', 'error',
); );
extract($phpbb_dispatcher->trigger_event('core.avatar_driver_upload_overwrite_before', compact($vars))); extract($this->dispatcher->trigger_event('core.avatar_driver_upload_overwrite_before', compact($vars)));
if (!sizeof($error)) if (!sizeof($error))
{ {
@ -218,7 +223,6 @@ class upload extends \phpbb\avatar\driver\driver
*/ */
public function delete($row) public function delete($row)
{ {
global $phpbb_dispatcher;
$error = array(); $error = array();
$destination = $this->config['avatar_path']; $destination = $this->config['avatar_path'];
@ -242,7 +246,7 @@ class upload extends \phpbb\avatar\driver\driver
'row', 'row',
'error', 'error',
); );
extract($phpbb_dispatcher->trigger_event('core.avatar_driver_upload_delete_before', compact($vars))); extract($this->dispatcher->trigger_event('core.avatar_driver_upload_delete_before', compact($vars)));
if (!sizeof($error) && file_exists($filename)) if (!sizeof($error) && file_exists($filename))
{ {