Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 23:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move FileBrowser to own namespace & Bugfix album usage

Browse source
This commit is contained in:
Philipp 2022-11-27 00:28:29 +01:00
parent 3607aa32ca
commit 051253a745
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
12 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Module/Profile/Attachment/Browser.php → src/Module/Media/AttachmentBrowser.php
View file

@ -19,7 +19,7 @@
*
*/
namespace Friendica\Module\Profile\Attachment;
namespace Friendica\Module\Media;
use Friendica\App;
use Friendica\BaseModule;
@ -29,6 +29,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Model\Attach;
use Friendica\Module\Response;
use Friendica\Network\HTTPException\UnauthorizedException;
use Friendica\Util\Profiler;
use Friendica\Util\Strings;
use Psr\Log\LoggerInterface;
@ -36,7 +37,7 @@ use Psr\Log\LoggerInterface;
/**
* Browser for Attachments
*/
class Browser extends BaseModule
class AttachmentBrowser extends BaseModule
{
/** @var IHandleUserSessions */
protected $session;
@ -54,7 +55,7 @@ class Browser extends BaseModule
protected function content(array $request = []): string
{
if (!$this->session->getLocalUserId()) {
$this->baseUrl->redirect();
throw new UnauthorizedException($this->t('Permission denied.'));
}
// Needed to match the correct template in a module that uses a different theme than the user/site/default
@ -68,7 +69,7 @@ class Browser extends BaseModule
$fileArray = array_map([$this, 'map_files'], $files);
$tpl = Renderer::getMarkupTemplate('profile/filebrowser.tpl');
$tpl = Renderer::getMarkupTemplate('media/filebrowser.tpl');
$output = Renderer::replaceMacros($tpl, [
'$type' => 'attachment',
'$path' => ['' => $this->t('Files')],
@ -88,8 +89,8 @@ class Browser extends BaseModule
protected function map_files(array $record): array
{
list($m1, $m2) = explode('/', $record['filetype']);
$filetype = file_exists(sprintf('images/icons/%s.png', $m1) ? $m1 : 'zip');
[$m1, $m2] = explode('/', $record['filetype']);
$filetype = file_exists(sprintf('images/icons/%s.png', $m1) ? $m1 : 'text');
return [
sprintf('%s/attach/%s', $this->baseUrl, $record['id']),

9
src/Module/Profile/Photos/Browser.php → src/Module/Media/PhotosBrowser.php
View file

@ -19,7 +19,7 @@
*
*/
namespace Friendica\Module\Profile\Photos;
namespace Friendica\Module\Media;
use Friendica\App;
use Friendica\BaseModule;
@ -29,6 +29,7 @@ use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\System;
use Friendica\Model\Photo;
use Friendica\Module\Response;
use Friendica\Network\HTTPException\UnauthorizedException;
use Friendica\Util\Images;
use Friendica\Util\Profiler;
use Friendica\Util\Strings;
@ -37,7 +38,7 @@ use Psr\Log\LoggerInterface;
/**
* Browser for Photos
*/
class Browser extends BaseModule
class PhotosBrowser extends BaseModule
{
/** @var IHandleUserSessions */
protected $session;
@ -55,7 +56,7 @@ class Browser extends BaseModule
protected function content(array $request = []): string
{
if (!$this->session->getLocalUserId()) {
$this->baseUrl->redirect();
throw new UnauthorizedException($this->t('Permission denied.'));
}
// Needed to match the correct template in a module that uses a different theme than the user/site/default
@ -78,7 +79,7 @@ class Browser extends BaseModule
$photosArray = array_map([$this, 'map_files'], $photos);
$tpl = Renderer::getMarkupTemplate('profile/filebrowser.tpl');
$tpl = Renderer::getMarkupTemplate('media/filebrowser.tpl');
$output = Renderer::replaceMacros($tpl, [
'$type' => 'photos',
'$path' => $path,