X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=a7ce52cc466107f8ecaa1cbf1b9eb7c3ad799d24;hb=5e0b4b8a8f39f28fcfc2812e66223d95c92431a0;hp=496bbfcb68f4a4d9e9d3ba7b2f0748c9b8979401;hpb=a9a36fb3029c9a5d595aa28a9f0a79f441d1b121;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 496bbfcb68..a7ce52cc46 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,12 +1,27 @@
 <?php
 /**
- * @file src/Content/Widget.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Content;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -15,10 +30,10 @@ 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;
 
@@ -47,9 +62,9 @@ class Widget
 	 */
 	public static function findPeople()
 	{
-		$global_dir = Config::get('system', 'directory');
+		$global_dir = DI::config()->get('system', 'directory');
 
-		if (Config::get('system', 'invitation_only')) {
+		if (DI::config()->get('system', 'invitation_only')) {
 			$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
 			if ($x || is_site_admin()) {
 				DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
@@ -84,7 +99,7 @@ class Widget
 	public static function unavailableNetworks()
 	{
 		// Always hide content from these networks
-		$networks = ['face', 'apdn'];
+		$networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET];
 
 		if (!Addon::isEnabled("discourse")) {
 			$networks[] = Protocol::DISCOURSE;
@@ -102,11 +117,11 @@ class Widget
 			$networks[] = Protocol::TWITTER;
 		}
 
-		if (Config::get("system", "ostatus_disabled")) {
+		if (DI::config()->get("system", "ostatus_disabled")) {
 			$networks[] = Protocol::OSTATUS;
 		}
 
-		if (!Config::get("system", "diaspora_enabled")) {
+		if (!DI::config()->get("system", "diaspora_enabled")) {
 			$networks[] = Protocol::DIASPORA;
 		}
 
@@ -177,7 +192,39 @@ class Widget
 	}
 
 	/**
-	 * Return networks widget
+	 * Return group membership widget
+	 *
+	 * @param string $baseurl
+	 * @param string $selected
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function groups($baseurl, $selected = '')
+	{
+		if (!local_user()) {
+			return '';
+		}
+
+		$options = array_map(function ($group) {
+			return [
+				'ref'  => $group['id'],
+				'name' => $group['name']
+			];
+		}, Group::getByUserId(local_user()));
+
+		return self::filter(
+			'group',
+			DI::l10n()->t('Groups'),
+			'',
+			DI::l10n()->t('Everyone'),
+			$baseurl,
+			$options,
+			$selected
+		);
+	}
+
+	/**
+	 * Return contact relationship widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
@@ -221,10 +268,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`",
@@ -303,7 +346,7 @@ class Widget
 	{
 		$a = DI::app();
 
-		$uid = intval($a->profile['profile_uid']);
+		$uid = intval($a->profile['uid']);
 
 		if (!Feature::isEnabled($uid, 'categories')) {
 			return '';
@@ -331,80 +374,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;
+		if (local_user() == $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'];
-					}
-				}
-			}
+		$visitorPCid = local_user() ? Contact::getPublicIdByUserId(local_user()) : remote_user();
+		if (!$visitorPCid) {
+			return '';
 		}
 
-		if ($cid == 0 && $zcid == 0) {
-			return;
-		}
+		$localPCid = Contact::getPublicIdByUserId($uid);
 
-		if ($cid) {
-			$t = GContact::countCommonFriends($profile_uid, $cid);
-		} else {
-			$t = GContact::countCommonFriendsZcid($profile_uid, $zcid);
-		}
-
-		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
 		]);
 	}
 
@@ -420,14 +442,14 @@ class Widget
 	{
 		$a = DI::app();
 
-		$uid = intval($a->profile['profile_uid']);
+		$uid = intval($a->profile['uid']);
 
 		if (!$uid || !$a->profile['url']) {
 			return '';
 		}
 
 		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 '';
@@ -449,10 +471,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 */
@@ -476,7 +494,7 @@ class Widget
 				$dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
 				$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
 				$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
-				$str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
+				$str = DI::l10n()->getDay(DateTimeFormat::utc($dnow, 'F'));
 
 				if (empty($ret[$dyear])) {
 					$ret[$dyear] = [];