X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=b359781ffd734b818187caaa65df898bc57ac9ba;hb=225eea2ca6d0d82d5eddd7a395e54f32c04b61fa;hp=5dd3a8bb4b163996d597902adff6f99b741f07a3;hpb=83cc56e71360c0e45f153576f8b5cbe45fd1786b;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 5dd3a8bb4b..b359781ffd 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,5 +1,11 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+
+require_once 'include/contact_selectors.php';
+
 function follow_widget($value = "") {
 
 	return replace_macros(get_markup_template('follow.tpl'), array(
@@ -16,6 +22,7 @@ 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');
@@ -35,7 +42,9 @@ function findpeople_widget() {
 		'$suggest' => t('Friend Suggestions'),
 		'$similar' => t('Similar Interests'),
 		'$random' => t('Random Profile'),
-		'$inv' => t('Invite Friends')
+		'$inv' => t('Invite Friends'),
+		'$directory' => t('View Global Directory'),
+		'$global_dir' => $global_dir
 	));
 
 }
@@ -49,7 +58,7 @@ function unavailable_networks() {
 		$networks[] = NETWORK_APPNET;
 	}
 
-	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook")) {
+	if (!plugin_enabled("fbpost") && !plugin_enabled("facebook")) {
 		$networks[] = NETWORK_FACEBOOK;
 	}
 
@@ -102,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 '';
@@ -223,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)
-			);
+			$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'];
 			}
 		}
 	}
@@ -262,7 +265,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' : ''),