X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=adf6545b43c4a83ad8d2f7e09dc7eb466adcfcf3;hb=7b78ba392952a00aff12ea1c9a312eb60388c829;hp=8dd71b8bfc7fe57398d5cd12c966a2c1a2420937;hpb=fed444de17ac933c7601acabba24afbbd02f4e5c;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 8dd71b8bfc..adf6545b43 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -11,15 +11,16 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-
-require_once 'boot.php';
-require_once 'include/dba.php';
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
+use Friendica\Util\XML;
 
 class Widget
 {
@@ -30,7 +31,7 @@ class Widget
 	 */
 	public static function follow($value = "")
 	{
-		return replace_macros(get_markup_template('follow.tpl'), array(
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('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'),
@@ -44,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')) {
@@ -73,7 +74,7 @@ class Widget
 		$aside = [];
 		$aside['$nv'] = $nv;
 
-		return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside);
 	}
 
 	/**
@@ -137,7 +138,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()
 		);
 
@@ -151,11 +152,11 @@ class Widget
 			return '';
 		}
 
-		return replace_macros(get_markup_template('nets.tpl'), array(
-			'$title' => L10n::t('Networks'),
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
+			'$title' => L10n::t('Protocols'),
 			'$desc' => '',
 			'$sel_all' => (($selected == '') ? 'selected' : ''),
-			'$all' => L10n::t('All Networks'),
+			'$all' => L10n::t('All Protocols'),
 			'$nets' => $nets,
 			'$base' => $baseurl,
 		));
@@ -173,10 +174,6 @@ class Widget
 			return '';
 		}
 
-		if (!Feature::isEnabled(local_user(), 'filing')) {
-			return '';
-		}
-
 		$saved = PConfig::get(local_user(), 'system', 'filetags');
 		if (!strlen($saved)) {
 			return;
@@ -188,12 +185,12 @@ class Widget
 		if ($cnt) {
 			foreach ($matches as $mtch)
 			{
-				$unescaped = xmlify(FileTag::decode($mtch[1]));
+				$unescaped = XML::escape(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
 
-		return replace_macros(get_markup_template('fileas_widget.tpl'), array(
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('fileas_widget.tpl'), array(
 			'$title' => L10n::t('Saved Folders'),
 			'$desc' => '',
 			'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -211,7 +208,7 @@ class Widget
 	 */
 	public static function categories($baseurl, $selected = '')
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) {
 			return '';
@@ -228,12 +225,12 @@ class Widget
 
 		if ($cnt) {
 			foreach ($matches as $mtch) {
-				$unescaped = xmlify(FileTag::decode($mtch[1]));
+				$unescaped = XML::escape(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
 
-		return replace_macros(get_markup_template('categories_widget.tpl'), array(
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('categories_widget.tpl'), array(
 			'$title' => L10n::t('Categories'),
 			'$desc' => '',
 			'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -268,11 +265,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'];
 					}
@@ -300,15 +297,30 @@ class Widget
 			$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
 		}
 
-		return replace_macros(get_markup_template('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
+		]);
 	}
 
 	/**
@@ -320,7 +332,7 @@ class Widget
 	 */
 	public static function tagCloud($limit = 50)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		if (!$a->profile['profile_uid'] || !$a->profile['url']) {
 			return '';