GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[CORE][UI] Made attachment actions and its subactions be able to identify attachments by id and by filehash. Changed the url stored in the DB to be attachment//view

Browse Source
This commit is contained in:
Miguel Dantas
2019-06-26 03:27:51 +01:00
committed by Diogo Cordeiro
parent 9536f2a909
commit aa5c6bbf08
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/router.php
View File

@@ -219,21 +219,17 @@ class Router
array('q' => '.+'));
$m->connect('search/notice/rss', array('action' => 'noticesearchrss'));
$m->connect('attachment/:attachment',
array('action' => 'attachment'),
array('attachment' => '[0-9]+'));
$m->connect('attachment/:attachment/view',
array('action' => 'attachment_view'),
array('attachment' => '[0-9]+'));
$m->connect('attachment/:attachment/download',
array('action' => 'attachment_download'),
array('attachment' => '[0-9]+'));
$m->connect('attachment/:attachment/thumbnail',
array('action' => 'attachment_thumbnail'),
array('attachment' => '[0-9]+'));
foreach (['' => 'attachment',
'/view' => 'attachment_view',
'/download' => 'attachment_download',
'/thumbnail' => 'attachment_thumbnail'] as $postfix => $action) {
foreach (['attachment' => '[0-9]+',
'filehash' => '[A-Za-z0-9._-]+'] as $type => $match) {
$m->connect("attachment/:{$type}{$postfix}",
['action' => $action],
[$type => $match]);
}
}
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
array('action' => 'newnotice'),