X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=01329513bbfd04896d88a5e74ca68b8629651da2;hb=f23469121662325745660b3e39ca31f02365a8b2;hp=0b82fcb8f36b64b090fe82a99e14d07225d74123;hpb=181947f774c878f806a72de391fbab7fb5b273f5;p=friendica.git
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 0b82fcb8f3..01329513bb 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,7 +1,11 @@
page['aside'] .= '
'
. sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
@@ -71,11 +75,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;
}
@@ -108,20 +112,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 '';
@@ -147,7 +149,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;
}
@@ -181,7 +183,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;
}
@@ -229,18 +231,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)
- );
+ $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[0]['id'];
+ $cid = $r['id'];
} else {
- $r = q("select id from gcontact where nurl = '%s' limit 1",
- dbesc(normalise_link(get_my_url()))
- );
+ $r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
if (dbm::is_result($r))
- $zcid = $r[0]['id'];
+ $zcid = $r['id'];
}
}
}
@@ -268,7 +266,7 @@ function common_friends_visitor_widget($profile_uid) {
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(),
+ '$base' => System::baseUrl(),
'$uid' => $profile_uid,
'$cid' => (($cid) ? $cid : '0'),
'$linkmore' => (($t > 5) ? 'true' : ''),