X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=01329513bbfd04896d88a5e74ca68b8629651da2;hb=f23469121662325745660b3e39ca31f02365a8b2;hp=e1c34b8d8fcc0f8f641446dc10e6bfcd904d1647;hpb=676e956a72354ed944d85581ad1b7b9d8cd69f60;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index e1c34b8d8f..01329513bb 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,5 +1,12 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
+require_once 'include/contact_selectors.php';
+
 function follow_widget($value = "") {
 
 	return replace_macros(get_markup_template('follow.tpl'), array(
@@ -16,11 +23,13 @@ function findpeople_widget() {
 	require_once 'include/Contact.php';
 
 	$a = get_app();
+	$global_dir = Config::get('system', 'directory');
 
-		$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)
+			. sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
 			. '</div>' . $inv;
 		}
 	}
@@ -34,7 +43,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
 	));
 
 }
@@ -48,7 +59,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;
 	}
 
@@ -64,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;
 	}
 
@@ -95,26 +106,24 @@ function networks_widget($baseurl, $selected = '') {
 		return '';
 	}
 
-	if (!feature_enabled(local_user(),'networks')) {
+	if (!feature_enabled(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 '';
@@ -136,11 +145,11 @@ function fileas_widget($baseurl, $selected = '') {
 		return '';
 	}
 
-	if (! feature_enabled(local_user(),'filing')) {
+	if (! feature_enabled(local_user(), 'filing')) {
 		return '';
 	}
 
-	$saved = get_pconfig(local_user(),'system', 'filetags');
+	$saved = PConfig::get(local_user(), 'system', 'filetags');
 	if (! strlen($saved)) {
 		return;
 	}
@@ -151,7 +160,7 @@ function fileas_widget($baseurl, $selected = '') {
 	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' : ''));
 		}
 	}
 
@@ -170,22 +179,23 @@ function categories_widget($baseurl, $selected = '') {
 
 	$a = get_app();
 
-	if (! feature_enabled($a->profile['profile_uid'],'categories')) {
+	if (! feature_enabled($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;
 	}
 
 	$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' : ''));
 		}
 	}
 
@@ -204,8 +214,9 @@ function common_friends_visitor_widget($profile_uid) {
 
 	$a = get_app();
 
-	if (local_user() == $profile_uid)
+	if (local_user() == $profile_uid) {
 		return;
+	}
 
 	$cid = $zcid = 0;
 
@@ -220,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'];
 			}
 		}
 	}
@@ -259,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' : ''),