X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fcontact_widgets.php;h=9c44f4d15695027027a5f756f8cfb93a1f62d92f;hb=e848e376b89a6aaf35054c178c1662d4a23035fa;hp=b40e5cc4ed84d140b6867f8b01455d663d30cfba;hpb=255f38710cc524e887e64ca649de8ace9a10e9e6;p=friendica.git
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index b40e5cc4ed..9c44f4d156 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,6 +1,15 @@
page['aside'] .= '
'
. sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
@@ -38,7 +46,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 +77,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;
}
@@ -99,26 +108,24 @@ function networks_widget($baseurl, $selected = '') {
return '';
}
- if (!feature_enabled(local_user(), 'networks')) {
+ if (!Feature::isEnabled(local_user(), 'networks')) {
return '';
}
$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 '';
@@ -140,11 +147,11 @@ function fileas_widget($baseurl, $selected = '') {
return '';
}
- if (! feature_enabled(local_user(), 'filing')) {
+ if (! Feature::isEnabled(local_user(), 'filing')) {
return '';
}
- $saved = get_pconfig(local_user(), 'system', 'filetags');
+ $saved = PConfig::get(local_user(), 'system', 'filetags');
if (! strlen($saved)) {
return;
}
@@ -174,11 +181,11 @@ 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 '';
}
- $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags');
+ $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
if (! strlen($saved)) {
return;
}
@@ -226,18 +233,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 +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),
- '$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)
+ );
+}