Replace json_encode + exit by System::jsonExit in mod/item

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 94d575c46fff64442ed351248be1a070cced6202..a4ade6f8c10eac558811aa60fc0821a606babdbe 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,7 +6,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -40,7 +39,7 @@ function fbrowser_content(App $a)
 
        switch ($a->argv[1]) {
                case "image":
-                       $path = [["", L10n::t("Photos")]];
+                       $path = [["", DI::l10n()->t("Photos")]];
                        $albums = false;
                        $sql_extra = "";
                        $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
@@ -49,7 +48,7 @@ function fbrowser_content(App $a)
                                $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
                                        intval(local_user()),
                                        DBA::escape('Contact Photos'),
-                                       DBA::escape(L10n::t('Contact Photos'))
+                                       DBA::escape(DI::l10n()->t('Contact Photos'))
                                );
 
                                function _map_folder1($el)
@@ -73,12 +72,12 @@ function fbrowser_content(App $a)
                                        GROUP BY `resource-id` $sql_extra2",
                                intval(local_user()),
                                DBA::escape('Contact Photos'),
-                               DBA::escape(L10n::t('Contact Photos'))
+                               DBA::escape(DI::l10n()->t('Contact Photos'))
                        );
 
                        function _map_files1($rr)
                        {
-                               $a = \get_app();
+                               $a = DI::app();
                                $types = Images::supportedTypes();
                                $ext = $types[$rr['type']];
                                $filename_e = $rr['filename'];
@@ -107,9 +106,9 @@ function fbrowser_content(App $a)
                                '$path'     => $path,
                                '$folders'  => $albums,
                                '$files'    => $files,
-                               '$cancel'   => L10n::t('Cancel'),
+                               '$cancel'   => DI::l10n()->t('Cancel'),
                                '$nickname' => $a->user['nickname'],
-                               '$upload'   => L10n::t('Upload')
+                               '$upload'   => DI::l10n()->t('Upload')
                        ]);
 
                        break;
@@ -133,12 +132,12 @@ function fbrowser_content(App $a)
                                $tpl = Renderer::getMarkupTemplate($template_file);
                                $o = Renderer::replaceMacros($tpl, [
                                        '$type'     => 'file',
-                                       '$path'     => [ [ "", L10n::t("Files")] ],
+                                       '$path'     => [ [ "", DI::l10n()->t("Files")] ],
                                        '$folders'  => false,
                                        '$files'    => $files,
-                                       '$cancel'   => L10n::t('Cancel'),
+                                       '$cancel'   => DI::l10n()->t('Cancel'),
                                        '$nickname' => $a->user['nickname'],
-                                       '$upload'   => L10n::t('Upload')
+                                       '$upload'   => DI::l10n()->t('Upload')
                                ]);
                        }