Merge pull request #10332 from annando/calender-download

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index a4ade6f8c10eac558811aa60fc0821a606babdbe..14141d4004d614de4b46f18b9c99b4851557ce6d 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -9,6 +9,7 @@ use Friendica\App;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Photo;
 use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
@@ -39,31 +40,26 @@ function fbrowser_content(App $a)
 
        switch ($a->argv[1]) {
                case "image":
-                       $path = [["", DI::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' ",
+                               $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(DI::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]);
+                               $album = $a->argv[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,8 +67,8 @@ 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(DI::l10n()->t('Contact Photos'))
+                               DBA::escape(Photo::CONTACT_PHOTOS),
+                               DBA::escape(DI::l10n()->t(Photo::CONTACT_PHOTOS))
                        );
 
                        function _map_files1($rr)