X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=9c44f4d15695027027a5f756f8cfb93a1f62d92f;hb=a817a1a070b4530eaeb07c90608e289e451c755b;hp=a7c82c33cf04c7a2c285b57837bc21ba680f1792;hpb=8b23e771714c1a2687460120bf6006430458c1f8;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index a7c82c33cf..9c44f4d156 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,8 +1,19 @@
 <?php
+/**
+ * @file include/contact_widgets.php
+ */
+use Friendica\Content\Feature;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Model\GContact;
+
+require_once 'include/contact_selectors.php';
 
 function follow_widget($value = "") {
 
-	return replace_macros(get_markup_template('follow.tpl'),array(
+	return replace_macros(get_markup_template('follow.tpl'), array(
 		'$connect' => t('Add New Contact'),
 		'$desc' => t('Enter address or web location'),
 		'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
@@ -13,20 +24,19 @@ 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($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) 
+	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)
 			. '</div>' . $inv;
 		}
 	}
- 
-	return replace_macros(get_markup_template('peoplefind.tpl'),array(
+
+	return replace_macros(get_markup_template('peoplefind.tpl'), array(
 		'$findpeople' => t('Find People'),
 		'$desc' => t('Enter name or interest'),
 		'$label' => t('Connect/Follow'),
@@ -35,7 +45,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
 	));
 
 }
@@ -45,29 +57,41 @@ function unavailable_networks() {
 
 	$networks = array();
 
-	if (!plugin_enabled("appnet"))
+	if (!plugin_enabled("appnet")) {
 		$networks[] = NETWORK_APPNET;
+	}
 
-	if (!plugin_enabled("fbpost"))
+	if (!plugin_enabled("fbpost") && !plugin_enabled("facebook")) {
 		$networks[] = NETWORK_FACEBOOK;
+	}
 
-	if (!plugin_enabled("statusnet"))
+	if (!plugin_enabled("statusnet")) {
 		$networks[] = NETWORK_STATUSNET;
+	}
 
-	if (!plugin_enabled("pumpio"))
+	if (!plugin_enabled("pumpio")) {
 		$networks[] = NETWORK_PUMPIO;
+	}
 
-	if (!plugin_enabled("twitter"))
+	if (!plugin_enabled("twitter")) {
 		$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;
+	}
 
-	if (!sizeof($networks))
+	if (!plugin_enabled("pnut")) {
+		$networks[] = NETWORK_PNUT;
+	}
+
+	if (!sizeof($networks)) {
 		return "";
+	}
 
 	$network_filter = implode("','", $networks);
 
@@ -76,35 +100,38 @@ function unavailable_networks() {
 	return $network_filter;
 }
 
-function networks_widget($baseurl,$selected = '') {
+function networks_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
-	if(!local_user())
+	if (!local_user()) {
 		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 NOT `self` $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(count($r)) {
-		require_once('include/contact_selectors.php');
-		foreach($r as $rr) {
-				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)
+	if (count($nets) < 2) {
 		return '';
+	}
 
-	return replace_macros(get_markup_template('nets.tpl'),array(
+	return replace_macros(get_markup_template('nets.tpl'), array(
 		'$title' => t('Networks'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -115,29 +142,31 @@ function networks_widget($baseurl,$selected = '') {
 	));
 }
 
-function fileas_widget($baseurl,$selected = '') {
-	$a = get_app();
-	if(! local_user())
+function fileas_widget($baseurl, $selected = '') {
+	if (! local_user()) {
 		return '';
+	}
 
-	if(! feature_enabled(local_user(),'filing'))
+	if (! Feature::isEnabled(local_user(), 'filing')) {
 		return '';
+	}
 
-	$saved = get_pconfig(local_user(),'system','filetags');
-	if(! strlen($saved))
+	$saved = PConfig::get(local_user(), 'system', 'filetags');
+	if (! strlen($saved)) {
 		return;
+	}
 
 	$matches = false;
 	$terms = array();
-    $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
-    if($cnt) {
-		foreach($matches as $mtch) {
+	$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
+	if ($cnt) {
+		foreach ($matches as $mtch) {
 			$unescaped = xmlify(file_tag_decode($mtch[1]));
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+			$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 		}
 	}
 
-	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
+	return replace_macros(get_markup_template('fileas_widget.tpl'), array(
 		'$title' => t('Saved Folders'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -148,28 +177,31 @@ function fileas_widget($baseurl,$selected = '') {
 	));
 }
 
-function categories_widget($baseurl,$selected = '') {
+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');
-	if(! strlen($saved))
+	$saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
+	if (! strlen($saved)) {
 		return;
+	}
 
 	$matches = false;
 	$terms = array();
-        $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER);
-        if($cnt) {
-                foreach($matches as $mtch) {
-		        $unescaped = xmlify(file_tag_decode($mtch[1]));
-			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+	$cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER);
+
+	if ($cnt) {
+		foreach ($matches as $mtch) {
+			$unescaped = xmlify(file_tag_decode($mtch[1]));
+			$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 		}
 	}
 
-	return replace_macros(get_markup_template('categories_widget.tpl'),array(
+	return replace_macros(get_markup_template('categories_widget.tpl'), array(
 		'$title' => t('Categories'),
 		'$desc' => '',
 		'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -184,63 +216,61 @@ function common_friends_visitor_widget($profile_uid) {
 
 	$a = get_app();
 
-	if(local_user() == $profile_uid)
+	if (local_user() == $profile_uid) {
 		return;
+	}
 
 	$cid = $zcid = 0;
 
-	if(is_array($_SESSION['remote'])) {
-		foreach($_SESSION['remote'] as $visitor) {
-			if($visitor['uid'] == $profile_uid) {
+	if (is_array($_SESSION['remote'])) {
+		foreach ($_SESSION['remote'] as $visitor) {
+			if ($visitor['uid'] == $profile_uid) {
 				$cid = $visitor['cid'];
 				break;
 			}
 		}
 	}
 
-	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(count($r))
-				$cid = $r[0]['id'];
-			else {
-				$r = q("select id from gcontact where nurl = '%s' limit 1",
-					dbesc(normalise_link(get_my_url()))
-				);
-				if(count($r))
-					$zcid = $r[0]['id'];
+	if (! $cid) {
+		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)) {
+				$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))
+					$zcid = $r['id'];
 			}
 		}
 	}
 
-	if($cid == 0 && $zcid == 0)
-		return; 
-
-	require_once('include/socgraph.php');
+	if ($cid == 0 && $zcid == 0) {
+		return;
+	}
 
-	if($cid)
-		$t = count_common_friends($profile_uid,$cid);
-	else
-		$t = count_common_friends_zcid($profile_uid,$zcid);
-	if(! $t)
+	if ($cid) {
+		$t = GContact::countCommonFriends($profile_uid, $cid);
+	} else {
+		$t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
+	}
+	if (! $t) {
 		return;
+	}
 
-	if($cid)
-		$r = common_friends($profile_uid,$cid,0,5,true);
-	else
-		$r = common_friends_zcid($profile_uid,$zcid,0,5,true);
+	if ($cid) {
+		$r = GContact::commonFriends($profile_uid, $cid, 0, 5, true);
+	} else {
+		$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' => $a->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)
+	);
+}