X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=8dd71b8bfc7fe57398d5cd12c966a2c1a2420937;hb=d9b558a8ede11be1c486d562dfe0495902b57e6e;hp=c66a4ea9db0bb1c99b06da6d329ca356dd141a36;hpb=fa95911fdb2209907572381c62b1fa70088af634;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index c66a4ea9db..8dd71b8bfc 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,12 +10,13 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -49,25 +50,30 @@ class Widget
 		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">'
+				$a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. L10n::tt('%d invitation available', '%d invitations available', $x)
-					. '</div>' . $inv;
+					. '</div>';
 			}
 		}
 
-		return replace_macros(get_markup_template('peoplefind.tpl'), array(
-			'$findpeople' => L10n::t('Find People'),
-			'$desc' => L10n::t('Enter name or interest'),
-			'$label' => L10n::t('Connect/Follow'),
-			'$hint' => L10n::t('Examples: Robert Morgenstein, Fishing'),
-			'$findthem' => L10n::t('Find'),
-			'$suggest' => L10n::t('Friend Suggestions'),
-			'$similar' => L10n::t('Similar Interests'),
-			'$random' => L10n::t('Random Profile'),
-			'$inv' => L10n::t('Invite Friends'),
-			'$directory' => L10n::t('View Global Directory'),
-			'$global_dir' => $global_dir
-		));
+		$nv = [];
+		$nv['findpeople'] = L10n::t('Find People');
+		$nv['desc'] = L10n::t('Enter name or interest');
+		$nv['label'] = L10n::t('Connect/Follow');
+		$nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
+		$nv['findthem'] = L10n::t('Find');
+		$nv['suggest'] = L10n::t('Friend Suggestions');
+		$nv['similar'] = L10n::t('Similar Interests');
+		$nv['random'] = L10n::t('Random Profile');
+		$nv['inv'] = L10n::t('Invite Friends');
+		$nv['directory'] = L10n::t('Global Directory');
+		$nv['global_dir'] = $global_dir;
+		$nv['local_directory'] = L10n::t('Local Directory');
+
+		$aside = [];
+		$aside['$nv'] = $nv;
+
+		return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
 	}
 
 	/**
@@ -75,38 +81,31 @@ class Widget
 	 */
 	public static function unavailableNetworks()
 	{
-		$networks = array();
-
-		if (!Addon::isEnabled("appnet")) {
-			$networks[] = NETWORK_APPNET;
-		}
-
-		if (!Addon::isEnabled("fbpost") && !Addon::isEnabled("facebook")) {
-			$networks[] = NETWORK_FACEBOOK;
-		}
+		// Always hide content from these networks
+		$networks = ['face', 'apdn'];
 
 		if (!Addon::isEnabled("statusnet")) {
-			$networks[] = NETWORK_STATUSNET;
+			$networks[] = Protocol::STATUSNET;
 		}
 
 		if (!Addon::isEnabled("pumpio")) {
-			$networks[] = NETWORK_PUMPIO;
+			$networks[] = Protocol::PUMPIO;
 		}
 
 		if (!Addon::isEnabled("twitter")) {
-			$networks[] = NETWORK_TWITTER;
+			$networks[] = Protocol::TWITTER;
 		}
 
 		if (Config::get("system", "ostatus_disabled")) {
-			$networks[] = NETWORK_OSTATUS;
+			$networks[] = Protocol::OSTATUS;
 		}
 
 		if (!Config::get("system", "diaspora_enabled")) {
-			$networks[] = NETWORK_DIASPORA;
+			$networks[] = Protocol::DIASPORA;
 		}
 
 		if (!Addon::isEnabled("pnut")) {
-			$networks[] = NETWORK_PNUT;
+			$networks[] = Protocol::PNUT;
 		}
 
 		if (!sizeof($networks)) {
@@ -138,18 +137,15 @@ class Widget
 
 		$extra_sql = self::unavailableNetworks();
 
-		$r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+		$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
 			local_user()
 		);
 
 		$nets = array();
-		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' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
-			}
+		while ($rr = DBA::fetch($r)) {
+			$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		if (count($nets) < 2) {
 			return '';
@@ -190,8 +186,9 @@ class Widget
 		$terms = array();
 		$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
 		if ($cnt) {
-			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_decode($mtch[1]));
+			foreach ($matches as $mtch)
+			{
+				$unescaped = xmlify(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
@@ -231,7 +228,7 @@ class Widget
 
 		if ($cnt) {
 			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_decode($mtch[1]));
+				$unescaped = xmlify(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
@@ -259,7 +256,7 @@ class Widget
 
 		$cid = $zcid = 0;
 
-		if (is_array($_SESSION['remote'])) {
+		if (!empty($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $profile_uid) {
 					$cid = $visitor['cid'];
@@ -270,13 +267,13 @@ class Widget
 
 		if (!$cid) {
 			if (Profile::getMyURL()) {
-				$contact = dba::selectFirst('contact', ['id'],
+				$contact = DBA::selectFirst('contact', ['id'],
 						['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
-				if (DBM::is_result($contact)) {
+				if (DBA::isResult($contact)) {
 					$cid = $contact['id'];
 				} else {
-					$gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-					if (DBM::is_result($gcontact)) {
+					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+					if (DBA::isResult($gcontact)) {
 						$zcid = $gcontact['id'];
 					}
 				}
@@ -330,7 +327,7 @@ class Widget
 		}
 
 		if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
-			$owner_id = Contact::getIdForURL($a->profile['url']);
+			$owner_id = Contact::getIdForURL($a->profile['url'], 0, true);
 
 			if (!$owner_id) {
 				return '';