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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-12-25 17:41:04 +01:00
commit acef860d56
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/phpbb/avatar/driver/remote.php
View file

@ -49,6 +49,8 @@ class remote 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;
$url = $request->variable('avatar_remote_url', ''); $url = $request->variable('avatar_remote_url', '');
$width = $request->variable('avatar_remote_width', 0); $width = $request->variable('avatar_remote_width', 0);
$height = $request->variable('avatar_remote_height', 0); $height = $request->variable('avatar_remote_height', 0);
@ -84,6 +86,24 @@ class remote extends \phpbb\avatar\driver\driver
return false; 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 // Check if this url looks alright
// Do not allow specifying the port (see RFC 3986) or IP addresses // 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) || 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) ||