Merge pull request #12976 from annando/npf2

[friendica.git] / src / Content / Widget.php

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index a2a3b3257b583d8b329e2b7ac297d4d0918c1e93..b198d54cf143f7d8dc851033b7c7557d14b76367 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -59,14 +59,14 @@ class Widget
        /**
         * Return Find People widget
         *
-        * @return string HTML code respresenting "People Widget"
+        * @return string HTML code representing "People Widget"
         */
        public static function findPeople(): string
        {
                $global_dir = Search::getGlobalDirectory();
 
                if (DI::config()->get('system', 'invitation_only')) {
-                       $x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
+                       $x = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'invites_remaining'));
                        if ($x || DI::app()->isSiteAdmin()) {
                                DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
                                        . DI::l10n()->tt('%d invitation available', '%d invitations available', $x)
@@ -195,7 +195,7 @@ class Widget
         */
        public static function groups(string $baseurl, string $selected = ''): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return '';
                }
 
@@ -204,7 +204,7 @@ class Widget
                                'ref'  => $group['id'],
                                'name' => $group['name']
                        ];
-               }, Group::getByUserId(local_user()));
+               }, Group::getByUserId(DI::userSession()->getLocalUserId()));
 
                return self::filter(
                        'group',
@@ -225,9 +225,9 @@ class Widget
         * @return string
         * @throws \Exception
         */
-       public static function contactRels($baseurl, $selected = '')
+       public static function contactRels(string $baseurl, string $selected = ''): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return '';
                }
 
@@ -256,19 +256,19 @@ class Widget
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function networks($baseurl, $selected = '')
+       public static function networks(string $baseurl, string $selected = ''): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return '';
                }
 
                $networks = self::unavailableNetworks();
                $query = "`uid` = ? AND NOT `deleted` AND `network` != '' AND NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")";
-               $condition = array_merge([$query], array_merge([local_user()], $networks));
+               $condition = array_merge([$query], array_merge([DI::userSession()->getLocalUserId()], $networks));
 
                $r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]);
 
-               $nets = array();
+               $nets = [];
                while ($rr = DBA::fetch($r)) {
                        $nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])];
                }
@@ -294,17 +294,17 @@ class Widget
         *
         * @param string $baseurl  baseurl
         * @param string $selected optional, default empty
-        * @return string|void
+        * @return string
         * @throws \Exception
         */
-       public static function fileAs($baseurl, $selected = '')
+       public static function fileAs(string $baseurl, string $selected = ''): string
        {
-               if (!local_user()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return '';
                }
 
                $terms = [];
-               foreach (Post\Category::getArray(local_user(), Post\Category::FILE) as $savedFolderName) {
+               foreach (Post\Category::getArray(DI::userSession()->getLocalUserId(), Post\Category::FILE) as $savedFolderName) {
                        $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
                }
 
@@ -325,16 +325,16 @@ class Widget
         * @param int    $uid      Id of the user owning the categories
         * @param string $baseurl  Base page URL
         * @param string $selected Selected category
-        * @return string|void
+        * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function categories(int $uid, string $baseurl, string $selected = '')
+       public static function categories(int $uid, string $baseurl, string $selected = ''): string
        {
                if (!Feature::isEnabled($uid, 'categories')) {
                        return '';
                }
 
-               $terms = array();
+               $terms = [];
                foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) {
                        $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
                }
@@ -355,17 +355,17 @@ class Widget
         *
         * @param int    $uid      Viewed profile user ID
         * @param string $nickname Viewed profile user nickname
-        * @return string|void
+        * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function commonFriendsVisitor(int $uid, string $nickname)
+       public static function commonFriendsVisitor(int $uid, string $nickname): string
        {
-               if (local_user() == $uid) {
+               if (DI::userSession()->getLocalUserId() == $uid) {
                        return '';
                }
 
-               $visitorPCid = local_user() ? Contact::getPublicIdByUserId(local_user()) : remote_user();
+               $visitorPCid = DI::userSession()->getPublicContactId() ?: DI::userSession()->getRemoteUserId();
                if (!$visitorPCid) {
                        return '';
                }
@@ -416,7 +416,7 @@ class Widget
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function tagCloud(int $uid, int $limit = 50)
+       public static function tagCloud(int $uid, int $limit = 50): string
        {
                if (empty($uid)) {
                        return '';
@@ -441,7 +441,7 @@ class Widget
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function postedByYear(string $url, int $uid, bool $wall)
+       public static function postedByYear(string $url, int $uid, bool $wall): string
        {
                $o = '';
 
@@ -512,10 +512,10 @@ class Widget
         * The account type value is added as a parameter to the url
         *
         * @param string $base        Basepath
-        * @param int    $accounttype Acount type
+        * @param string $accounttype Account type
         * @return string
         */
-       public static function accounttypes(string $base, $accounttype)
+       public static function accountTypes(string $base, string $accounttype): string
        {
                $accounts = [
                        ['ref' => 'person', 'name' => DI::l10n()->t('Persons')],