aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/driver/remote.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-01-25 01:24:15 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-01-25 01:24:15 +0100
commit9c3538eb0e29c491d2f8c15c44c772e29631f4e3 (patch)
treebdbe15b863092afafbe5ad1a71f7898adaec4a22 /phpBB/includes/avatar/driver/remote.php
parent869de98f52e636fd5b9f2a9f5b75d665e7009463 (diff)
downloadforums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar
forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.gz
forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.bz2
forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.tar.xz
forums-9c3538eb0e29c491d2f8c15c44c772e29631f4e3.zip
[feature/avatars] Move list of supported formats to avatar driver class
Using the regex and turning it into an array if necessary seemed like the cleanest approach to achieve this. PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/remote.php')
-rw-r--r--phpBB/includes/avatar/driver/remote.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index e8f182063e..9b481f983e 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -84,7 +84,7 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
// Check if this url looks alright
// This isn't perfect, but it's what phpBB 3.0 did, and might as well make sure everything is compatible
- if (!preg_match('#^(http|https|ftp)://(?:(.*?\.)*?[a-z0-9\-]+?\.[a-z]{2,4}|(?:\d{1,3}\.){3,5}\d{1,3}):?([0-9]*?).*?\.(gif|jpg|jpeg|png)$#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]*?).*?\.('. self::REGEX_ALLOWED_EXT . ')$#i', $url))
{
$error[] = 'AVATAR_URL_INVALID';
return false;