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

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 066c17413a..f1f8f25fa3 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,8 +10,9 @@ 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;
@@ -21,7 +22,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
-use Friendica\Util\XML;
 
 class Widget
 {
@@ -48,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>';
 			}
@@ -88,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;
 		}
@@ -256,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 = '')
 	{
@@ -269,16 +272,14 @@ class Widget
 			return;
 		}
 
-		$matches = [];
-		$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[] = ['ref' => $unescaped, 'name' => $unescaped];
-			}
+		$terms = [];
+		foreach (FileTag::fileToArray($saved) as $savedFolderName) {
+			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
+		
+		usort($terms, function ($a, $b) {
+			return strcmp($a['name'], $b['name']);
+		});
 
 		return self::filter(
 			'file',
@@ -303,24 +304,20 @@ 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 = [];
 		$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[] = ['ref' => $unescaped, 'name' => $unescaped];
-			}
+		foreach (FileTag::fileToArray($saved, 'category') as $savedFolderName) {
+			$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
 		}
 
 		return self::filter(
@@ -347,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()) {
@@ -410,7 +400,7 @@ class Widget
 		$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' : ''),
@@ -432,17 +422,19 @@ 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 '';