Rewrite Proxy module

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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index ab9bb8882893f148868b490363c36eadc1ef8a3c..adf6545b43c4a83ad8d2f7e09dc7eb466adcfcf3 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -18,12 +18,10 @@ use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 class Widget
 {
        /**
@@ -47,7 +45,7 @@ class Widget
         */
        public static function findPeople()
        {
-               $a = get_app();
+               $a = \get_app();
                $global_dir = Config::get('system', 'directory');
 
                if (Config::get('system', 'invitation_only')) {
@@ -140,7 +138,7 @@ class Widget
 
                $extra_sql = self::unavailableNetworks();
 
-               $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+               $r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`",
                        local_user()
                );
 
@@ -176,10 +174,6 @@ class Widget
                        return '';
                }
 
-               if (!Feature::isEnabled(local_user(), 'filing')) {
-                       return '';
-               }
-
                $saved = PConfig::get(local_user(), 'system', 'filetags');
                if (!strlen($saved)) {
                        return;
@@ -214,7 +208,7 @@ class Widget
         */
        public static function categories($baseurl, $selected = '')
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
                        return '';
@@ -303,15 +297,30 @@ class Widget
                        $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
                }
 
-               return Renderer::replaceMacros(Renderer::getMarkupTemplate('remote_friends_common.tpl'), array(
-                       '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t),
-                       '$base' => System::baseUrl(),
-                       '$uid' => $profile_uid,
-                       '$cid' => (($cid) ? $cid : '0'),
+               if (!DBA::isResult($r)) {
+                       return;
+               }
+
+               $entries = [];
+               foreach ($r as $rr) {
+                       $entry = [
+                               'url'   => Contact::magicLink($rr['url']),
+                               'name'  => $rr['name'],
+                               'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB),
+                       ];
+                       $entries[] = $entry;
+               }
+
+               $tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl');
+               return Renderer::replaceMacros($tpl, [
+                       '$desc'     => L10n::tt("%d contact in common", "%d contacts in common", $t),
+                       '$base'     => System::baseUrl(),
+                       '$uid'      => $profile_uid,
+                       '$cid'      => (($cid) ? $cid : '0'),
                        '$linkmore' => (($t > 5) ? 'true' : ''),
-                       '$more' => L10n::t('show more'),
-                       '$items' => $r)
-               );
+                       '$more'     => L10n::t('show more'),
+                       '$items'    => $entries
+               ]);
        }
 
        /**
@@ -323,7 +332,7 @@ class Widget
         */
        public static function tagCloud($limit = 50)
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!$a->profile['profile_uid'] || !$a->profile['url']) {
                        return '';