add the homepage_verified field to the profile table and the owner-view

[friendica.git] / mod / fbrowser.php

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 9bd7793e4269811798075ee876ff04cf27f57455..952ab1452c938d09dc40d60527b2caebc35d2dea 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;
@@ -20,16 +38,16 @@ use Friendica\Util\Strings;
  */
 function fbrowser_content(App $a)
 {
-       if (!local_user()) {
-               exit();
+       if (!DI::userSession()->getLocalUserId()) {
+               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
-       $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
+       $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? '');
        if ($theme && is_file("view/theme/$theme/config.php")) {
                $a->setCurrentTheme($theme);
        }
@@ -47,7 +65,7 @@ function fbrowser_content(App $a)
 
                        if (DI::args()->getArgc() == 2) {
                                $photos = DBA::toArray(DBA::p("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = ? AND NOT `photo-type` IN (?, ?)",
-                                       local_user(),
+                                       DI::userSession()->getLocalUserId(),
                                        Photo::CONTACT_AVATAR,
                                        Photo::CONTACT_BANNER
                                ));
@@ -66,7 +84,7 @@ function fbrowser_content(App $a)
                                        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 `photo-type` IN (?, ?)
                                        GROUP BY `resource-id` $sql_extra2",
-                               local_user(),
+                               DI::userSession()->getLocalUserId(),
                                Photo::CONTACT_AVATAR,
                                Photo::CONTACT_BANNER
                        ));
@@ -85,7 +103,8 @@ function fbrowser_content(App $a)
                                return [
                                        DI::baseUrl() . '/photos/' . $a->getLoggedInUserNickname() . '/image/' . $rr['resource-id'],
                                        $filename_e,
-                                       DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+                                       DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext,
+                                       $rr['desc']
                                ];
                        }
                        $files = array_map("_map_files1", $r);
@@ -105,7 +124,7 @@ function fbrowser_content(App $a)
                        break;
                case "file":
                        if (DI::args()->getArgc()==2) {
-                               $files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => local_user()]);
+                               $files = DBA::selectToArray('attach', ['id', 'filename', 'filetype'], ['uid' => DI::userSession()->getLocalUserId()]);
 
                                function _map_files2($rr)
                                {
@@ -136,7 +155,6 @@ function fbrowser_content(App $a)
        if (!empty($_GET['mode'])) {
                return $o;
        } else {
-               echo $o;
-               exit();
+               System::httpExit($o);
        }
 }