X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=397a1863d339efadf86d739acc6ea95e3d6f3e95;hb=d50a1edef468b9e3de456cb7c4570da5272b0cd8;hp=04dfbb8e0313a230537556b3f9a4c2cc1e28dc9a;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 04dfbb8e03..397a1863d3 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,12 +10,15 @@ use Friendica\Core\Addon;
 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\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-use dba;
+use Friendica\Util\XML;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -29,7 +32,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'),
@@ -49,7 +52,7 @@ class Widget
 		if (Config::get('system', 'invitation_only')) {
 			$x = PConfig::get(local_user(), 'system', 'invites_remaining');
 			if ($x || is_site_admin()) {
-				$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
+				$a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. L10n::tt('%d invitation available', '%d invitations available', $x)
 					. '</div>';
 			}
@@ -72,7 +75,7 @@ class Widget
 		$aside = [];
 		$aside['$nv'] = $nv;
 
-		return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('peoplefind.tpl'), $aside);
 	}
 
 	/**
@@ -80,38 +83,31 @@ class Widget
 	 */
 	public static function unavailableNetworks()
 	{
-		$networks = array();
-
-		if (!Addon::isEnabled("appnet")) {
-			$networks[] = NETWORK_APPNET;
-		}
-
-		if (!Addon::isEnabled("fbpost") && !Addon::isEnabled("facebook")) {
-			$networks[] = NETWORK_FACEBOOK;
-		}
+		// Always hide content from these networks
+		$networks = ['face', 'apdn'];
 
 		if (!Addon::isEnabled("statusnet")) {
-			$networks[] = NETWORK_STATUSNET;
+			$networks[] = Protocol::STATUSNET;
 		}
 
 		if (!Addon::isEnabled("pumpio")) {
-			$networks[] = NETWORK_PUMPIO;
+			$networks[] = Protocol::PUMPIO;
 		}
 
 		if (!Addon::isEnabled("twitter")) {
-			$networks[] = NETWORK_TWITTER;
+			$networks[] = Protocol::TWITTER;
 		}
 
 		if (Config::get("system", "ostatus_disabled")) {
-			$networks[] = NETWORK_OSTATUS;
+			$networks[] = Protocol::OSTATUS;
 		}
 
 		if (!Config::get("system", "diaspora_enabled")) {
-			$networks[] = NETWORK_DIASPORA;
+			$networks[] = Protocol::DIASPORA;
 		}
 
 		if (!Addon::isEnabled("pnut")) {
-			$networks[] = NETWORK_PNUT;
+			$networks[] = Protocol::PNUT;
 		}
 
 		if (!sizeof($networks)) {
@@ -143,24 +139,21 @@ 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 `network` != '' $extra_sql ORDER BY `network`",
 			local_user()
 		);
 
 		$nets = array();
-		while ($rr = dba::fetch($r)) {
-			/// @TODO If 'network' is not there, this triggers an E_NOTICE
-			if ($rr['network']) {
-				$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
-			}
+		while ($rr = DBA::fetch($r)) {
+			$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		if (count($nets) < 2) {
 			return '';
 		}
 
-		return replace_macros(get_markup_template('nets.tpl'), array(
+		return Renderer::replaceMacros(Renderer::getMarkupTemplate('nets.tpl'), array(
 			'$title' => L10n::t('Networks'),
 			'$desc' => '',
 			'$sel_all' => (($selected == '') ? 'selected' : ''),
@@ -195,13 +188,14 @@ class Widget
 		$terms = array();
 		$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
 		if ($cnt) {
-			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_decode($mtch[1]));
+			foreach ($matches as $mtch)
+			{
+				$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' : ''),
@@ -236,12 +230,12 @@ class Widget
 
 		if ($cnt) {
 			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_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' : ''),
@@ -264,7 +258,7 @@ class Widget
 
 		$cid = $zcid = 0;
 
-		if (is_array($_SESSION['remote'])) {
+		if (!empty($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $profile_uid) {
 					$cid = $visitor['cid'];
@@ -275,13 +269,13 @@ class Widget
 
 		if (!$cid) {
 			if (Profile::getMyURL()) {
-				$contact = dba::selectFirst('contact', ['id'],
+				$contact = DBA::selectFirst('contact', ['id'],
 						['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
-				if (DBM::is_result($contact)) {
+				if (DBA::isResult($contact)) {
 					$cid = $contact['id'];
 				} else {
-					$gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-					if (DBM::is_result($gcontact)) {
+					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+					if (DBA::isResult($gcontact)) {
 						$zcid = $gcontact['id'];
 					}
 				}
@@ -308,7 +302,7 @@ class Widget
 			$r = GContact::commonFriendsZcid($profile_uid, $zcid, 0, 5, true);
 		}
 
-		return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
+		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,