CleanUp Cache namespace

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 3401359052fa29c39a4992e6c641740d87f35dc0..2b293a716d89355bef08cdd3db209933888bd6c2 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -8,9 +8,10 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Object\Image;
+use Friendica\DI;
+use Friendica\Util\Images;
+use Friendica\Util\Strings;
 
 /**
  * @param App $a
@@ -27,12 +28,16 @@ function fbrowser_content(App $a)
                exit();
        }
 
-       $template_file = "filebrowser.tpl";
-       $mode = "";
-       if (!empty($_GET['mode'])) {
-               $mode  = "?mode=".$_GET['mode'];
+       // Needed to match the correct template in a module that uses a different theme than the user/site/default
+       $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
+       if ($theme && is_file("view/theme/$theme/config.php")) {
+               $a->setCurrentTheme($theme);
        }
 
+       $template_file = "filebrowser.tpl";
+
+       $o = '';
+
        switch ($a->argv[1]) {
                case "image":
                        $path = [["", L10n::t("Photos")]];
@@ -55,12 +60,11 @@ function fbrowser_content(App $a)
                                $albums = array_map("_map_folder1", $albums);
                        }
 
-                       $album = "";
-                       if ($a->argc==3) {
+                       if ($a->argc == 3) {
                                $album = hex2bin($a->argv[2]);
                                $sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
                                $sql_extra2 = "";
-                               $path[]=[$a->argv[2], $album];
+                               $path[] = [$a->argv[2], $album];
                        }
 
                        $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`,
@@ -74,8 +78,8 @@ function fbrowser_content(App $a)
 
                        function _map_files1($rr)
                        {
-                               $a = \get_app();
-                               $types = Image::supportedTypes();
+                               $a = DI::app();
+                               $types = Images::supportedTypes();
                                $ext = $types[$rr['type']];
                                $filename_e = $rr['filename'];
 
@@ -89,9 +93,9 @@ function fbrowser_content(App $a)
                                }
 
                                return [
-                                       System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+                                       DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
                                        $filename_e,
-                                       System::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+                                       DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
                                ];
                        }
                        $files = array_map("_map_files1", $r);
@@ -100,7 +104,6 @@ function fbrowser_content(App $a)
 
                        $o =  Renderer::replaceMacros($tpl, [
                                '$type'     => 'image',
-                               '$baseurl'  => System::baseUrl(),
                                '$path'     => $path,
                                '$folders'  => $albums,
                                '$files'    => $files,
@@ -118,12 +121,11 @@ function fbrowser_content(App $a)
 
                                function _map_files2($rr)
                                {
-                                       $a = \get_app();
-                                       list($m1,$m2) = explode("/", $rr['filetype']);
+                                       list($m1, $m2) = explode("/", $rr['filetype']);
                                        $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
                                        $filename_e = $rr['filename'];
 
-                                       return [System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png'];
+                                       return [DI::baseUrl() . '/attach/' . $rr['id'], $filename_e, DI::baseUrl() . '/images/icons/16/' . $filetype . '.png'];
                                }
                                $files = array_map("_map_files2", $files);
 
@@ -131,7 +133,6 @@ function fbrowser_content(App $a)
                                $tpl = Renderer::getMarkupTemplate($template_file);
                                $o = Renderer::replaceMacros($tpl, [
                                        '$type'     => 'file',
-                                       '$baseurl'  => System::baseUrl(),
                                        '$path'     => [ [ "", L10n::t("Files")] ],
                                        '$folders'  => false,
                                        '$files'    => $files,