X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=f4a9fbe1f1b33eddf02422c16b8270e2c367fd80;hb=122ad0af14f046c2462a03fe33967dc41abfc8b5;hp=8c72f68f4c5c651bd016a17e0caae8587a86568c;hpb=01640a7045e146759bc936dd499ac27738b78940;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 8c72f68f4c..f4a9fbe1f1 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -24,18 +24,13 @@ namespace Friendica\Content;
 use Friendica\Core\Addon;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
-use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
 class Widget
@@ -269,10 +264,6 @@ class Widget
 			return '';
 		}
 
-		if (!Feature::isEnabled(local_user(), 'networks')) {
-			return '';
-		}
-
 		$extra_sql = self::unavailableNetworks();
 
 		$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`",
@@ -379,80 +370,59 @@ class Widget
 	}
 
 	/**
-	 * Return common friends visitor widget
+	 * Show a random selection of five common contacts between the visitor and the viewed profile user.
 	 *
-	 * @param string $profile_uid uid
+	 * @param int    $uid      Viewed profile user ID
+	 * @param string $nickname Viewed profile user nickname
 	 * @return string|void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
-	public static function commonFriendsVisitor($profile_uid)
+	public static function commonFriendsVisitor(int $uid, string $nickname)
 	{
-		if (local_user() == $profile_uid) {
-			return;
-		}
-
-		$zcid = 0;
-
-		$cid = Session::getRemoteContactID($profile_uid);
-
-		if (!$cid) {
-			if (Profile::getMyURL()) {
-				$contact = DBA::selectFirst('contact', ['id'],
-						['nurl' => Strings::normaliseLink(Profile::getMyURL()), 'uid' => $profile_uid]);
-				if (DBA::isResult($contact)) {
-					$cid = $contact['id'];
-				} else {
-					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Profile::getMyURL())]);
-					if (DBA::isResult($gcontact)) {
-						$zcid = $gcontact['id'];
-					}
-				}
-			}
+		if (local_user() == $uid) {
+			return '';
 		}
 
-		if ($cid == 0 && $zcid == 0) {
-			return;
+		$visitorPCid = local_user() ? Contact::getPublicIdByUserId(local_user()) : remote_user();
+		if (!$visitorPCid) {
+			return '';
 		}
 
-		if ($cid) {
-			$t = GContact::countCommonFriends($profile_uid, $cid);
-		} else {
-			$t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
-		}
+		$localPCid = Contact::getPublicIdByUserId($uid);
 
-		if (!$t) {
-			return;
-		}
+		$condition = [
+			'NOT `self` AND NOT `blocked` AND NOT `hidden` AND `id` != ?',
+			$localPCid,
+		];
 
-		if ($cid) {
-			$r = GContact::commonFriends($profile_uid, $cid, 0, 5, true);
-		} else {
-			$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
+		$total = Contact\Relation::countCommon($localPCid, $visitorPCid, $condition);
+		if (!$total) {
+			return '';
 		}
 
-		if (!DBA::isResult($r)) {
-			return;
+		$commonContacts = Contact\Relation::listCommon($localPCid, $visitorPCid, $condition, 0, 5, true);
+		if (!DBA::isResult($commonContacts)) {
+			return '';
 		}
 
 		$entries = [];
-		foreach ($r as $rr) {
-			$entry = [
-				'url'   => Contact::magicLink($rr['url']),
-				'name'  => $rr['name'],
-				'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB),
+		foreach ($commonContacts as $contact) {
+			$entries[] = [
+				'url'   => Contact::magicLink($contact['url']),
+				'name'  => $contact['name'],
+				'photo' => Contact::getThumb($contact),
 			];
-			$entries[] = $entry;
 		}
 
 		$tpl = Renderer::getMarkupTemplate('widget/remote_friends_common.tpl');
 		return Renderer::replaceMacros($tpl, [
-			'$desc'     => DI::l10n()->tt("%d contact in common", "%d contacts in common", $t),
+			'$desc'     => DI::l10n()->tt("%d contact in common", "%d contacts in common", $total),
 			'$base'     => DI::baseUrl(),
-			'$uid'      => $profile_uid,
-			'$cid'      => (($cid) ? $cid : '0'),
-			'$linkmore' => (($t > 5) ? 'true' : ''),
+			'$nickname' => $nickname,
+			'$linkmore' => $total > 5 ? 'true' : '',
 			'$more'     => DI::l10n()->t('show more'),
-			'$items'    => $entries
+			'$contacts' => $entries
 		]);
 	}
 
@@ -475,7 +445,7 @@ class Widget
 		}
 
 		if (Feature::isEnabled($uid, 'tagadelic')) {
-			$owner_id = Contact::getIdForURL($a->profile['url'], 0, true);
+			$owner_id = Contact::getIdForURL($a->profile['url'], 0, false);
 
 			if (!$owner_id) {
 				return '';
@@ -497,10 +467,6 @@ class Widget
 	{
 		$o = '';
 
-		if (!Feature::isEnabled($uid, 'archives')) {
-			return $o;
-		}
-
 		$visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
 
 		/* arrange the list in years */
@@ -550,9 +516,31 @@ class Widget
 			'$cutoff' => $cutoff,
 			'$url' => $url,
 			'$dates' => $ret,
+			'$showless' => DI::l10n()->t('show less'),
 			'$showmore' => DI::l10n()->t('show more')
 		]);
 
 		return $o;
 	}
+
+	/**
+	 * Display the account types sidebar
+	 * The account type value is added as a parameter to the url
+	 * 
+	 * @param string $base        Basepath
+	 * @param int    $accounttype Acount type
+	 * @return string
+	 */
+	public static function accounttypes(string $base, $accounttype)
+	{
+		$accounts = [
+			['ref' => 'person', 'name' => DI::l10n()->t('Persons')],
+			['ref' => 'organisation', 'name' => DI::l10n()->t('Organisations')],
+			['ref' => 'news', 'name' => DI::l10n()->t('News')],
+			['ref' => 'community', 'name' => DI::l10n()->t('Forums')],
+		];
+
+		return self::filter('accounttype', DI::l10n()->t('Account Types'), '',
+			DI::l10n()->t('All'), $base, $accounts, $accounttype);
+	}
 }