Merge pull request #8139 from MrPetovan/bug/notices

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index a1482ae943a68aab80e3427d631caf3de006fe4a..2ae90ea76d2bfa6c420f4f21221fbccaeac3ca7c 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -7,11 +7,11 @@ namespace Friendica\Content;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-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\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
@@ -21,7 +21,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
-use Friendica\Util\XML;
 
 class Widget
 {
@@ -48,13 +47,12 @@ class Widget
         */
        public static function findPeople()
        {
-               $a = \get_app();
                $global_dir = Config::get('system', 'directory');
 
                if (Config::get('system', 'invitation_only')) {
-                       $x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
+                       $x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
                        if ($x || is_site_admin()) {
-                               $a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
+                               DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
                                        . L10n::tt('%d invitation available', '%d invitations available', $x)
                                        . '</div>';
                        }
@@ -88,6 +86,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;
                }
@@ -264,7 +266,7 @@ class Widget
                        return '';
                }
 
-               $saved = PConfig::get(local_user(), 'system', 'filetags');
+               $saved = DI::pConfig()->get(local_user(), 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
                }
@@ -273,6 +275,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',
@@ -295,7 +301,7 @@ class Widget
         */
        public static function categories($baseurl, $selected = '')
        {
-               $a = \get_app();
+               $a = DI::app();
 
                $uid = intval($a->profile['profile_uid']);
 
@@ -303,7 +309,7 @@ class Widget
                        return '';
                }
 
-               $saved = PConfig::get($uid, 'system', 'filetags');
+               $saved = DI::pConfig()->get($uid, 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
                }
@@ -337,16 +343,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()) {
@@ -400,7 +399,7 @@ class Widget
                $tpl = Renderer::getMarkupTemplate('widget/remote_friends_common.tpl');
                return Renderer::replaceMacros($tpl, [
                        '$desc'     => L10n::tt("%d contact in common", "%d contacts in common", $t),
-                       '$base'     => System::baseUrl(),
+                       '$base'     => DI::baseUrl(),
                        '$uid'      => $profile_uid,
                        '$cid'      => (($cid) ? $cid : '0'),
                        '$linkmore' => (($t > 5) ? 'true' : ''),
@@ -412,7 +411,6 @@ class Widget
        /**
         * Insert a tag cloud widget for the present profile.
         *
-        * @brief Insert a tag cloud widget for the present profile.
         * @param int $limit Max number of displayed tags.
         * @return string HTML formatted output.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -420,7 +418,7 @@ class Widget
         */
        public static function tagCloud($limit = 50)
        {
-               $a = \get_app();
+               $a = DI::app();
 
                $uid = intval($a->profile['profile_uid']);
 
@@ -455,7 +453,7 @@ class Widget
                        return $o;
                }
 
-               $visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
+               $visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
 
                /* arrange the list in years */
                $dnow = DateTimeFormat::localNow('Y-m-d');