Merge pull request #7943 from MrPetovan/bug/7920-api-fix-followers-friends-ids

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index dcfc1d0e3d95da631db6899dc781c10eff9f017c..b1e925a6621511c1d2605eb34ee81fb4c9ca9c39 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -11,6 +11,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
@@ -52,7 +53,7 @@ class Widget
                $global_dir = Config::get('system', 'directory');
 
                if (Config::get('system', 'invitation_only')) {
-                       $x = PConfig::get(local_user(), 'system', 'invites_remaining');
+                       $x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
                        if ($x || is_site_admin()) {
                                $a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
                                        . L10n::tt('%d invitation available', '%d invitations available', $x)
@@ -88,6 +89,10 @@ class Widget
                // Always hide content from these networks
                $networks = ['face', 'apdn'];
 
+               if (!Addon::isEnabled("discourse")) {
+                       $networks[] = Protocol::DISCOURSE;
+               }
+
                if (!Addon::isEnabled("statusnet")) {
                        $networks[] = Protocol::STATUSNET;
                }
@@ -273,6 +278,10 @@ class Widget
                foreach (FileTag::fileToArray($saved) as $savedFolderName) {
                        $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
                }
+               
+               usort($terms, function ($a, $b) {
+                       return strcmp($a['name'], $b['name']);
+               });
 
                return self::filter(
                        'file',
@@ -297,11 +306,13 @@ class Widget
        {
                $a = \get_app();
 
-               if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
+               $uid = intval($a->profile['profile_uid']);
+
+               if (!Feature::isEnabled($uid, 'categories')) {
                        return '';
                }
 
-               $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
+               $saved = PConfig::get($uid, 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
                }
@@ -335,16 +346,9 @@ class Widget
                        return;
                }
 
-               $cid = $zcid = 0;
+               $zcid = 0;
 
-               if (!empty($_SESSION['remote'])) {
-                       foreach ($_SESSION['remote'] as $visitor) {
-                               if ($visitor['uid'] == $profile_uid) {
-                                       $cid = $visitor['cid'];
-                                       break;
-                               }
-                       }
-               }
+               $cid = Session::getRemoteContactID($profile_uid);
 
                if (!$cid) {
                        if (Profile::getMyURL()) {
@@ -420,17 +424,19 @@ class Widget
        {
                $a = \get_app();
 
-               if (!$a->profile['profile_uid'] || !$a->profile['url']) {
+               $uid = intval($a->profile['profile_uid']);
+
+               if (!$uid || !$a->profile['url']) {
                        return '';
                }
 
-               if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
+               if (Feature::isEnabled($uid, 'tagadelic')) {
                        $owner_id = Contact::getIdForURL($a->profile['url'], 0, true);
 
                        if (!$owner_id) {
                                return '';
                        }
-                       return Widget\TagCloud::getHTML($a->profile['profile_uid'], $limit, $owner_id, 'wall');
+                       return Widget\TagCloud::getHTML($uid, $limit, $owner_id, 'wall');
                }
 
                return '';