Merge pull request #11575 from annando/issue-11469

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index c68b44a1ed8cc3bb940ed704bc16288ca696cbd2..81284d6b91ef27d654d9c078d2333ab295b41176 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -1,5 +1,22 @@
 <?php
 /**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  * @package            Friendica\modules
  * @subpackage FileBrowser
  * @author             Fabio Comuni <fabrixxm@kirgroup.com>
@@ -7,6 +24,7 @@
 
 use Friendica\App;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Photo;
@@ -21,11 +39,11 @@ use Friendica\Util\Strings;
 function fbrowser_content(App $a)
 {
        if (!local_user()) {
-               exit();
+               System::exit();
        }
 
        if (DI::args()->getArgc() == 1) {
-               exit();
+               System::exit();
        }
 
        // Needed to match the correct template in a module that uses a different theme than the user/site/default
@@ -46,10 +64,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 +82,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 +139,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'),
@@ -136,7 +154,6 @@ function fbrowser_content(App $a)
        if (!empty($_GET['mode'])) {
                return $o;
        } else {
-               echo $o;
-               exit();
+               System::httpExit($o);
        }
 }