CleanUp Cache namespace

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index f2bccb085a6f0d4d93c9a981728d94698b1727cd..2b293a716d89355bef08cdd3db209933888bd6c2 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -8,9 +8,9 @@
 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;
 
 /**
@@ -29,7 +29,7 @@ function fbrowser_content(App $a)
        }
 
        // Needed to match the correct template in a module that uses a different theme than the user/site/default
-       $theme = Strings::sanitizeFilePathItem(defaults($_GET, 'theme', null));
+       $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
        if ($theme && is_file("view/theme/$theme/config.php")) {
                $a->setCurrentTheme($theme);
        }
@@ -78,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'];
 
@@ -93,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);
@@ -125,7 +125,7 @@ function fbrowser_content(App $a)
                                        $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);