diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-25 17:40:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-25 17:40:59 +0100 |
| commit | 2ebbcbe2331f48fc67e879caded25ebd4a0d2778 (patch) | |
| tree | 80262271cbc01251d8ff2603849e49d83039443f | |
| parent | 78ae67ae28d9790f78126f6f77ba30e3515e41e0 (diff) | |
| parent | 4e2e36df60e3d283d1c6a6e2300db4d5a0045163 (diff) | |
| download | forums-2ebbcbe2331f48fc67e879caded25ebd4a0d2778.tar forums-2ebbcbe2331f48fc67e879caded25ebd4a0d2778.tar.gz forums-2ebbcbe2331f48fc67e879caded25ebd4a0d2778.tar.bz2 forums-2ebbcbe2331f48fc67e879caded25ebd4a0d2778.tar.xz forums-2ebbcbe2331f48fc67e879caded25ebd4a0d2778.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/phpbb/avatar/driver/remote.php | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index efc4f5ec0f..b16549ffb7 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); @@ -84,6 +86,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.9-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) || |