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

proxy: Simplify url extension extraction

Browse source
This commit is contained in:
Hypolite Petovan 2016-12-20 15:14:43 -05:00 committed by Roland Häder
parent c0ec9c5907
commit 1f94cb9aac
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mod/proxy.php
View file

@ -281,15 +281,8 @@ function proxy_url($url, $writemode = false, $size = '') {
$longpath .= '/' . strtr(base64_encode($url), '+/', '-_'); $longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
// Extract the URL extension, disregarding GET parameters starting with ? // Extract the URL extension
$question_mark_pos = strpos($url, '?'); $extension = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
if ($question_mark_pos === false) {
$question_mark_pos = strlen($url);
}
$dot_pos = strrpos($url, '.', $question_mark_pos - strlen($url));
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');
if (in_array($extension, $extensions)) { if (in_array($extension, $extensions)) {