X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=fad863fbeb23b13075c93463bc30b8bc5b2a3597;hb=6749b2c887552feef3a671c4063425b11a92014a;hp=e8b08d42781e22f9250ebf921db932650c850592;hpb=19247b62aecb69f2854cdbb09e36767a4d580e73;p=friendica.git
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index e8b08d4278..fad863fbeb 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,27 +1,42 @@
.
+ *
*/
+
namespace Friendica\Content;
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\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\FileTag;
use Friendica\Model\GContact;
+use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
-use Friendica\Util\XML;
class Widget
{
@@ -35,11 +50,11 @@ class Widget
public static function follow($value = "")
{
return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/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'),
+ '$connect' => DI::l10n()->t('Add New Contact'),
+ '$desc' => DI::l10n()->t('Enter address or web location'),
+ '$hint' => DI::l10n()->t('Example: bob@example.com, http://example.com/barbara'),
'$value' => $value,
- '$follow' => L10n::t('Connect')
+ '$follow' => DI::l10n()->t('Connect')
));
}
@@ -48,31 +63,30 @@ class Widget
*/
public static function findPeople()
{
- $a = \get_app();
- $global_dir = Config::get('system', 'directory');
+ $global_dir = DI::config()->get('system', 'directory');
- if (Config::get('system', 'invitation_only')) {
- $x = PConfig::get(local_user(), 'system', 'invites_remaining');
+ if (DI::config()->get('system', 'invitation_only')) {
+ $x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
if ($x || is_site_admin()) {
- $a->page['aside'] .= '
'
- . L10n::tt('%d invitation available', '%d invitations available', $x)
+ DI::page()['aside'] .= '
'
+ . DI::l10n()->tt('%d invitation available', '%d invitations available', $x)
. '
';
}
}
$nv = [];
- $nv['findpeople'] = L10n::t('Find People');
- $nv['desc'] = L10n::t('Enter name or interest');
- $nv['label'] = L10n::t('Connect/Follow');
- $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
- $nv['findthem'] = L10n::t('Find');
- $nv['suggest'] = L10n::t('Friend Suggestions');
- $nv['similar'] = L10n::t('Similar Interests');
- $nv['random'] = L10n::t('Random Profile');
- $nv['inv'] = L10n::t('Invite Friends');
- $nv['directory'] = L10n::t('Global Directory');
+ $nv['findpeople'] = DI::l10n()->t('Find People');
+ $nv['desc'] = DI::l10n()->t('Enter name or interest');
+ $nv['label'] = DI::l10n()->t('Connect/Follow');
+ $nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
+ $nv['findthem'] = DI::l10n()->t('Find');
+ $nv['suggest'] = DI::l10n()->t('Friend Suggestions');
+ $nv['similar'] = DI::l10n()->t('Similar Interests');
+ $nv['random'] = DI::l10n()->t('Random Profile');
+ $nv['inv'] = DI::l10n()->t('Invite Friends');
+ $nv['directory'] = DI::l10n()->t('Global Directory');
$nv['global_dir'] = $global_dir;
- $nv['local_directory'] = L10n::t('Local Directory');
+ $nv['local_directory'] = DI::l10n()->t('Local Directory');
$aside = [];
$aside['$nv'] = $nv;
@@ -86,7 +100,11 @@ class Widget
public static function unavailableNetworks()
{
// Always hide content from these networks
- $networks = ['face', 'apdn'];
+ $networks = [Protocol::PHANTOM, Protocol::FACEBOOK, Protocol::APPNET];
+
+ if (!Addon::isEnabled("discourse")) {
+ $networks[] = Protocol::DISCOURSE;
+ }
if (!Addon::isEnabled("statusnet")) {
$networks[] = Protocol::STATUSNET;
@@ -100,11 +118,11 @@ class Widget
$networks[] = Protocol::TWITTER;
}
- if (Config::get("system", "ostatus_disabled")) {
+ if (DI::config()->get("system", "ostatus_disabled")) {
$networks[] = Protocol::OSTATUS;
}
- if (!Config::get("system", "diaspora_enabled")) {
+ if (!DI::config()->get("system", "diaspora_enabled")) {
$networks[] = Protocol::DIASPORA;
}
@@ -175,7 +193,39 @@ class Widget
}
/**
- * Return networks widget
+ * Return group membership widget
+ *
+ * @param string $baseurl
+ * @param string $selected
+ * @return string
+ * @throws \Exception
+ */
+ public static function groups($baseurl, $selected = '')
+ {
+ if (!local_user()) {
+ return '';
+ }
+
+ $options = array_map(function ($group) {
+ return [
+ 'ref' => $group['id'],
+ 'name' => $group['name']
+ ];
+ }, Group::getByUserId(local_user()));
+
+ return self::filter(
+ 'group',
+ DI::l10n()->t('Groups'),
+ '',
+ DI::l10n()->t('Everyone'),
+ $baseurl,
+ $options,
+ $selected
+ );
+ }
+
+ /**
+ * Return contact relationship widget
*
* @param string $baseurl baseurl
* @param string $selected optional, default empty
@@ -189,16 +239,16 @@ class Widget
}
$options = [
- ['ref' => 'followers', 'name' => L10n::t('Followers')],
- ['ref' => 'following', 'name' => L10n::t('Following')],
- ['ref' => 'mutuals', 'name' => L10n::t('Mutual friends')],
+ ['ref' => 'followers', 'name' => DI::l10n()->t('Followers')],
+ ['ref' => 'following', 'name' => DI::l10n()->t('Following')],
+ ['ref' => 'mutuals', 'name' => DI::l10n()->t('Mutual friends')],
];
return self::filter(
'rel',
- L10n::t('Relationships'),
+ DI::l10n()->t('Relationships'),
'',
- L10n::t('All Contacts'),
+ DI::l10n()->t('All Contacts'),
$baseurl,
$options,
$selected
@@ -219,10 +269,6 @@ class Widget
return '';
}
- if (!Feature::isEnabled(local_user(), 'networks')) {
- return '';
- }
-
$extra_sql = self::unavailableNetworks();
$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND NOT `deleted` AND `network` != '' $extra_sql ORDER BY `network`",
@@ -241,9 +287,9 @@ class Widget
return self::filter(
'nets',
- L10n::t('Protocols'),
+ DI::l10n()->t('Protocols'),
'',
- L10n::t('All Protocols'),
+ DI::l10n()->t('All Protocols'),
$baseurl,
$nets,
$selected
@@ -264,7 +310,7 @@ class Widget
return '';
}
- $saved = PConfig::get(local_user(), 'system', 'filetags');
+ $saved = DI::pConfig()->get(local_user(), 'system', 'filetags');
if (!strlen($saved)) {
return;
}
@@ -273,12 +319,16 @@ class Widget
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',
- L10n::t('Saved Folders'),
+ DI::l10n()->t('Saved Folders'),
'',
- L10n::t('Everything'),
+ DI::l10n()->t('Everything'),
$baseurl,
$terms,
$selected
@@ -295,15 +345,15 @@ class Widget
*/
public static function categories($baseurl, $selected = '')
{
- $a = \get_app();
+ $a = DI::app();
- $uid = intval($a->profile['profile_uid']);
+ $uid = intval($a->profile['uid']);
if (!Feature::isEnabled($uid, 'categories')) {
return '';
}
- $saved = PConfig::get($uid, 'system', 'filetags');
+ $saved = DI::pConfig()->get($uid, 'system', 'filetags');
if (!strlen($saved)) {
return;
}
@@ -315,9 +365,9 @@ class Widget
return self::filter(
'category',
- L10n::t('Categories'),
+ DI::l10n()->t('Categories'),
'',
- L10n::t('Everything'),
+ DI::l10n()->t('Everything'),
$baseurl,
$terms,
$selected
@@ -337,16 +387,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()) {
@@ -399,12 +442,12 @@ 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(),
+ '$desc' => DI::l10n()->tt("%d contact in common", "%d contacts in common", $t),
+ '$base' => DI::baseUrl(),
'$uid' => $profile_uid,
'$cid' => (($cid) ? $cid : '0'),
'$linkmore' => (($t > 5) ? 'true' : ''),
- '$more' => L10n::t('show more'),
+ '$more' => DI::l10n()->t('show more'),
'$items' => $entries
]);
}
@@ -412,7 +455,6 @@ class Widget
/**
* 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.
* @return string HTML formatted output.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
@@ -420,16 +462,16 @@ class Widget
*/
public static function tagCloud($limit = 50)
{
- $a = \get_app();
+ $a = DI::app();
- $uid = intval($a->profile['profile_uid']);
+ $uid = intval($a->profile['uid']);
if (!$uid || !$a->profile['url']) {
return '';
}
if (Feature::isEnabled($uid, 'tagadelic')) {
- $owner_id = Contact::getIdForURL($a->profile['url'], 0, true);
+ $owner_id = Contact::getIdForURL($a->profile['url'], 0, false);
if (!$owner_id) {
return '';
@@ -451,11 +493,7 @@ class Widget
{
$o = '';
- if (!Feature::isEnabled($uid, 'archives')) {
- return $o;
- }
-
- $visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
+ $visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
/* arrange the list in years */
$dnow = DateTimeFormat::localNow('Y-m-d');
@@ -478,7 +516,7 @@ class Widget
$dend = substr($dnow, 0, 8) . Temporal::getDaysInMonth(intval($dnow), intval(substr($dnow, 5)));
$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
- $str = L10n::getDay(DateTimeFormat::utc($dnow, 'F'));
+ $str = DI::l10n()->getDay(DateTimeFormat::utc($dnow, 'F'));
if (empty($ret[$dyear])) {
$ret[$dyear] = [];
@@ -498,13 +536,13 @@ class Widget
$cutoff = array_key_exists($cutoff_year, $ret);
$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/posted_date.tpl'),[
- '$title' => L10n::t('Archives'),
+ '$title' => DI::l10n()->t('Archives'),
'$size' => $visible_years,
'$cutoff_year' => $cutoff_year,
'$cutoff' => $cutoff,
'$url' => $url,
'$dates' => $ret,
- '$showmore' => L10n::t('show more')
+ '$showmore' => DI::l10n()->t('show more')
]);
return $o;