Update function / rearrange tab order

[friendica.git] / src / Module / Circle.php

diff --git a/src/Module/Circle.php b/src/Module/Circle.php
index 74d52ee6299c3027c791dd9acb2fe356f7c2e0e6..a51583ae9f23d8e25df4129dc51f7d3c9d69443c 100644 (file)
--- a/src/Module/Circle.php
+++ b/src/Module/Circle.php
@@ -22,6 +22,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
+use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -146,8 +147,6 @@ class Circle extends BaseModule
                        throw new \Friendica\Network\HTTPException\ForbiddenException();
                }
 
-               $a = DI::app();
-
                DI::page()['aside'] = Model\Circle::sidebarWidget('contact', 'circle', 'extended', ((DI::args()->getArgc() > 1) ? DI::args()->getArgv()[1] : 'everyone'));
 
                // With no circle number provided we jump to the unassigned contacts as a starting point
@@ -319,11 +318,13 @@ class Circle extends BaseModule
                if ($nocircle) {
                        $contacts = Model\Contact\Circle::listUncircled(DI::userSession()->getLocalUserId());
                } else {
-                       $contacts_stmt = DBA::select('contact', [],
-                               ['rel' => [Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING],
-                               'uid' => DI::userSession()->getLocalUserId(), 'pending' => false, 'blocked' => false, 'failed' => false, 'self' => false],
-                               ['order' => ['name']]
-                       );
+                       $networks = Widget::unavailableNetworks();
+                       $query = "`uid` = ? AND NOT `self` AND NOT `deleted` AND NOT `blocked` AND NOT `pending` AND NOT `failed`
+                               AND `rel` IN (?, ?, ?)
+                               AND NOT `network` IN (" . substr(str_repeat('?, ', count($networks)), 0, -2) . ")";
+                       $condition = array_merge([$query], [DI::userSession()->getLocalUserId(), Model\Contact::FOLLOWER, Model\Contact::FRIEND, Model\Contact::SHARING], $networks);
+
+                       $contacts_stmt = DBA::select('contact', [], $condition, ['order' => ['name']]);
                        $contacts = DBA::toArray($contacts_stmt);
                        $context['$desc'] = DI::l10n()->t('Click on a contact to add or remove.');
                }