X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=e8e70c0e11cf097fee20a05757e92f4e75674be2;hb=71b6226909aaef47ae4cfa7ba3d880cb0a73e2ef;hp=90974427965538d5425637361e7c437a21bad759;hpb=5254147ccc18417f0b16ec4d8b8325d7790b4fde;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 9097442796..e8e70c0e11 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,27 +1,41 @@
 <?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\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+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;
-use Friendica\Util\XML;
 
 class Widget
 {
@@ -35,11 +49,11 @@ class Widget
 	public static function follow($value = "")
 	{
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/follow.tpl'), array(
-			'$connect' => L10n::t('Add New Contact'),
-			'$desc' => L10n::t('Enter address or web location'),
-			'$hint' => L10n::t('Example: bob@example.com, http://example.com/barbara'),
+			'$connect' => DI::l10n()->t('Add New Contact'),
+			'$desc' => DI::l10n()->t('Enter address or web location'),
+			'$hint' => DI::l10n()->t('Example: bob@example.com, http://example.com/barbara'),
 			'$value' => $value,
-			'$follow' => L10n::t('Connect')
+			'$follow' => DI::l10n()->t('Connect')
 		));
 	}
 
@@ -48,31 +62,30 @@ class Widget
 	 */
 	public static function findPeople()
 	{
-		$a = \get_app();
-		$global_dir = Config::get('system', 'directory');
+		$global_dir = DI::config()->get('system', 'directory');
 
-		if (Config::get('system', 'invitation_only')) {
-			$x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
+		if (DI::config()->get('system', 'invitation_only')) {
+			$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
 			if ($x || is_site_admin()) {
-				$a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
-					. L10n::tt('%d invitation available', '%d invitations available', $x)
+				DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
+					. DI::l10n()->tt('%d invitation available', '%d invitations available', $x)
 					. '</div>';
 			}
 		}
 
 		$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['findpeople'] = DI::l10n()->t('Find People');
+		$nv['desc'] = DI::l10n()->t('Enter name or interest');
+		$nv['label'] = DI::l10n()->t('Connect/Follow');
+		$nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
+		$nv['findthem'] = DI::l10n()->t('Find');
+		$nv['suggest'] = DI::l10n()->t('Friend Suggestions');
+		$nv['similar'] = DI::l10n()->t('Similar Interests');
+		$nv['random'] = DI::l10n()->t('Random Profile');
+		$nv['inv'] = DI::l10n()->t('Invite Friends');
+		$nv['directory'] = DI::l10n()->t('Global Directory');
 		$nv['global_dir'] = $global_dir;
-		$nv['local_directory'] = L10n::t('Local Directory');
+		$nv['local_directory'] = DI::l10n()->t('Local Directory');
 
 		$aside = [];
 		$aside['$nv'] = $nv;
@@ -86,7 +99,11 @@ 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;
+		}
 
 		if (!Addon::isEnabled("statusnet")) {
 			$networks[] = Protocol::STATUSNET;
@@ -100,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;
 		}
 
@@ -175,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
@@ -189,16 +238,16 @@ class Widget
 		}
 
 		$options = [
-			['ref' => 'followers', 'name' => L10n::t('Followers')],
-			['ref' => 'following', 'name' => L10n::t('Following')],
-			['ref' => 'mutuals', 'name' => L10n::t('Mutual friends')],
+			['ref' => 'followers', 'name' => DI::l10n()->t('Followers')],
+			['ref' => 'following', 'name' => DI::l10n()->t('Following')],
+			['ref' => 'mutuals', 'name' => DI::l10n()->t('Mutual friends')],
 		];
 
 		return self::filter(
 			'rel',
-			L10n::t('Relationships'),
+			DI::l10n()->t('Relationships'),
 			'',
-			L10n::t('All Contacts'),
+			DI::l10n()->t('All Contacts'),
 			$baseurl,
 			$options,
 			$selected
@@ -219,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`",
@@ -241,9 +286,9 @@ class Widget
 
 		return self::filter(
 			'nets',
-			L10n::t('Protocols'),
+			DI::l10n()->t('Protocols'),
 			'',
-			L10n::t('All Protocols'),
+			DI::l10n()->t('All Protocols'),
 			$baseurl,
 			$nets,
 			$selected
@@ -264,7 +309,7 @@ class Widget
 			return '';
 		}
 
-		$saved = PConfig::get(local_user(), 'system', 'filetags');
+		$saved = DI::pConfig()->get(local_user(), 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
 		}
@@ -273,12 +318,16 @@ class Widget
 		foreach (FileTag::fileToArray($saved) as $savedFolderName) {
 			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
+		
+		usort($terms, function ($a, $b) {
+			return strcmp($a['name'], $b['name']);
+		});
 
 		return self::filter(
 			'file',
-			L10n::t('Saved Folders'),
+			DI::l10n()->t('Saved Folders'),
 			'',
-			L10n::t('Everything'),
+			DI::l10n()->t('Everything'),
 			$baseurl,
 			$terms,
 			$selected
@@ -295,15 +344,15 @@ class Widget
 	 */
 	public static function categories($baseurl, $selected = '')
 	{
-		$a = \get_app();
+		$a = DI::app();
 
-		$uid = intval($a->profile['profile_uid']);
+		$uid = intval($a->profile['uid']);
 
 		if (!Feature::isEnabled($uid, 'categories')) {
 			return '';
 		}
 
-		$saved = PConfig::get($uid, 'system', 'filetags');
+		$saved = DI::pConfig()->get($uid, 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
 		}
@@ -315,9 +364,9 @@ class Widget
 
 		return self::filter(
 			'category',
-			L10n::t('Categories'),
+			DI::l10n()->t('Categories'),
 			'',
-			L10n::t('Everything'),
+			DI::l10n()->t('Everything'),
 			$baseurl,
 			$terms,
 			$selected
@@ -339,7 +388,7 @@ class Widget
 
 		$zcid = 0;
 
-		$cid = remote_user($profile_uid);
+		$cid = Session::getRemoteContactID($profile_uid);
 
 		if (!$cid) {
 			if (Profile::getMyURL()) {
@@ -382,22 +431,23 @@ class Widget
 
 		$entries = [];
 		foreach ($r as $rr) {
+			$contact = Contact::getByURL($rr['url']);
 			$entry = [
 				'url'   => Contact::magicLink($rr['url']),
-				'name'  => $rr['name'],
-				'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB),
+				'name'  => $contact['name'] ?? $rr['name'],
+				'photo' => Contact::getThumb($contact, $rr['photo']),
 			];
 			$entries[] = $entry;
 		}
 
 		$tpl = Renderer::getMarkupTemplate('widget/remote_friends_common.tpl');
 		return Renderer::replaceMacros($tpl, [
-			'$desc'     => L10n::tt("%d contact in common", "%d contacts in common", $t),
-			'$base'     => System::baseUrl(),
+			'$desc'     => DI::l10n()->tt("%d contact in common", "%d contacts in common", $t),
+			'$base'     => DI::baseUrl(),
 			'$uid'      => $profile_uid,
 			'$cid'      => (($cid) ? $cid : '0'),
 			'$linkmore' => (($t > 5) ? 'true' : ''),
-			'$more'     => L10n::t('show more'),
+			'$more'     => DI::l10n()->t('show more'),
 			'$items'    => $entries
 		]);
 	}
@@ -405,7 +455,6 @@ class Widget
 	/**
 	 * Insert a tag cloud widget for the present profile.
 	 *
-	 * @brief Insert a tag cloud widget for the present profile.
 	 * @param int $limit Max number of displayed tags.
 	 * @return string HTML formatted output.
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -413,16 +462,16 @@ class Widget
 	 */
 	public static function tagCloud($limit = 50)
 	{
-		$a = \get_app();
+		$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 '';
@@ -444,11 +493,7 @@ class Widget
 	{
 		$o = '';
 
-		if (!Feature::isEnabled($uid, 'archives')) {
-			return $o;
-		}
-
-		$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
+		$visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
 
 		/* arrange the list in years */
 		$dnow = DateTimeFormat::localNow('Y-m-d');
@@ -471,7 +516,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] = [];
@@ -491,13 +536,13 @@ class Widget
 		$cutoff = array_key_exists($cutoff_year, $ret);
 
 		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'),[
-			'$title' => L10n::t('Archives'),
+			'$title' => DI::l10n()->t('Archives'),
 			'$size' => $visible_years,
 			'$cutoff_year' => $cutoff_year,
 			'$cutoff' => $cutoff,
 			'$url' => $url,
 			'$dates' => $ret,
-			'$showmore' => L10n::t('show more')
+			'$showmore' => DI::l10n()->t('show more')
 		]);
 
 		return $o;