X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=6d00c6132089c91d07e3119f1fd1b53fb7bd1c20;hb=46152ab400032cb06a6c30021e383de8a4f581ca;hp=b5ccd6f14db7640fa1561cccd3b0d6118f15b280;hpb=e56a53647bd5469551bf4f9ef2df50a5dd16b943;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index b5ccd6f14d..6d00c61320 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -25,12 +25,14 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
+use Friendica\Model\Profile;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
@@ -43,7 +45,7 @@ class Widget
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function follow($value = "")
+	public static function follow(string $value = ''): string
 	{
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/follow.tpl'), array(
 			'$connect' => DI::l10n()->t('Add New Contact'),
@@ -56,13 +58,15 @@ class Widget
 
 	/**
 	 * Return Find People widget
+	 *
+	 * @return string HTML code respresenting "People Widget"
 	 */
-	public static function findPeople()
+	public static function findPeople(): string
 	{
-		$global_dir = DI::config()->get('system', 'directory');
+		$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)
@@ -81,7 +85,7 @@ class Widget
 		$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['global_dir'] = Profile::zrl($global_dir, true);
 		$nv['local_directory'] = DI::l10n()->t('Local Directory');
 
 		$aside = [];
@@ -95,7 +99,7 @@ class Widget
 	 *
 	 * @return array Unsupported networks
 	 */
-	public static function unavailableNetworks()
+	public static function unavailableNetworks(): array
 	{
 		// Always hide content from these networks
 		$networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::ZOT];
@@ -152,7 +156,7 @@ class Widget
 	 * @return string
 	 * @throws \Exception
 	 */
-	private static function filter($type, $title, $desc, $all, $baseUrl, array $options, $selected = null)
+	private static function filter(string $type, string $title, string $desc, string $all, string $baseUrl, array $options, string $selected = null): string
 	{
 		$queryString = parse_url($baseUrl, PHP_URL_QUERY);
 		$queryArray = [];
@@ -189,9 +193,9 @@ class Widget
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function groups($baseurl, $selected = '')
+	public static function groups(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
@@ -200,7 +204,7 @@ class Widget
 				'ref'  => $group['id'],
 				'name' => $group['name']
 			];
-		}, Group::getByUserId(local_user()));
+		}, Group::getByUserId(DI::userSession()->getLocalUserId()));
 
 		return self::filter(
 			'group',
@@ -221,9 +225,9 @@ class Widget
 	 * @return string
 	 * @throws \Exception
 	 */
-	public static function contactRels($baseurl, $selected = '')
+	public static function contactRels(string $baseurl, string $selected = ''): string
 	{
-		if (!local_user()) {
+		if (!DI::userSession()->getLocalUserId()) {
 			return '';
 		}
 
@@ -252,19 +256,19 @@ class Widget
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function networks($baseurl, $selected = '')
+	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'])];
 		}
@@ -290,17 +294,17 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
-	 * @return string|void
+	 * @return string
 	 * @throws \Exception
 	 */
-	public static function fileAs($baseurl, $selected = '')
+	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];
 		}
 
@@ -318,23 +322,20 @@ class Widget
 	/**
 	 * Return categories widget
 	 *
-	 * @param string $baseurl  baseurl
-	 * @param string $selected optional, default empty
-	 * @return string|void
+	 * @param int    $uid      Id of the user owning the categories
+	 * @param string $baseurl  Base page URL
+	 * @param string $selected Selected category
+	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function categories($baseurl, $selected = '')
+	public static function categories(int $uid, string $baseurl, string $selected = ''): string
 	{
-		$a = DI::app();
-
-		$uid = intval($a->getProfileOwner());
-
 		if (!Feature::isEnabled($uid, 'categories')) {
 			return '';
 		}
 
-		$terms = array();
-		foreach (Post\Category::getArray(local_user(), Post\Category::CATEGORY) as $savedFolderName) {
+		$terms = [];
+		foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) {
 			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
 
@@ -354,17 +355,17 @@ class Widget
 	 *
 	 * @param int    $uid      Viewed profile user ID
 	 * @param string $nickname Viewed profile user nickname
-	 * @return string|void
+	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function commonFriendsVisitor(int $uid, string $nickname)
+	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 '';
 		}
@@ -415,7 +416,7 @@ class Widget
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function tagCloud(int $uid, int $limit = 50)
+	public static function tagCloud(int $uid, int $limit = 50): string
 	{
 		if (empty($uid)) {
 			return '';
@@ -440,7 +441,7 @@ class Widget
 	 * @return string
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function postedByYear(string $url, int $uid, bool $wall)
+	public static function postedByYear(string $url, int $uid, bool $wall): string
 	{
 		$o = '';
 
@@ -511,10 +512,10 @@ class Widget
 	 * The account type value is added as a parameter to the url
 	 *
 	 * @param string $base        Basepath
-	 * @param int    $accounttype Acount type
+	 * @param string $accounttype Account type
 	 * @return string
 	 */
-	public static function accounttypes(string $base, $accounttype)
+	public static function accountTypes(string $base, string $accounttype): string
 	{
 		$accounts = [
 			['ref' => 'person', 'name' => DI::l10n()->t('Persons')],