X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=14141d4004d614de4b46f18b9c99b4851557ce6d;hb=c41aaf8a17405e4e11366fec14519994612744b1;hp=79dd1599bb300836844ae39153889413ea0c0cef;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 79dd1599bb..14141d4004 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -6,10 +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;
 
@@ -40,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`,
@@ -72,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)