Remove deprecated code

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 7c412ae8fa933de4eaf16ca98cfd73ded84175ff..c3ec88fc914e576345d57d95eea964b6dac79726 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -5,8 +5,6 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -15,6 +13,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
+use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
@@ -47,13 +46,13 @@ class Widget
         */
        public static function findPeople()
        {
-               $global_dir = Config::get('system', 'directory');
+               $global_dir = DI::config()->get('system', 'directory');
 
-               if (Config::get('system', 'invitation_only')) {
+               if (DI::config()->get('system', 'invitation_only')) {
                        $x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
                        if ($x || is_site_admin()) {
                                DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
-                                       . L10n::tt('%d invitation available', '%d invitations available', $x)
+                                       . DI::l10n()->tt('%d invitation available', '%d invitations available', $x)
                                        . '</div>';
                        }
                }
@@ -84,7 +83,7 @@ class Widget
        public static function unavailableNetworks()
        {
                // Always hide content from these networks
-               $networks = ['face', 'apdn'];
+               $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET];
 
                if (!Addon::isEnabled("discourse")) {
                        $networks[] = Protocol::DISCOURSE;
@@ -102,11 +101,11 @@ class Widget
                        $networks[] = Protocol::TWITTER;
                }
 
-               if (Config::get("system", "ostatus_disabled")) {
+               if (DI::config()->get("system", "ostatus_disabled")) {
                        $networks[] = Protocol::OSTATUS;
                }
 
-               if (!Config::get("system", "diaspora_enabled")) {
+               if (!DI::config()->get("system", "diaspora_enabled")) {
                        $networks[] = Protocol::DIASPORA;
                }
 
@@ -177,7 +176,39 @@ class Widget
        }
 
        /**
-        * Return networks widget
+        * Return group membership widget
+        *
+        * @param string $baseurl
+        * @param string $selected
+        * @return string
+        * @throws \Exception
+        */
+       public static function groups($baseurl, $selected = '')
+       {
+               if (!local_user()) {
+                       return '';
+               }
+
+               $options = array_map(function ($group) {
+                       return [
+                               'ref'  => $group['id'],
+                               'name' => $group['name']
+                       ];
+               }, Group::getByUserId(local_user()));
+
+               return self::filter(
+                       'group',
+                       DI::l10n()->t('Groups'),
+                       '',
+                       DI::l10n()->t('Everyone'),
+                       $baseurl,
+                       $options,
+                       $selected
+               );
+       }
+
+       /**
+        * Return contact relationship widget
         *
         * @param string $baseurl  baseurl
         * @param string $selected optional, default empty
@@ -303,7 +334,7 @@ class Widget
        {
                $a = DI::app();
 
-               $uid = intval($a->profile['profile_uid']);
+               $uid = intval($a->profile['uid']);
 
                if (!Feature::isEnabled($uid, 'categories')) {
                        return '';
@@ -398,7 +429,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),
+                       '$desc'     => DI::l10n()->tt("%d contact in common", "%d contacts in common", $t),
                        '$base'     => DI::baseUrl(),
                        '$uid'      => $profile_uid,
                        '$cid'      => (($cid) ? $cid : '0'),
@@ -420,7 +451,7 @@ class Widget
        {
                $a = DI::app();
 
-               $uid = intval($a->profile['profile_uid']);
+               $uid = intval($a->profile['uid']);
 
                if (!$uid || !$a->profile['url']) {
                        return '';
@@ -476,7 +507,7 @@ class Widget
                                $dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
                                $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
                                $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
-                               $str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
+                               $str = DI::l10n()->getDay(DateTimeFormat::utc($dnow, 'F'));
 
                                if (empty($ret[$dyear])) {
                                        $ret[$dyear] = [];