X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FWidget.php;h=fad863fbeb23b13075c93463bc30b8bc5b2a3597;hb=6749b2c887552feef3a671c4063425b11a92014a;hp=2052d216d2040b07b3dfd3890c5d340e0e6b436a;hpb=cb4ad529f465dcdb0e7efedc5ac4c06c63b8b194;p=friendica.git
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 2052d216d2..fad863fbeb 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -1,12 +1,27 @@
.
+ *
*/
+
namespace Friendica\Content;
use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
@@ -15,6 +30,7 @@ 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;
@@ -47,9 +63,9 @@ class Widget
*/
public static function findPeople()
{
- $global_dir = Config::get('system', 'directory');
+ $global_dir = DI::config()->get('system', 'directory');
- if (Config::get('system', 'invitation_only')) {
+ if (DI::config()->get('system', 'invitation_only')) {
$x = intval(DI::pConfig()->get(local_user(), 'system', 'invites_remaining'));
if ($x || is_site_admin()) {
DI::page()['aside'] .= '
'
@@ -84,7 +100,7 @@ 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;
@@ -102,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;
}
@@ -177,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
@@ -221,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`",
@@ -303,7 +347,7 @@ class Widget
{
$a = DI::app();
- $uid = intval($a->profile['profile_uid']);
+ $uid = intval($a->profile['uid']);
if (!Feature::isEnabled($uid, 'categories')) {
return '';
@@ -420,14 +464,14 @@ class Widget
{
$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 '';
@@ -449,10 +493,6 @@ class Widget
{
$o = '';
- if (!Feature::isEnabled($uid, 'archives')) {
- return $o;
- }
-
$visible_years = DI::pConfig()->get($uid, 'system', 'archive_visible_years', 5);
/* arrange the list in years */