X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fcontact_widgets.php;h=9c44f4d15695027027a5f756f8cfb93a1f62d92f;hb=27646cc4ad8d715317a2ca055b6c3318ddf555a9;hp=744d2f2b034e0fb00fb0e2051cc34c090c4f61e4;hpb=556cc0cc4c14fc3e462a369568dc0f93257bcb04;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 744d2f2b03..9c44f4d156 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,7 +1,15 @@
 <?php
-
-use Friendica\App;
+/**
+ * @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 = "") {
 
@@ -16,13 +24,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)
@@ -71,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;
 	}
 
@@ -102,7 +108,7 @@ function networks_widget($baseurl, $selected = '') {
 		return '';
 	}
 
-	if (!feature_enabled(local_user(), 'networks')) {
+	if (!Feature::isEnabled(local_user(), 'networks')) {
 		return '';
 	}
 
@@ -113,16 +119,13 @@ function networks_widget($baseurl, $selected = '') {
 	);
 
 	$nets = array();
-	if (dbm::is_result($r)) {
-		require_once 'include/contact_selectors.php';
-		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' : '' ));
-			}
+	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);
 	}
+	dba::close($r);
 
 	if (count($nets) < 2) {
 		return '';
@@ -144,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;
 	}
@@ -178,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;
 	}
@@ -232,11 +235,11 @@ function common_friends_visitor_widget($profile_uid) {
 		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)) {
+			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))
+				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)
+	);
+}