eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Fiddling with merge request #98 to use internal routing functions

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-02-26 14:10:32 +01:00
parent 8356c2495c
commit 6a4470912f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
classes/File.php
View File

@ -108,13 +108,20 @@ class File extends Managed_DataObject
// if the given url is an local attachment url and the id already exists, don't // if the given url is an local attachment url and the id already exists, don't
// save a new file record. This should never happen, but let's make it foolproof // save a new file record. This should never happen, but let's make it foolproof
$attachment_path = common_path('attachment/'); // FIXME: how about attachments servers?
if (mb_strpos($given_url,$attachment_path) === 0) { $u = parse_url($given_url);
$possible_file_id = mb_substr($given_url, mb_strlen($attachment_path)); if (isset($u['host']) && $u['host'] === common_config('site', 'server')) {
if(is_numeric($possible_file_id)) { $r = Router::get();
$file = File::getKV('id',$possible_file_id); $args = $r->map(mb_substr($u['path']));
if($file instanceof File) { if ($args['action'] === 'attachment') {
try {
// $args['attachment'] should always be set if action===attachment, given our routing rules
$file = File::getByID($args['attachment']);
return $file; return $file;
} catch (EmptyIdException $e) {
// ...but $args['attachment'] can also be 0...
} catch (NoResultException $e) {
// apparently this link goes to us, but is _not_ an existing attachment (File) ID?
} }
} }
} }