From 572989afb7c3964700ff5bd998b9d1fbfb1f6ac3 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 19 Jul 2002 22:39:25 +0000 Subject: [PATCH] Slight mod to avatar url rex, the rawurlencode seriously broke things so removed it ... git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@2730 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/usercp_avatar.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/usercp_avatar.php b/phpBB/includes/usercp_avatar.php index eddc042dfb..3e16879099 100644 --- a/phpBB/includes/usercp_avatar.php +++ b/phpBB/includes/usercp_avatar.php @@ -77,13 +77,12 @@ function user_avatar_gallery($mode, &$error, &$error_msg, $avatar_filename) function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename) { - $avatar_filename = rawurlencode($avatar_filename); - if ( !preg_match('#^http:\/\/#i', $avatar_filename) ) + if ( !preg_match('#^(http)|(ftp):\/\/#i', $avatar_filename) ) { $avatar_filename = 'http://' . $avatar_filename; } - if ( !preg_match('#^(http:\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)*[a-z]+(:[0-9]+)*\/\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) ) + if ( !preg_match('#^((http)|(ftp):\/\/[a-z0-9\-]+?\.([a-z0-9\-]+\.)+[a-z]+(:[0-9]+)*\/.*?\.(gif|jpg|jpeg|png)$)#is', $avatar_filename) ) { $error = true; $error_msg = ( !empty($error_msg) ) ? $error_msg . '
' . $lang['Wrong_remote_avatar_format'] : $lang['Wrong_remote_avatar_format'];