From b8de0fc47e85fa226dc5723d09a141ef4b1d67f2 Mon Sep 17 00:00:00 2001 From: DSR! Date: Sat, 13 Apr 2019 21:57:04 -0300 Subject: [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation PHPBB3-16015 --- phpBB/phpbb/avatar/driver/remote.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'phpBB/phpbb/avatar') diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index efc4f5ec0f..69402f39b2 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -84,6 +84,24 @@ class remote extends \phpbb\avatar\driver\driver return false; } + /** + * Event to make custom validation of avatar upload + * + * @event core.ucp_profile_avatar_upload_validation + * @var string $url Image url + * @var string $width Image width + * @var string $height Image height + * @var array $error Error message array + * @since 3.2.6-RC1 + */ + $vars = array('url', 'width', 'height', 'error'); + extract($phpbb_dispatcher->trigger_event('core.ucp_profile_avatar_upload_validation', compact($vars))); + + if (!empty($error)) + { + return false; + } + // Check if this url looks alright // Do not allow specifying the port (see RFC 3986) or IP addresses if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.('. implode('|', $this->allowed_extensions) . ')$#i', $url) || -- cgit v1.2.1 From c631db62d59548c14dfd0861bdd09e3ffaa980f7 Mon Sep 17 00:00:00 2001 From: DSR! Date: Mon, 15 Apr 2019 01:18:19 -0300 Subject: [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation PHPBB3-16015 --- phpBB/phpbb/avatar/driver/remote.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/phpbb/avatar') diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 69402f39b2..a5d0cefe7a 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -49,6 +49,8 @@ class remote extends \phpbb\avatar\driver\driver */ public function process_form($request, $template, $user, $row, &$error) { + global $phpbb_dispatcher; + $url = $request->variable('avatar_remote_url', ''); $width = $request->variable('avatar_remote_width', 0); $height = $request->variable('avatar_remote_height', 0); -- cgit v1.2.1 From 423e9c4ac017fbf833cfb008b82b4c7ff3a6f9d0 Mon Sep 17 00:00:00 2001 From: DSR! Date: Mon, 15 Apr 2019 01:27:41 -0300 Subject: [ticket/16015] Fix core.ucp_profile_avatar_upload_validation docblock PHPBB3-16015 --- phpBB/phpbb/avatar/driver/remote.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'phpBB/phpbb/avatar') diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index a5d0cefe7a..736ec05e45 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -90,10 +90,10 @@ class remote extends \phpbb\avatar\driver\driver * Event to make custom validation of avatar upload * * @event core.ucp_profile_avatar_upload_validation - * @var string $url Image url - * @var string $width Image width - * @var string $height Image height - * @var array $error Error message array + * @var string url Image url + * @var string width Image width + * @var string height Image height + * @var array error Error message array * @since 3.2.6-RC1 */ $vars = array('url', 'width', 'height', 'error'); -- cgit v1.2.1 From 4bee15d0fad107f0425c249757945e93009f0459 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Dec 2019 14:36:33 +0100 Subject: [ticket/16015] Adjust since version PHPBB3-16015 --- phpBB/phpbb/avatar/driver/remote.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/avatar') diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 736ec05e45..b16549ffb7 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -94,7 +94,7 @@ class remote extends \phpbb\avatar\driver\driver * @var string width Image width * @var string height Image height * @var array error Error message array - * @since 3.2.6-RC1 + * @since 3.2.9-RC1 */ $vars = array('url', 'width', 'height', 'error'); extract($phpbb_dispatcher->trigger_event('core.ucp_profile_avatar_upload_validation', compact($vars))); -- cgit v1.2.1