X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FWidget.php;h=f1f8f25fa34921d018123fb88e05861a2ad60226;hb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;hp=b7fa5ab4e8903f1e42c3e8a5e67405206acea80b;hpb=cb3f09ae4f344ff83fca9dc435f3cbad1972737f;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index b7fa5ab4e8..f1f8f25fa3 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,15 +10,18 @@ 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\Item;
 use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
+use Friendica\Util\Temporal;
 
 class Widget
 {
@@ -31,7 +34,7 @@ class Widget
 	 */
 	public static function follow($value = "")
 	{
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('follow.tpl'), array(
+		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'),
@@ -45,13 +48,12 @@ class Widget
 	 */
 	public static function findPeople()
 	{
-		$a = \get_app();
 		$global_dir = Config::get('system', 'directory');
 
 		if (Config::get('system', 'invitation_only')) {
-			$x = PConfig::get(local_user(), 'system', 'invites_remaining');
+			$x = intval(PConfig::get(local_user(), 'system', 'invites_remaining'));
 			if ($x || is_site_admin()) {
-				$a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
+				DI::page()['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. L10n::tt('%d invitation available', '%d invitations available', $x)
 					. '</div>';
 			}
@@ -74,7 +76,7 @@ class Widget
 		$aside = [];
 		$aside['$nv'] = $nv;
 
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside);
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/peoplefind.tpl'), $aside);
 	}
 
 	/**
@@ -85,6 +87,10 @@ class Widget
 		// Always hide content from these networks
 		$networks = ['face', 'apdn'];
 
+		if (!Addon::isEnabled("discourse")) {
+			$networks[] = Protocol::DISCOURSE;
+		}
+
 		if (!Addon::isEnabled("statusnet")) {
 			$networks[] = Protocol::STATUSNET;
 		}
@@ -120,6 +126,88 @@ class Widget
 		return $network_filter;
 	}
 
+	/**
+	 * Display a generic filter widget based on a list of options
+	 *
+	 * The options array must be the following format:
+	 * [
+	 *    [
+	 *      'ref' => {filter value},
+	 *      'name' => {option name}
+	 *    ],
+	 *    ...
+	 * ]
+	 *
+	 * @param string $type The filter query string key
+	 * @param string $title
+	 * @param string $desc
+	 * @param string $all The no filter label
+	 * @param string $baseUrl The full page request URI
+	 * @param array  $options
+	 * @param string $selected The currently selected filter option value
+	 * @return string
+	 * @throws \Exception
+	 */
+	private static function filter($type, $title, $desc, $all, $baseUrl, array $options, $selected = null)
+	{
+		$queryString = parse_url($baseUrl, PHP_URL_QUERY);
+		$queryArray = [];
+
+		if ($queryString) {
+			parse_str($queryString, $queryArray);
+			unset($queryArray[$type]);
+
+			if (count($queryArray)) {
+				$baseUrl = substr($baseUrl, 0, strpos($baseUrl, '?')) . '?' . http_build_query($queryArray) . '&';
+			} else {
+				$baseUrl = substr($baseUrl, 0, strpos($baseUrl, '?')) . '?';
+			}
+		} else {
+			$baseUrl = trim($baseUrl, '?') . '?';
+		}
+
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/filter.tpl'), [
+			'$type'      => $type,
+			'$title'     => $title,
+			'$desc'      => $desc,
+			'$selected'  => $selected,
+			'$all_label' => $all,
+			'$options'   => $options,
+			'$base'      => $baseUrl,
+		]);
+	}
+
+	/**
+	 * Return networks widget
+	 *
+	 * @param string $baseurl  baseurl
+	 * @param string $selected optional, default empty
+	 * @return string
+	 * @throws \Exception
+	 */
+	public static function contactRels($baseurl, $selected = '')
+	{
+		if (!local_user()) {
+			return '';
+		}
+
+		$options = [
+			['ref' => 'followers', 'name' => L10n::t('Followers')],
+			['ref' => 'following', 'name' => L10n::t('Following')],
+			['ref' => 'mutuals', 'name' => L10n::t('Mutual friends')],
+		];
+
+		return self::filter(
+			'rel',
+			L10n::t('Relationships'),
+			'',
+			L10n::t('All Contacts'),
+			$baseurl,
+			$options,
+			$selected
+		);
+	}
+
 	/**
 	 * Return networks widget
 	 *
@@ -146,7 +234,7 @@ class Widget
 
 		$nets = array();
 		while ($rr = DBA::fetch($r)) {
-			$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
+			$nets[] = ['ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network'])];
 		}
 		DBA::close($r);
 
@@ -154,14 +242,15 @@ class Widget
 			return '';
 		}
 
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
-			'$title' => L10n::t('Protocols'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => L10n::t('All Protocols'),
-			'$nets' => $nets,
-			'$base' => $baseurl,
-		));
+		return self::filter(
+			'nets',
+			L10n::t('Protocols'),
+			'',
+			L10n::t('All Protocols'),
+			$baseurl,
+			$nets,
+			$selected
+		);
 	}
 
 	/**
@@ -170,7 +259,7 @@ class Widget
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
 	 * @return string|void
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Exception
 	 */
 	public static function fileAs($baseurl, $selected = '')
 	{
@@ -183,25 +272,24 @@ class Widget
 			return;
 		}
 
-		$matches = false;
-		$terms = array();
-		$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
-		if ($cnt) {
-			foreach ($matches as $mtch)
-			{
-				$unescaped = XML::escape(FileTag::decode($mtch[1]));
-				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
-			}
+		$terms = [];
+		foreach (FileTag::fileToArray($saved) as $savedFolderName) {
+			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
-
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('fileas_widget.tpl'), array(
-			'$title' => L10n::t('Saved Folders'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => L10n::t('Everything'),
-			'$terms' => $terms,
-			'$base' => $baseurl,
-		));
+		
+		usort($terms, function ($a, $b) {
+			return strcmp($a['name'], $b['name']);
+		});
+
+		return self::filter(
+			'file',
+			L10n::t('Saved Folders'),
+			'',
+			L10n::t('Everything'),
+			$baseurl,
+			$terms,
+			$selected
+		);
 	}
 
 	/**
@@ -216,34 +304,31 @@ class Widget
 	{
 		$a = \get_app();
 
-		if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
+		$uid = intval($a->profile['profile_uid']);
+
+		if (!Feature::isEnabled($uid, 'categories')) {
 			return '';
 		}
 
-		$saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
+		$saved = PConfig::get($uid, 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
 		}
 
-		$matches = false;
 		$terms = array();
-		$cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER);
-
-		if ($cnt) {
-			foreach ($matches as $mtch) {
-				$unescaped = XML::escape(FileTag::decode($mtch[1]));
-				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
-			}
+		foreach (FileTag::fileToArray($saved, 'category') as $savedFolderName) {
+			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
 
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('categories_widget.tpl'), array(
-			'$title' => L10n::t('Categories'),
-			'$desc' => '',
-			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => L10n::t('Everything'),
-			'$terms' => $terms,
-			'$base' => $baseurl,
-		));
+		return self::filter(
+			'category',
+			L10n::t('Categories'),
+			'',
+			L10n::t('Everything'),
+			$baseurl,
+			$terms,
+			$selected
+		);
 	}
 
 	/**
@@ -259,16 +344,9 @@ class Widget
 			return;
 		}
 
-		$cid = $zcid = 0;
+		$zcid = 0;
 
-		if (!empty($_SESSION['remote'])) {
-			foreach ($_SESSION['remote'] as $visitor) {
-				if ($visitor['uid'] == $profile_uid) {
-					$cid = $visitor['cid'];
-					break;
-				}
-			}
-		}
+		$cid = Session::getRemoteContactID($profile_uid);
 
 		if (!$cid) {
 			if (Profile::getMyURL()) {
@@ -319,10 +397,10 @@ class Widget
 			$entries[] = $entry;
 		}
 
-		$tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl');
+		$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(),
+			'$base'     => DI::baseUrl(),
 			'$uid'      => $profile_uid,
 			'$cid'      => (($cid) ? $cid : '0'),
 			'$linkmore' => (($t > 5) ? 'true' : ''),
@@ -344,19 +422,91 @@ class Widget
 	{
 		$a = \get_app();
 
-		if (!$a->profile['profile_uid'] || !$a->profile['url']) {
+		$uid = intval($a->profile['profile_uid']);
+
+		if (!$uid || !$a->profile['url']) {
 			return '';
 		}
 
-		if (Feature::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
+		if (Feature::isEnabled($uid, 'tagadelic')) {
 			$owner_id = Contact::getIdForURL($a->profile['url'], 0, true);
 
 			if (!$owner_id) {
 				return '';
 			}
-			return Widget\TagCloud::getHTML($a->profile['profile_uid'], $limit, $owner_id, 'wall');
+			return Widget\TagCloud::getHTML($uid, $limit, $owner_id, 'wall');
 		}
 
 		return '';
 	}
+
+	/**
+	 * @param string $url Base page URL
+	 * @param int    $uid User ID consulting/publishing posts
+	 * @param bool   $wall True: Posted by User; False: Posted to User (network timeline)
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public static function postedByYear(string $url, int $uid, bool $wall)
+	{
+		$o = '';
+
+		if (!Feature::isEnabled($uid, 'archives')) {
+			return $o;
+		}
+
+		$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
+
+		/* arrange the list in years */
+		$dnow = DateTimeFormat::localNow('Y-m-d');
+
+		$ret = [];
+
+		$dthen = Item::firstPostDate($uid, $wall);
+		if ($dthen) {
+			// Set the start and end date to the beginning of the month
+			$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
+			 * month down to and including the month of the first post
+			 */
+			while (substr($dnow, 0, 7) >= substr($dthen, 0, 7)) {
+				$dyear = intval(substr($dnow, 0, 4));
+				$dstart = substr($dnow, 0, 8) . '01';
+				$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'));
+
+				if (empty($ret[$dyear])) {
+					$ret[$dyear] = [];
+				}
+
+				$ret[$dyear][] = [$str, $end_month, $start_month];
+				$dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
+			}
+		}
+
+		if (!DBA::isResult($ret)) {
+			return $o;
+		}
+
+
+		$cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
+		$cutoff = array_key_exists($cutoff_year, $ret);
+
+		$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'),[
+			'$title' => L10n::t('Archives'),
+			'$size' => $visible_years,
+			'$cutoff_year' => $cutoff_year,
+			'$cutoff' => $cutoff,
+			'$url' => $url,
+			'$dates' => $ret,
+			'$showmore' => L10n::t('show more')
+		]);
+
+		return $o;
+	}
 }