Code cleanup

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 01329513bbfd04896d88a5e74ca68b8629651da2..5108eaf72390b9fec662031590ec0fba3e78e6da 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,9 +1,10 @@
 <?php
 
-use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
 
 require_once 'include/contact_selectors.php';
 
@@ -20,8 +21,6 @@ function follow_widget($value = "") {
 }
 
 function findpeople_widget() {
-       require_once 'include/Contact.php';
-
        $a = get_app();
        $global_dir = Config::get('system', 'directory');
 
@@ -233,11 +232,11 @@ function common_friends_visitor_widget($profile_uid) {
                if (get_my_url()) {
                        $r = dba::select('contact', array('id'),
                                        array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1));
-                       if (dbm::is_result($r)) {
+                       if (DBM::is_result($r)) {
                                $cid = $r['id'];
                        } else {
                                $r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
-                               if (dbm::is_result($r))
+                               if (DBM::is_result($r))
                                        $zcid = $r['id'];
                        }
                }
@@ -247,31 +246,28 @@ function common_friends_visitor_widget($profile_uid) {
                return;
        }
 
-       require_once 'include/socgraph.php';
-
        if ($cid) {
-               $t = count_common_friends($profile_uid, $cid);
+               $t = GlobalContact::countCommonFriends($profile_uid, $cid);
        } else {
-               $t = count_common_friends_zcid($profile_uid, $zcid);
+               $t = GlobalContact::countCommonFriendsZcid($profile_uid, $zcid);
        }
        if (! $t) {
                return;
        }
 
        if ($cid) {
-               $r = common_friends($profile_uid, $cid, 0, 5, true);
+               $r = GlobalContact::commonFriends($profile_uid, $cid, 0, 5, true);
        } else {
-               $r = common_friends_zcid($profile_uid, $zcid, 0, 5, true);
+               $r = GlobalContact::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)
+       );
+}