Code cleanup

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index fc1f7191badee36d998378eda4fce099aea874ea..5108eaf72390b9fec662031590ec0fba3e78e6da 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,6 +1,12 @@
 <?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';
 
 function follow_widget($value = "") {
 
@@ -15,12 +21,11 @@ function follow_widget($value = "") {
 }
 
 function findpeople_widget() {
-       require_once 'include/Contact.php';
-
        $a = get_app();
+       $global_dir = Config::get('system', 'directory');
 
-       if (get_config('system', 'invitation_only')) {
-               $x = get_pconfig(local_user(), 'system', 'invites_remaining');
+       if (Config::get('system', 'invitation_only')) {
+               $x = PConfig::get(local_user(), 'system', 'invites_remaining');
                if ($x || is_site_admin()) {
                        $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
                        . sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
@@ -38,7 +43,8 @@ function findpeople_widget() {
                '$similar' => t('Similar Interests'),
                '$random' => t('Random Profile'),
                '$inv' => t('Invite Friends'),
-               '$directory' => t('View Global Directory')
+               '$directory' => t('View Global Directory'),
+               '$global_dir' => $global_dir
        ));
 
 }
@@ -68,11 +74,11 @@ function unavailable_networks() {
                $networks[] = NETWORK_TWITTER;
        }
 
-       if (get_config("system", "ostatus_disabled")) {
+       if (Config::get("system", "ostatus_disabled")) {
                $networks[] = NETWORK_OSTATUS;
        }
 
-       if (!get_config("system", "diaspora_enabled")) {
+       if (!Config::get("system", "diaspora_enabled")) {
                $networks[] = NETWORK_DIASPORA;
        }
 
@@ -105,20 +111,18 @@ function networks_widget($baseurl, $selected = '') {
 
        $extra_sql = unavailable_networks();
 
-       $r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
-               intval(local_user())
+       $r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+               local_user()
        );
 
        $nets = array();
-       if (dbm::is_result($r)) {
-               require_once 'include/contact_selectors.php';
-               foreach ($r as $rr) {
-                       /// @TODO If 'network' is not there, this triggers an E_NOTICE
-                       if ($rr['network']) {
-                               $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
-                       }
+       while ($rr = dba::fetch($r)) {
+               /// @TODO If 'network' is not there, this triggers an E_NOTICE
+               if ($rr['network']) {
+                       $nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
                }
        }
+       dba::close($r);
 
        if (count($nets) < 2) {
                return '';
@@ -144,7 +148,7 @@ function fileas_widget($baseurl, $selected = '') {
                return '';
        }
 
-       $saved = get_pconfig(local_user(), 'system', 'filetags');
+       $saved = PConfig::get(local_user(), 'system', 'filetags');
        if (! strlen($saved)) {
                return;
        }
@@ -178,7 +182,7 @@ function categories_widget($baseurl, $selected = '') {
                return '';
        }
 
-       $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags');
+       $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
        if (! strlen($saved)) {
                return;
        }
@@ -226,18 +230,14 @@ function common_friends_visitor_widget($profile_uid) {
 
        if (! $cid) {
                if (get_my_url()) {
-                       $r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
-                               dbesc(normalise_link(get_my_url())),
-                               intval($profile_uid)
-                       );
-                       if (dbm::is_result($r)) {
-                               $cid = $r[0]['id'];
+                       $r = dba::select('contact', array('id'),
+                                       array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1));
+                       if (DBM::is_result($r)) {
+                               $cid = $r['id'];
                        } else {
-                               $r = q("select id from gcontact where nurl = '%s' limit 1",
-                                       dbesc(normalise_link(get_my_url()))
-                               );
-                               if (dbm::is_result($r))
-                                       $zcid = $r[0]['id'];
+                               $r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
+                               if (DBM::is_result($r))
+                                       $zcid = $r['id'];
                        }
                }
        }
@@ -246,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),
-               '$base' => App::get_baseurl(),
+               '$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)
+       );
+}