X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=adf6545b43c4a83ad8d2f7e09dc7eb466adcfcf3;hb=7b78ba392952a00aff12ea1c9a312eb60388c829;hp=04dfbb8e0313a230537556b3f9a4c2cc1e28dc9a;hpb=801a13aa102f75c76e6d5b83db98bc96348ccd11;p=friendica.git
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 04dfbb8e03..adf6545b43 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,15 +10,17 @@ 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;
-
-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
{
@@ -29,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'),
@@ -43,13 +45,13 @@ class Widget
*/
public static function findPeople()
{
- $a = get_app();
+ $a = \get_app();
$global_dir = Config::get('system', 'directory');
if (Config::get('system', 'invitation_only')) {
$x = PConfig::get(local_user(), 'system', 'invites_remaining');
if ($x || is_site_admin()) {
- $a->page['aside'] .= '
'
+ $a->page['aside'] .= '
'
. L10n::tt('%d invitation available', '%d invitations available', $x)
. '
';
}
@@ -72,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);
}
/**
@@ -80,38 +82,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,28 +138,25 @@ 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()
);
$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(
- '$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,
));
@@ -182,10 +174,6 @@ class Widget
return '';
}
- if (!Feature::isEnabled(local_user(), 'filing')) {
- return '';
- }
-
$saved = PConfig::get(local_user(), 'system', 'filetags');
if (!strlen($saved)) {
return;
@@ -195,13 +183,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' : ''),
@@ -219,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 '';
@@ -236,12 +225,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 +253,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 +264,13 @@ class Widget
if (!$cid) {
if (Profile::getMyURL()) {
- $contact = dba::selectFirst('contact', ['id'],
- ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', ['id'],
+ ['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())]);
- if (DBM::is_result($gcontact)) {
+ $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Profile::getMyURL())]);
+ if (DBA::isResult($gcontact)) {
$zcid = $gcontact['id'];
}
}
@@ -308,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
+ ]);
}
/**
@@ -328,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 '';