Revert Photo::getImageDataForPhoto return-type change

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index b1daa2cc235e41399d2834f0edc862e660363872..53aa255a2ea89a4a6e9ed390eaa88a125d9fcc5a 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,9 +6,10 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Photo;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
@@ -23,7 +24,7 @@ function fbrowser_content(App $a)
                exit();
        }
 
-       if ($a->argc == 1) {
+       if (DI::args()->getArgc() == 1) {
                exit();
        }
 
@@ -37,33 +38,28 @@ function fbrowser_content(App $a)
 
        $o = '';
 
-       switch ($a->argv[1]) {
+       switch (DI::args()->getArgv()[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";
 
-                       if ($a->argc==2) {
-                               $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
+                       if (DI::args()->getArgc()==2) {
+                               $photos = 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(Photo::CONTACT_PHOTOS),
+                                       DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS))
                                );
 
-                               function _map_folder1($el)
-                               {
-                                       return [bin2hex($el['album']),$el['album']];
-                               };
-
-                               $albums = array_map("_map_folder1", $albums);
+                               $albums = array_column($photos, 'album');
                        }
 
-                       if ($a->argc == 3) {
-                               $album = hex2bin($a->argv[2]);
+                       if (DI::args()->getArgc() == 3) {
+                               $album = DI::args()->getArgv()[2];
                                $sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
                                $sql_extra2 = "";
-                               $path[] = [$a->argv[2], $album];
+                               $path[$album] = $album;
                        }
 
                        $r = q("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`,
@@ -71,13 +67,13 @@ function fbrowser_content(App $a)
                                        FROM `photo` WHERE `uid` = %d $sql_extra AND `album` != '%s' AND `album` != '%s'
                                        GROUP BY `resource-id` $sql_extra2",
                                intval(local_user()),
-                               DBA::escape('Contact Photos'),
-                               DBA::escape(L10n::t('Contact Photos'))
+                               DBA::escape(Photo::CONTACT_PHOTOS),
+                               DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS))
                        );
 
                        function _map_files1($rr)
                        {
-                               $a = \get_app();
+                               $a = DI::app();
                                $types = Images::supportedTypes();
                                $ext = $types[$rr['type']];
                                $filename_e = $rr['filename'];
@@ -92,7 +88,7 @@ function fbrowser_content(App $a)
                                }
 
                                return [
-                                       DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+                                       DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
                                        $filename_e,
                                        DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
                                ];
@@ -106,14 +102,14 @@ function fbrowser_content(App $a)
                                '$path'     => $path,
                                '$folders'  => $albums,
                                '$files'    => $files,
-                               '$cancel'   => L10n::t('Cancel'),
-                               '$nickname' => $a->user['nickname'],
-                               '$upload'   => L10n::t('Upload')
+                               '$cancel'   => DI::l10n()->t('Cancel'),
+                               '$nickname' => $a->getLoggedInUserNickname(),
+                               '$upload'   => DI::l10n()->t('Upload')
                        ]);
 
                        break;
                case "file":
-                       if ($a->argc==2) {
+                       if (DI::args()->getArgc()==2) {
                                $files = q("SELECT `id`, `filename`, `filetype` FROM `attach` WHERE `uid` = %d ",
                                        intval(local_user())
                                );
@@ -132,12 +128,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'),
-                                       '$nickname' => $a->user['nickname'],
-                                       '$upload'   => L10n::t('Upload')
+                                       '$cancel'   => DI::l10n()->t('Cancel'),
+                                       '$nickname' => $a->getLoggedInUserNickname(),
+                                       '$upload'   => DI::l10n()->t('Upload')
                                ]);
                        }