Throw NotFoundException if results are empty in api_users_lookup

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index d47cf86c358868b9192f0a98d48652002d65dd9a..9c44f4d15695027027a5f756f8cfb93a1f62d92f 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,10 +1,13 @@
 <?php
-
-use Friendica\App;
+/**
+ * @file include/contact_widgets.php
+ */
+use Friendica\Content\Feature;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Model\GContact;
 
 require_once 'include/contact_selectors.php';
 
@@ -21,8 +24,6 @@ function follow_widget($value = "") {
 }
 
 function findpeople_widget() {
-       require_once 'include/Contact.php';
-
        $a = get_app();
        $global_dir = Config::get('system', 'directory');
 
@@ -107,7 +108,7 @@ function networks_widget($baseurl, $selected = '') {
                return '';
        }
 
-       if (!feature_enabled(local_user(), 'networks')) {
+       if (!Feature::isEnabled(local_user(), 'networks')) {
                return '';
        }
 
@@ -146,7 +147,7 @@ function fileas_widget($baseurl, $selected = '') {
                return '';
        }
 
-       if (! feature_enabled(local_user(), 'filing')) {
+       if (! Feature::isEnabled(local_user(), 'filing')) {
                return '';
        }
 
@@ -180,7 +181,7 @@ function categories_widget($baseurl, $selected = '') {
 
        $a = get_app();
 
-       if (! feature_enabled($a->profile['profile_uid'], 'categories')) {
+       if (! Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
                return '';
        }
 
@@ -248,31 +249,28 @@ function common_friends_visitor_widget($profile_uid) {
                return;
        }
 
-       require_once 'include/socgraph.php';
-
        if ($cid) {
-               $t = count_common_friends($profile_uid, $cid);
+               $t = GContact::countCommonFriends($profile_uid, $cid);
        } else {
-               $t = count_common_friends_zcid($profile_uid, $zcid);
+               $t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
        }
        if (! $t) {
                return;
        }
 
        if ($cid) {
-               $r = common_friends($profile_uid, $cid, 0, 5, true);
+               $r = GContact::commonFriends($profile_uid, $cid, 0, 5, true);
        } else {
-               $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true);
+               $r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
        }
 
        return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
-               '$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
+               '$desc' =>  sprintf(tt("%d contact in common", "%d contacts in common", $t), $t),
                '$base' => System::baseUrl(),
                '$uid' => $profile_uid,
                '$cid' => (($cid) ? $cid : '0'),
                '$linkmore' => (($t > 5) ? 'true' : ''),
                '$more' => t('show more'),
-               '$items' => $r
-       ));
-
-};
+               '$items' => $r)
+       );
+}