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

[ticket/14430] Remote avatar uploading

Browse source 
Remove support for redirects

PHPBB3-14431
This commit is contained in:
Scott Dutton 2016-02-03 05:33:45 +00:00
parent 610048cc6d
commit 366a92c36a
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/functions_upload.php
View file

@ -752,11 +752,10 @@ class fileupload
* *
* @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif * @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif
* @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser * @param \phpbb\mimetype\guesser $mimetype_guesser Mimetype guesser
* @param int $redirect_count the current count of redirects
* @return object $file Object "filespec" is returned, all further operations can be done with this object * @return object $file Object "filespec" is returned, all further operations can be done with this object
* @access public * @access public
*/ */
function remote_upload($upload_url, \phpbb\mimetype\guesser $mimetype_guesser = null, $redirect_count = 0) function remote_upload($upload_url, \phpbb\mimetype\guesser $mimetype_guesser = null)
{ {
global $user, $phpbb_root_path; global $user, $phpbb_root_path;
@ -909,21 +908,6 @@ class fileupload
$file = new fileerror($user->lang[$this->error_prefix . 'URL_NOT_FOUND']); $file = new fileerror($user->lang[$this->error_prefix . 'URL_NOT_FOUND']);
return $file; return $file;
} }
else if (stripos($line, 'location: ') !== false)
{
//there is a redirect, follow up to 5
if ($redirect_count >= 5)
{
$file = new fileerror($user->lang[$this->error_prefix . 'URL_NOT_FOUND']);
return $file;
}
$upload_url = rtrim(str_replace('location: ', '', strtolower($line)));
//close the current connection, lets not leave dangeling connections open
@fclose($fsock);
return $this->remote_upload($upload_url, $mimetype_guesser, ++$redirect_count);
}
} }
} }