X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=86339928702dadadd879f02e1dbef365d6785d8d;hb=70392df68d4e5e0881c1184e7d368593ccfa7068;hp=139fd8ebb6131b9566d62c33fbd9bcac2b4ba253;hpb=38a5358bfa646ae13a4a1a385741890fa88d9b7f;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 139fd8ebb6..8633992870 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -22,7 +22,7 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Cache\Duration;
+use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
@@ -63,7 +63,7 @@ class Widget
 
 		if (DI::config()->get('system', 'invitation_only')) {
 			$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
-			if ($x || is_site_admin()) {
+			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)
 					. '</div>';
@@ -91,12 +91,14 @@ class Widget
 	}
 
 	/**
-	 * Return unavailable networks
+	 * Return unavailable networks as array
+	 *
+	 * @return array Unsupported networks
 	 */
 	public static function unavailableNetworks()
 	{
 		// Always hide content from these networks
-		$networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET];
+		$networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET, Protocol::ZOT];
 
 		if (!Addon::isEnabled("discourse")) {
 			$networks[] = Protocol::DISCOURSE;
@@ -125,16 +127,7 @@ class Widget
 		if (!Addon::isEnabled("pnut")) {
 			$networks[] = Protocol::PNUT;
 		}
-
-		if (!sizeof($networks)) {
-			return "";
-		}
-
-		$network_filter = implode("','", $networks);
-
-		$network_filter = "AND `network` NOT IN ('$network_filter')";
-
-		return $network_filter;
+		return $networks;
 	}
 
 	/**
@@ -265,11 +258,11 @@ class Widget
 			return '';
 		}
 
-		$extra_sql = self::unavailableNetworks();
+		$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));
 
-		$r = DBA::p("SELECT `network` FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql GROUP BY `network` ORDER BY `network`",
-			local_user()
-		);
+		$r = DBA::select('contact', ['network'], $condition, ['group_by' => ['network'], 'order' => ['network']]);
 
 		$nets = array();
 		while ($rr = DBA::fetch($r)) {
@@ -325,23 +318,20 @@ class Widget
 	/**
 	 * Return categories widget
 	 *
-	 * @param string $baseurl  baseurl
-	 * @param string $selected optional, default empty
+	 * @param int    $uid      Id of the user owning the categories
+	 * @param string $baseurl  Base page URL
+	 * @param string $selected Selected category
 	 * @return string|void
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function categories($baseurl, $selected = '')
+	public static function categories(int $uid, string $baseurl, string $selected = '')
 	{
-		$a = DI::app();
-
-		$uid = intval($a->profile['uid']);
-
 		if (!Feature::isEnabled($uid, 'categories')) {
 			return '';
 		}
 
 		$terms = array();
-		foreach (Post\Category::getArray(local_user(), Post\Category::CATEGORY) as $savedFolderName) {
+		foreach (Post\Category::getArray($uid, Post\Category::CATEGORY) as $savedFolderName) {
 			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
 
@@ -416,23 +406,20 @@ class Widget
 	/**
 	 * Insert a tag cloud widget for the present profile.
 	 *
+	 * @param int $uid   User ID
 	 * @param int $limit Max number of displayed tags.
 	 * @return string HTML formatted output.
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public static function tagCloud($limit = 50)
+	public static function tagCloud(int $uid, int $limit = 50)
 	{
-		$a = DI::app();
-
-		$uid = intval($a->profile['uid']);
-
-		if (!$uid || !$a->profile['url']) {
+		if (empty($uid)) {
 			return '';
 		}
 
 		if (Feature::isEnabled($uid, 'tagadelic')) {
-			$owner_id = Contact::getIdForURL($a->profile['url'], 0, false);
+			$owner_id = Contact::getPublicIdByUserId($uid);
 
 			if (!$owner_id) {
 				return '';
@@ -519,7 +506,7 @@ class Widget
 	/**
 	 * Display the account types sidebar
 	 * The account type value is added as a parameter to the url
-	 * 
+	 *
 	 * @param string $base        Basepath
 	 * @param int    $accounttype Acount type
 	 * @return string