X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=c18a3041b0568c799a35d10c15954e66a7e1b84d;hb=353be860b700784a0b3ccf9284a22482b90b8ddf;hp=fba027680c7f84f169edf330464273446438413e;hpb=ef5d178e008e72c4afb9ac2fe121140f452d9829;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index fba027680c..c18a3041b0 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -29,7 +29,7 @@ use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Group;
+use Friendica\Model\Circle;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
@@ -59,14 +59,14 @@ class Widget
 	/**
 	 * Return Find People widget
 	 *
-	 * @return string HTML code respresenting "People Widget"
+	 * @return string HTML code representing "People Widget"
 	 */
 	public static function findPeople(): string
 	{
 		$global_dir = Search::getGlobalDirectory();
 
 		if (DI::config()->get('system', 'invitation_only')) {
-			$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
+			$x = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'invites_remaining'));
 			if ($x || DI::app()->isSiteAdmin()) {
 				DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. DI::l10n()->tt('%d invitation available', '%d invitations available', $x)
@@ -120,6 +120,10 @@ class Widget
 			$networks[] = Protocol::TWITTER;
 		}
 
+		if (!Addon::isEnabled("tumblr")) {
+			$networks[] = Protocol::TUMBLR;
+		}
+
 		if (DI::config()->get("system", "ostatus_disabled")) {
 			$networks[] = Protocol::OSTATUS;
 		}
@@ -174,6 +178,10 @@ class Widget
 			$baseUrl = trim($baseUrl, '?') . '?';
 		}
 
+		array_walk($options, function (&$value) {
+			$value['ref'] = rawurlencode($value['ref']);
+		});
+
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/filter.tpl'), [
 			'$type'      => $type,
 			'$title'     => $title,
@@ -186,29 +194,29 @@ class Widget
 	}
 
 	/**
-	 * Return group membership widget
+	 * Return circle membership widget
 	 *
 	 * @param string $baseurl
 	 * @param string $selected
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function groups(string $baseurl, string $selected = ''): string
+	public static function circles(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
-		$options = array_map(function ($group) {
+		$options = array_map(function ($circle) {
 			return [
-				'ref'  => $group['id'],
-				'name' => $group['name']
+				'ref'  => $circle['id'],
+				'name' => $circle['name']
 			];
-		}, Group::getByUserId(local_user()));
+		}, Circle::getByUserId(DI::userSession()->getLocalUserId()));
 
 		return self::filter(
-			'group',
-			DI::l10n()->t('Groups'),
+			'circle',
+			DI::l10n()->t('Circles'),
 			'',
 			DI::l10n()->t('Everyone'),
 			$baseurl,
@@ -227,7 +235,7 @@ class Widget
 	 */
 	public static function contactRels(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
@@ -235,6 +243,7 @@ class Widget
 			['ref' => 'followers', 'name' => DI::l10n()->t('Followers')],
 			['ref' => 'following', 'name' => DI::l10n()->t('Following')],
 			['ref' => 'mutuals', 'name' => DI::l10n()->t('Mutual friends')],
+			['ref' => 'nothing', 'name' => DI::l10n()->t('No relationship')],
 		];
 
 		return self::filter(
@@ -258,17 +267,17 @@ class Widget
 	 */
 	public static function networks(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
 		$networks = self::unavailableNetworks();
 		$query = "`uid` = ? AND NOT `deleted` AND `network` != '' AND NOT `network` IN (" . substr(str_repeat("?, ", count($networks)), 0, -2) . ")";
-		$condition = array_merge([$query], array_merge([local_user()], $networks));
+		$condition = array_merge([$query], array_merge([DI::userSession()->getLocalUserId()], $networks));
 
 		$r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]);
 
-		$nets = array();
+		$nets = [];
 		while ($rr = DBA::fetch($r)) {
 			$nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])];
 		}
@@ -299,12 +308,12 @@ class Widget
 	 */
 	public static function fileAs(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
 		$terms = [];
-		foreach (Post\Category::getArray(local_user(), Post\Category::FILE) as $savedFolderName) {
+		foreach (Post\Category::getArray(DI::userSession()->getLocalUserId(), Post\Category::FILE) as $savedFolderName) {
 			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
 
@@ -334,7 +343,7 @@ class Widget
 			return '';
 		}
 
-		$terms = array();
+		$terms = [];
 		foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) {
 			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
@@ -361,11 +370,11 @@ class Widget
 	 */
 	public static function commonFriendsVisitor(int $uid, string $nickname): string
 	{
-		if (local_user() == $uid) {
+		if (DI::userSession()->getLocalUserId() == $uid) {
 			return '';
 		}
 
-		$visitorPCid = local_user() ? Contact::getPublicIdByUserId(local_user()) : remote_user();
+		$visitorPCid = DI::userSession()->getPublicContactId() ?: DI::userSession()->getRemoteUserId();
 		if (!$visitorPCid) {
 			return '';
 		}
@@ -461,8 +470,13 @@ class Widget
 
 		if ($dthen) {
 			// Set the start and end date to the beginning of the month
+			$cutoffday = $dthen;
+			$thisday = substr($dnow, 4);
+			$nextday = date('Y-m-d', strtotime($dnow . ' + 1 day'));
+			$nextday = substr($nextday, 4);
 			$dnow = substr($dnow, 0, 8) . '01';
 			$dthen = substr($dthen, 0, 8) . '01';
+			
 
 			/*
 			 * Starting with the current month, get the first and last days of every
@@ -482,6 +496,7 @@ class Widget
 
 				$ret[$dyear][] = [$str, $end_month, $start_month];
 				$dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
+				
 			}
 		}
 
@@ -501,7 +516,11 @@ class Widget
 			'$url' => $url,
 			'$dates' => $ret,
 			'$showless' => DI::l10n()->t('show less'),
-			'$showmore' => DI::l10n()->t('show more')
+			'$showmore' => DI::l10n()->t('show more'),
+			'$onthisdate' => DI::l10n()->t('On this date'),
+			'$thisday' => $thisday,
+			'$nextday' => $nextday,
+			'$cutoffday' => $cutoffday
 		]);
 
 		return $o;
@@ -521,7 +540,7 @@ class Widget
 			['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')],
+			['ref' => 'community', 'name' => DI::l10n()->t('Groups')],
 		];
 
 		return self::filter('accounttype', DI::l10n()->t('Account Types'), '',