X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=b7fa5ab4e8903f1e42c3e8a5e67405206acea80b;hb=58c8959da0ece9a23966b315310a3962542bc7f4;hp=397a1863d339efadf86d739acc6ea95e3d6f3e95;hpb=0472c7b57d0bc6852e9b6eb6aeb8018c384d499f;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 397a1863d3..b7fa5ab4e8 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -4,8 +4,6 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -18,17 +16,18 @@ use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 class Widget
 {
 	/**
 	 * Return the follow widget
 	 *
 	 * @param string $value optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function follow($value = "")
 	{
@@ -46,7 +45,7 @@ class Widget
 	 */
 	public static function findPeople()
 	{
-		$a = get_app();
+		$a = \get_app();
 		$global_dir = Config::get('system', 'directory');
 
 		if (Config::get('system', 'invitation_only')) {
@@ -126,6 +125,8 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function networks($baseurl, $selected = '')
 	{
@@ -139,7 +140,7 @@ class Widget
 
 		$extra_sql = self::unavailableNetworks();
 
-		$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+		$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`",
 			local_user()
 		);
 
@@ -154,10 +155,10 @@ class Widget
 		}
 
 		return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
-			'$title' => L10n::t('Networks'),
+			'$title' => L10n::t('Protocols'),
 			'$desc' => '',
 			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => L10n::t('All Networks'),
+			'$all' => L10n::t('All Protocols'),
 			'$nets' => $nets,
 			'$base' => $baseurl,
 		));
@@ -168,6 +169,8 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function fileAs($baseurl, $selected = '')
 	{
@@ -175,10 +178,6 @@ class Widget
 			return '';
 		}
 
-		if (!Feature::isEnabled(local_user(), 'filing')) {
-			return '';
-		}
-
 		$saved = PConfig::get(local_user(), 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
@@ -210,10 +209,12 @@ class Widget
 	 *
 	 * @param string $baseurl  baseurl
 	 * @param string $selected optional, default empty
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function categories($baseurl, $selected = '')
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
 			return '';
@@ -249,6 +250,8 @@ class Widget
 	 * Return common friends visitor widget
 	 *
 	 * @param string $profile_uid uid
+	 * @return string|void
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function commonFriendsVisitor($profile_uid)
 	{
@@ -270,11 +273,11 @@ class Widget
 		if (!$cid) {
 			if (Profile::getMyURL()) {
 				$contact = DBA::selectFirst('contact', ['id'],
-						['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
+						['nurl' => Strings::normaliseLink(Profile::getMyURL()), 'uid' => $profile_uid]);
 				if (DBA::isResult($contact)) {
 					$cid = $contact['id'];
 				} else {
-					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Profile::getMyURL())]);
 					if (DBA::isResult($gcontact)) {
 						$zcid = $gcontact['id'];
 					}
@@ -302,27 +305,44 @@ class Widget
 			$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
 		}
 
-		return Renderer::replaceMacros(Renderer::getMarkupTemplate('remote_friends_common.tpl'), array(
-			'$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t),
-			'$base' => System::baseUrl(),
-			'$uid' => $profile_uid,
-			'$cid' => (($cid) ? $cid : '0'),
+		if (!DBA::isResult($r)) {
+			return;
+		}
+
+		$entries = [];
+		foreach ($r as $rr) {
+			$entry = [
+				'url'   => Contact::magicLink($rr['url']),
+				'name'  => $rr['name'],
+				'photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_THUMB),
+			];
+			$entries[] = $entry;
+		}
+
+		$tpl = Renderer::getMarkupTemplate('remote_friends_common.tpl');
+		return Renderer::replaceMacros($tpl, [
+			'$desc'     => L10n::tt("%d contact in common", "%d contacts in common", $t),
+			'$base'     => System::baseUrl(),
+			'$uid'      => $profile_uid,
+			'$cid'      => (($cid) ? $cid : '0'),
 			'$linkmore' => (($t > 5) ? 'true' : ''),
-			'$more' => L10n::t('show more'),
-			'$items' => $r)
-		);
+			'$more'     => L10n::t('show more'),
+			'$items'    => $entries
+		]);
 	}
 
 	/**
 	 * 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.
+	 * @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)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if (!$a->profile['profile_uid'] || !$a->profile['url']) {
 			return '';