From 2e50e9387290c83d95e8f73a370286d6d207a8c9 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 28 Apr 2025 13:32:18 +0000 Subject: [PATCH 1/5] Replace Addon class with AddonHelper in stats modules --- src/Module/Statistics.php | 46 ++++++++++++++++++++++++++------------- src/Module/Stats.php | 32 ++++++++++++++++++++------- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php index 6a5996dac9..4a35d55d12 100644 --- a/src/Module/Statistics.php +++ b/src/Module/Statistics.php @@ -8,8 +8,10 @@ namespace Friendica\Module; use Friendica\App; +use Friendica\App\Arguments; +use Friendica\App\BaseURL; use Friendica\BaseModule; -use Friendica\Core\Addon; +use Friendica\Core\Addon\AddonHelper; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; @@ -23,13 +25,27 @@ class Statistics extends BaseModule protected $config; /** @var IManageKeyValuePairs */ protected $keyValue; + private AddonHelper $addonHelper; - public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, IManageKeyValuePairs $keyValue, Response $response, array $server, array $parameters = []) - { + public function __construct( + L10n $l10n, + BaseURL $baseUrl, + Arguments $args, + LoggerInterface $logger, + Profiler $profiler, + IManageConfigValues $config, + IManageKeyValuePairs $keyValue, + AddonHelper $addonHelper, + Response $response, + array $server, + array $parameters = [] + ) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->config = $config; - $this->keyValue = $keyValue; + $this->config = $config; + $this->keyValue = $keyValue; + $this->addonHelper = $addonHelper; + if (!$this->config->get("system", "nodeinfo")) { throw new NotFoundException(); } @@ -43,16 +59,16 @@ class Statistics extends BaseModule /// @todo mark the "service" addons and load them dynamically here $services = [ - 'appnet' => Addon::isEnabled('appnet'), - 'bluesky' => Addon::isEnabled('bluesky'), - 'dreamwidth' => Addon::isEnabled('dreamwidth'), - 'gnusocial' => Addon::isEnabled('gnusocial'), - 'libertree' => Addon::isEnabled('libertree'), - 'livejournal' => Addon::isEnabled('livejournal'), - 'pumpio' => Addon::isEnabled('pumpio'), - 'twitter' => Addon::isEnabled('twitter'), - 'tumblr' => Addon::isEnabled('tumblr'), - 'wordpress' => Addon::isEnabled('wordpress'), + 'appnet' => $this->addonHelper->isAddonEnabled('appnet'), + 'bluesky' => $this->addonHelper->isAddonEnabled('bluesky'), + 'dreamwidth' => $this->addonHelper->isAddonEnabled('dreamwidth'), + 'gnusocial' => $this->addonHelper->isAddonEnabled('gnusocial'), + 'libertree' => $this->addonHelper->isAddonEnabled('libertree'), + 'livejournal' => $this->addonHelper->isAddonEnabled('livejournal'), + 'pumpio' => $this->addonHelper->isAddonEnabled('pumpio'), + 'twitter' => $this->addonHelper->isAddonEnabled('twitter'), + 'tumblr' => $this->addonHelper->isAddonEnabled('tumblr'), + 'wordpress' => $this->addonHelper->isAddonEnabled('wordpress'), ]; $statistics = array_merge([ diff --git a/src/Module/Stats.php b/src/Module/Stats.php index 4bc9d95711..e59696a889 100644 --- a/src/Module/Stats.php +++ b/src/Module/Stats.php @@ -8,8 +8,10 @@ namespace Friendica\Module; use Friendica\App; +use Friendica\App\Arguments; +use Friendica\App\BaseURL; use Friendica\BaseModule; -use Friendica\Core\Addon; +use Friendica\Core\Addon\AddonHelper; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\KeyValueStorage\Capability\IManageKeyValuePairs; use Friendica\Core\L10n; @@ -40,14 +42,28 @@ class Stats extends BaseModule protected $logger; /** @var IManageKeyValuePairs */ protected $keyValue; + private AddonHelper $addonHelper; - public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, IManageKeyValuePairs $keyValue, Database $dba, Response $response, array $server, array $parameters = []) - { + public function __construct( + L10n $l10n, + BaseURL $baseUrl, + Arguments $args, + LoggerInterface $logger, + Profiler $profiler, + IManageConfigValues $config, + IManageKeyValuePairs $keyValue, + Database $dba, + AddonHelper $addonHelper, + Response $response, + array $server, + array $parameters = [] + ) { parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters); - $this->config = $config; - $this->keyValue = $keyValue; - $this->dba = $dba; + $this->config = $config; + $this->keyValue = $keyValue; + $this->dba = $dba; + $this->addonHelper = $addonHelper; } protected function content(array $request = []): string @@ -164,11 +180,11 @@ class Stats extends BaseModule ], ]; - if (Addon::isEnabled('bluesky')) { + if ($this->addonHelper->isAddonEnabled('bluesky')) { $statistics['packets']['inbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::BLUESKY) ?? 0); $statistics['packets']['outbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::BLUESKY) ?? 0); } - if (Addon::isEnabled('tumblr')) { + if ($this->addonHelper->isAddonEnabled('tumblr')) { $statistics['packets']['inbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::TUMBLR) ?? 0); $statistics['packets']['outbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::TUMBLR) ?? 0); } From 2ccb62bbd85462a1e3e4d8256d2964b23f4ddc08 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 28 Apr 2025 13:57:21 +0000 Subject: [PATCH 2/5] Replace Addon class with AddonHelper in Nodeinfo Model --- src/Model/Nodeinfo.php | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php index c4ee580e02..cdee561112 100644 --- a/src/Model/Nodeinfo.php +++ b/src/Model/Nodeinfo.php @@ -7,7 +7,6 @@ namespace Friendica\Model; -use Friendica\Core\Addon; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Database\DBA; use Friendica\DI; @@ -26,13 +25,14 @@ class Nodeinfo */ public static function update() { - $config = DI::config(); - $logger = DI::logger(); + $config = DI::config(); + $logger = DI::logger(); + $addonHelper = DI::addonHelper(); // If the addon 'statistics_json' is enabled then disable it and activate nodeinfo. - if (Addon::isEnabled('statistics_json')) { + if ($addonHelper->isAddonEnabled('statistics_json')) { $config->set('system', 'nodeinfo', true); - Addon::uninstall('statistics_json'); + $addonHelper->uninstallAddon('statistics_json'); } if (empty($config->get('system', 'nodeinfo'))) { @@ -66,14 +66,14 @@ class Nodeinfo /** * Return the supported services * - * @return Object with supported services + * @return stdClass with supported services */ - public static function getUsage(bool $version2 = false) + public static function getUsage(bool $version2 = false): stdClass { $config = DI::config(); $usage = new stdClass(); - $usage->users = new \stdClass; + $usage->users = new stdClass; if (!empty($config->get('system', 'nodeinfo'))) { $usage->users->total = intval(DI::keyValue()->get('nodeinfo_total_users')); @@ -97,45 +97,47 @@ class Nodeinfo */ public static function getServices(): array { + $addonHelper = DI::addonHelper(); + $services = [ 'inbound' => [], 'outbound' => [], ]; - if (Addon::isEnabled('bluesky')) { + if ($addonHelper->isAddonEnabled('bluesky')) { $services['inbound'][] = 'bluesky'; $services['outbound'][] = 'bluesky'; } - if (Addon::isEnabled('dwpost')) { + if ($addonHelper->isAddonEnabled('dwpost')) { $services['outbound'][] = 'dreamwidth'; } - if (Addon::isEnabled('statusnet')) { + if ($addonHelper->isAddonEnabled('statusnet')) { $services['inbound'][] = 'gnusocial'; $services['outbound'][] = 'gnusocial'; } - if (Addon::isEnabled('ijpost')) { + if ($addonHelper->isAddonEnabled('ijpost')) { $services['outbound'][] = 'insanejournal'; } - if (Addon::isEnabled('libertree')) { + if ($addonHelper->isAddonEnabled('libertree')) { $services['outbound'][] = 'libertree'; } - if (Addon::isEnabled('ljpost')) { + if ($addonHelper->isAddonEnabled('ljpost')) { $services['outbound'][] = 'livejournal'; } - if (Addon::isEnabled('pumpio')) { + if ($addonHelper->isAddonEnabled('pumpio')) { $services['inbound'][] = 'pumpio'; $services['outbound'][] = 'pumpio'; } $services['outbound'][] = 'smtp'; - if (Addon::isEnabled('tumblr')) { + if ($addonHelper->isAddonEnabled('tumblr')) { $services['outbound'][] = 'tumblr'; } - if (Addon::isEnabled('twitter')) { + if ($addonHelper->isAddonEnabled('twitter')) { $services['outbound'][] = 'twitter'; } - if (Addon::isEnabled('wppost')) { + if ($addonHelper->isAddonEnabled('wppost')) { $services['outbound'][] = 'wordpress'; } From f5eee2c3343abc65619cf2903d48b9b539f10bc2 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 28 Apr 2025 14:07:20 +0000 Subject: [PATCH 3/5] Replace Addon class with AddonHelper in Post Object --- src/Object/Post.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Object/Post.php b/src/Object/Post.php index d4b381a115..afc3d04fa7 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -9,7 +9,6 @@ namespace Friendica\Object; use Friendica\Content\ContactSelector; use Friendica\Content\Feature; -use Friendica\Core\Addon; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\DI; @@ -1118,12 +1117,14 @@ class Post $conv = $this->getThread(); if ($conv->isWritable() && $this->isWritable()) { + $addonHelper = DI::addonHelper(); + /* * Hmmm, code depending on the presence of a particular addon? * This should be better if done by a hook */ $qcomment = null; - if (Addon::isEnabled('qcomment')) { + if ($addonHelper->isAddonEnabled('qcomment')) { $words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'qcomment', 'words'); $qcomment = $words ? explode("\n", $words) : []; } From 362b223c5eda15ee48854a21d003c6c25504e120 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 28 Apr 2025 14:10:32 +0000 Subject: [PATCH 4/5] Replace Addon class with AddonHelper in vier theme --- view/theme/vier/theme.php | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index b985449166..dd178c87ce 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -14,9 +14,8 @@ * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/ */ -use Friendica\App; +use Friendica\App\Mode; use Friendica\Content\GroupManager; -use Friendica\Core\Addon; use Friendica\Core\Renderer; use Friendica\Core\Search; use Friendica\Database\DBA; @@ -35,7 +34,7 @@ function vier_init() $args = DI::args(); if ( - DI::mode()->has(App\Mode::MAINTENANCEDISABLED) + DI::mode()->has(Mode::MAINTENANCEDISABLED) && ( $args->get(0) === 'profile' && $args->get(1) === (DI::userSession()->getLocalUserNickname() ?? '') || $args->get(0) === 'network' && DI::userSession()->getLocalUserId() @@ -244,55 +243,57 @@ function vier_community_info() // connectable services if ($show_services) { + $addonHelper = DI::addonHelper(); + /// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo) $r = []; - if (Addon::isEnabled("buffer")) { + if ($addonHelper->isAddonEnabled("buffer")) { $r[] = ["photo" => "images/buffer.png", "name" => "Buffer"]; } - if (Addon::isEnabled("blogger")) { + if ($addonHelper->isAddonEnabled("blogger")) { $r[] = ["photo" => "images/blogger.png", "name" => "Blogger"]; } - if (Addon::isEnabled("dwpost")) { + if ($addonHelper->isAddonEnabled("dwpost")) { $r[] = ["photo" => "images/dreamwidth.png", "name" => "Dreamwidth"]; } - if (Addon::isEnabled("ifttt")) { + if ($addonHelper->isAddonEnabled("ifttt")) { $r[] = ["photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT"]; } - if (Addon::isEnabled("statusnet")) { + if ($addonHelper->isAddonEnabled("statusnet")) { $r[] = ["photo" => "images/gnusocial.png", "name" => "GNU Social"]; } /// @TODO old-lost code (and below)? - //if (Addon::isEnabled("ijpost")) { + //if ($addonHelper->isAddonEnabled("ijpost")) { // $r[] = array("photo" => "images/", "name" => ""); //} - if (Addon::isEnabled("libertree")) { + if ($addonHelper->isAddonEnabled("libertree")) { $r[] = ["photo" => "images/libertree.png", "name" => "Libertree"]; } - //if (Addon::isEnabled("ljpost")) { + //if ($addonHelper->isAddonEnabled("ljpost")) { // $r[] = array("photo" => "images/", "name" => ""); //} - if (Addon::isEnabled("pumpio")) { + if ($addonHelper->isAddonEnabled("pumpio")) { $r[] = ["photo" => "images/pumpio.png", "name" => "pump.io"]; } - if (Addon::isEnabled("tumblr")) { + if ($addonHelper->isAddonEnabled("tumblr")) { $r[] = ["photo" => "images/tumblr.png", "name" => "Tumblr"]; } - if (Addon::isEnabled("twitter")) { + if ($addonHelper->isAddonEnabled("twitter")) { $r[] = ["photo" => "images/twitter.png", "name" => "Twitter"]; } - if (Addon::isEnabled("wppost")) { + if ($addonHelper->isAddonEnabled("wppost")) { $r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"]; } From baaec75bfc613af4517433b2dc6c384683148045 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 28 Apr 2025 14:12:27 +0000 Subject: [PATCH 5/5] fix code style --- src/Model/Nodeinfo.php | 23 +++++++------- src/Module/Statistics.php | 3 +- src/Module/Stats.php | 22 ++++++------- view/theme/vier/theme.php | 66 +++++++++++++++++++-------------------- 4 files changed, 56 insertions(+), 58 deletions(-) diff --git a/src/Model/Nodeinfo.php b/src/Model/Nodeinfo.php index cdee561112..0d3a88ad8a 100644 --- a/src/Model/Nodeinfo.php +++ b/src/Model/Nodeinfo.php @@ -10,7 +10,6 @@ namespace Friendica\Model; use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Model\Item; use stdClass; /** @@ -50,12 +49,12 @@ class Nodeinfo $logger->info('user statistics - done', $userStats); - $posts = DBA::count('post-thread', ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE NOT `deleted` AND `origin`)"]); + $posts = DBA::count('post-thread', ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE NOT `deleted` AND `origin`)"]); $comments = DBA::count('post', ["NOT `deleted` AND `gravity` = ? AND `uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)", Item::GRAVITY_COMMENT]); DI::keyValue()->set('nodeinfo_local_posts', $posts); DI::keyValue()->set('nodeinfo_local_comments', $comments); - $posts = DBA::count('post', ['deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]); + $posts = DBA::count('post', ['deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]); $comments = DBA::count('post', ['deleted' => false, 'gravity' => Item::GRAVITY_COMMENT]); DI::keyValue()->set('nodeinfo_total_posts', $posts); DI::keyValue()->set('nodeinfo_total_comments', $comments); @@ -72,15 +71,15 @@ class Nodeinfo { $config = DI::config(); - $usage = new stdClass(); - $usage->users = new stdClass; + $usage = new stdClass(); + $usage->users = new stdClass(); if (!empty($config->get('system', 'nodeinfo'))) { - $usage->users->total = intval(DI::keyValue()->get('nodeinfo_total_users')); + $usage->users->total = intval(DI::keyValue()->get('nodeinfo_total_users')); $usage->users->activeHalfyear = intval(DI::keyValue()->get('nodeinfo_active_users_halfyear')); - $usage->users->activeMonth = intval(DI::keyValue()->get('nodeinfo_active_users_monthly')); - $usage->localPosts = intval(DI::keyValue()->get('nodeinfo_local_posts')); - $usage->localComments = intval(DI::keyValue()->get('nodeinfo_local_comments')); + $usage->users->activeMonth = intval(DI::keyValue()->get('nodeinfo_active_users_monthly')); + $usage->localPosts = intval(DI::keyValue()->get('nodeinfo_local_posts')); + $usage->localComments = intval(DI::keyValue()->get('nodeinfo_local_comments')); if ($version2) { $usage->users->activeWeek = intval(DI::keyValue()->get('nodeinfo_active_users_weekly')); @@ -105,14 +104,14 @@ class Nodeinfo ]; if ($addonHelper->isAddonEnabled('bluesky')) { - $services['inbound'][] = 'bluesky'; + $services['inbound'][] = 'bluesky'; $services['outbound'][] = 'bluesky'; } if ($addonHelper->isAddonEnabled('dwpost')) { $services['outbound'][] = 'dreamwidth'; } if ($addonHelper->isAddonEnabled('statusnet')) { - $services['inbound'][] = 'gnusocial'; + $services['inbound'][] = 'gnusocial'; $services['outbound'][] = 'gnusocial'; } if ($addonHelper->isAddonEnabled('ijpost')) { @@ -125,7 +124,7 @@ class Nodeinfo $services['outbound'][] = 'livejournal'; } if ($addonHelper->isAddonEnabled('pumpio')) { - $services['inbound'][] = 'pumpio'; + $services['inbound'][] = 'pumpio'; $services['outbound'][] = 'pumpio'; } diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php index 4a35d55d12..6540730e01 100644 --- a/src/Module/Statistics.php +++ b/src/Module/Statistics.php @@ -53,8 +53,7 @@ class Statistics extends BaseModule protected function rawContent(array $request = []) { - $registration_open = - Register::getPolicy() !== Register::CLOSED + $registration_open = Register::getPolicy() !== Register::CLOSED && !$this->config->get('config', 'invitation_only'); /// @todo mark the "service" addons and load them dynamically here diff --git a/src/Module/Stats.php b/src/Module/Stats.php index e59696a889..c8122177eb 100644 --- a/src/Module/Stats.php +++ b/src/Module/Stats.php @@ -101,14 +101,14 @@ class Stats extends BaseModule 'datetime' => DateTimeFormat::utc($this->keyValue->get('last_worker_execution'), DateTimeFormat::JSON), 'timestamp' => strtotime($this->keyValue->get('last_worker_execution')), ], - 'jpm' => [ + 'jpm' => [ 1 => $this->dba->count('workerqueue', ["`done` AND `executed` > ?", DateTimeFormat::utc('now - 1 minute')]), 3 => round($this->dba->count('workerqueue', ["`done` AND `executed` > ?", DateTimeFormat::utc('now - 3 minute')]) / 3), 5 => round($this->dba->count('workerqueue', ["`done` AND `executed` > ?", DateTimeFormat::utc('now - 5 minute')]) / 5), ], - 'active' => [], - 'deferred' => [], - 'total' => [], + 'active' => [], + 'deferred' => [], + 'total' => [], ], 'jetstream' => [ 'drift' => intval($this->keyValue->get('jetstream_drift')), @@ -161,14 +161,14 @@ class Stats extends BaseModule 'closed' => $this->dba->count('report', ['status' => Report::STATUS_CLOSED]), ], 'update' => [ - 'available' => Update::isAvailable(), + 'available' => Update::isAvailable(), 'available_version' => Update::getAvailableVersion(), 'status' => Update::getStatus(), - 'db_status' => DBStructure::getUpdateStatus(), + 'db_status' => DBStructure::getUpdateStatus(), ], 'server' => [ - 'version' => App::VERSION, - 'php' => [ + 'version' => App::VERSION, + 'php' => [ 'version' => phpversion(), 'upload_max_filesize' => ini_get('upload_max_filesize'), 'post_max_size' => ini_get('post_max_size'), @@ -181,11 +181,11 @@ class Stats extends BaseModule ]; if ($this->addonHelper->isAddonEnabled('bluesky')) { - $statistics['packets']['inbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::BLUESKY) ?? 0); + $statistics['packets']['inbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::BLUESKY) ?? 0); $statistics['packets']['outbound'][Protocol::BLUESKY] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::BLUESKY) ?? 0); } if ($this->addonHelper->isAddonEnabled('tumblr')) { - $statistics['packets']['inbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::TUMBLR) ?? 0); + $statistics['packets']['inbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_inbound_' . Protocol::TUMBLR) ?? 0); $statistics['packets']['outbound'][Protocol::TUMBLR] = intval($this->keyValue->get('stats_packets_outbound_' . Protocol::TUMBLR) ?? 0); } @@ -218,7 +218,7 @@ class Stats extends BaseModule $jobs = $this->dba->p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` AND `retrial` = ? GROUP BY `priority`", 0); while ($entry = $this->dba->fetch($jobs)) { - $running = $this->dba->count('workerqueue-view', ['priority' => $entry['priority']]); + $running = $this->dba->count('workerqueue-view', ['priority' => $entry['priority']]); $statistics['worker']['active']['total'] += $running; $statistics['worker']['active'][$entry['priority']] = $running; $statistics['worker']['total']['total'] += $entry['entries']; diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index dd178c87ce..c70f55ecc1 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -92,7 +92,7 @@ EOT; // Hide the left menu bar /// @TODO maybe move this static array out where it should belong? if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "calendar", "help", "delegation", "notifications", - "probe", "webfinger", "login", "invite", "credits"])) { + "probe", "webfinger", "login", "invite", "credits"])) { DI::page()['htmlhead'] .= ""; } } @@ -116,12 +116,12 @@ function get_vier_config($key, $default = false, $admin = false) function vier_community_info() { - $show_pages = get_vier_config("show_pages", 1); - $show_profiles = get_vier_config("show_profiles", 1); - $show_helpers = get_vier_config("show_helpers", 1); - $show_services = get_vier_config("show_services", 1); - $show_friends = get_vier_config("show_friends", 1); - $show_lastusers = get_vier_config("show_lastusers", 1); + $show_pages = get_vier_config("show_pages", 1); + $show_profiles = get_vier_config("show_profiles", 1); + $show_helpers = get_vier_config("show_helpers", 1); + $show_services = get_vier_config("show_services", 1); + $show_friends = get_vier_config("show_friends", 1); + $show_lastusers = get_vier_config("show_lastusers", 1); // get_baseurl $aside['$url'] = $url = (string)DI::baseUrl(); @@ -137,10 +137,10 @@ function vier_community_info() foreach ($contacts as $contact) { $entry = Renderer::replaceMacros($tpl, [ - '$id' => $contact['id'], + '$id' => $contact['id'], '$profile_link' => 'contact/follow?url=' . urlencode($contact['url']), - '$photo' => Contact::getMicro($contact), - '$alt_text' => $contact['name'], + '$photo' => Contact::getMicro($contact), + '$alt_text' => $contact['name'], ]); $aside['$community_profiles_items'][] = $entry; } @@ -164,11 +164,11 @@ function vier_community_info() foreach ($profiles as $profile) { $profile_link = 'profile/' . ((strlen($profile['nickname'])) ? $profile['nickname'] : $profile['uid']); - $entry = Renderer::replaceMacros($tpl, [ - '$id' => $profile['id'], + $entry = Renderer::replaceMacros($tpl, [ + '$id' => $profile['id'], '$profile_link' => $profile_link, - '$photo' => DI::baseUrl()->remove($profile['thumb']), - '$alt_text' => $profile['name']]); + '$photo' => DI::baseUrl()->remove($profile['thumb']), + '$alt_text' => $profile['name']]); $aside['$lastusers_items'][] = $entry; } } @@ -176,18 +176,18 @@ function vier_community_info() //right_aside FIND FRIENDS if ($show_friends && DI::userSession()->getLocalUserId()) { - $nv = []; - $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'] = Search::getGlobalDirectory(); + $nv = []; + $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'] = Search::getGlobalDirectory(); $nv['local_directory'] = DI::l10n()->t('Local Directory'); $aside['$nv'] = $nv; @@ -223,14 +223,14 @@ function vier_community_info() $tpl = Renderer::getMarkupTemplate('ch_helpers.tpl'); if ($r) { - $helpers = []; + $helpers = []; $helpers['title'] = ["", DI::l10n()->t('Help'), "", ""]; $aside['$helpers_items'] = []; foreach ($r as $rr) { $entry = Renderer::replaceMacros($tpl, [ - '$url' => $rr['url'], + '$url' => $rr['url'], '$title' => $rr['name'], ]); $aside['$helpers_items'][] = $entry; @@ -304,14 +304,14 @@ function vier_community_info() $tpl = Renderer::getMarkupTemplate('ch_connectors.tpl'); if (DBA::isResult($r)) { - $con_services = []; - $con_services['title'] = ["", DI::l10n()->t('Connect Services'), "", ""]; + $con_services = []; + $con_services['title'] = ["", DI::l10n()->t('Connect Services'), "", ""]; $aside['$con_services'] = $con_services; foreach ($r as $rr) { $entry = Renderer::replaceMacros($tpl, [ - '$url' => $url, - '$photo' => $rr['photo'], + '$url' => $url, + '$photo' => $rr['photo'], '$alt_text' => $rr['name'], ]); $aside['$connector_items'][] = $entry; @@ -321,7 +321,7 @@ function vier_community_info() //end connectable services //print right_aside - $tpl = Renderer::getMarkupTemplate('communityhome.tpl'); + $tpl = Renderer::getMarkupTemplate('communityhome.tpl'); DI::page()['right_aside'] = Renderer::replaceMacros($tpl, $aside); }