X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffbrowser.php;h=d918021cf2d6e880c6151c337cdee6e2d58d4979;hb=ab60cf0572be448aeb7bd9708004e1f420da77b7;hp=c68b44a1ed8cc3bb940ed704bc16288ca696cbd2;hpb=3972fe62fe8afb3791e9d6526e7665501a577b81;p=friendica.git diff --git a/mod/fbrowser.php b/mod/fbrowser.php index c68b44a1ed..d918021cf2 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -1,5 +1,22 @@ . + * * @package Friendica\modules * @subpackage FileBrowser * @author Fabio Comuni @@ -46,10 +63,10 @@ function fbrowser_content(App $a) $sql_extra2 = " ORDER BY created DESC LIMIT 0, 10"; if (DI::args()->getArgc() == 2) { - $photos = DBA::toArray(DBA::p("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `album` IN (?, ?)", + $photos = DBA::toArray(DBA::p("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)", local_user(), - Photo::CONTACT_PHOTOS, - DI::l10n()->t(Photo::CONTACT_PHOTOS) + Photo::CONTACT_AVATAR, + Photo::CONTACT_BANNER )); $albums = array_column($photos, 'album'); @@ -64,11 +81,11 @@ function fbrowser_content(App $a) $r = DBA::toArray(DBA::p("SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`type`) AS `type`, min(`scale`) AS `hiq`, max(`scale`) AS `loq`, ANY_VALUE(`desc`) AS `desc`, ANY_VALUE(`created`) AS `created` - FROM `photo` WHERE `uid` = ? $sql_extra AND NOT `album` IN (?, ?) + FROM `photo` WHERE `uid` = ? $sql_extra AND NOT `photo-type` IN (?, ?) GROUP BY `resource-id` $sql_extra2", local_user(), - Photo::CONTACT_PHOTOS, - DI::l10n()->t(Photo::CONTACT_PHOTOS) + Photo::CONTACT_AVATAR, + Photo::CONTACT_BANNER )); function _map_files1($rr) @@ -121,7 +138,7 @@ function fbrowser_content(App $a) $tpl = Renderer::getMarkupTemplate($template_file); $o = Renderer::replaceMacros($tpl, [ '$type' => 'file', - '$path' => [ [ "", DI::l10n()->t("Files")] ], + '$path' => ['' => DI::l10n()->t('Files')], '$folders' => false, '$files' => $files, '$cancel' => DI::l10n()->t('Cancel'),