keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Roland Haeder 2016-12-20 19:33:40 +01:00
commit b6d11f2129
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/proxy.php
View file

@ -281,14 +281,14 @@ function proxy_url($url, $writemode = false, $size = '') {
$longpath .= '/' . strtr(base64_encode($url), '+/', '-_'); $longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
// Checking for valid extensions. Only add them if they are safe // Extract the URL extension, disregarding GET parameters starting with ?
$pos = strrpos($url, '.'); $question_mark_pos = strpos($url, '?');
if ($pos) { if ($question_mark_pos === false) {
$extension = strtolower(substr($url, $pos + 1)); $question_mark_pos = strlen($url);
$pos = strpos($extension, '?'); }
if ($pos) { $dot_pos = strrpos($url, '.', $question_mark_pos - strlen($url));
$extension = substr($extension, 0, $pos); if ($dot_pos !== false) {
} $extension = strtolower(substr($url, $dot_pos + 1, $question_mark_pos - ($dot_pos + 1)));
} }
$extensions = array('jpg', 'jpeg', 'gif', 'png'); $extensions = array('jpg', 'jpeg', 'gif', 'png');