X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FFriendica.php;h=0fd7445b15b0db53ee10952b27f3c49009a40a52;hb=e34795762d72347746bd506f253495da7d0ab329;hp=42b1be57dd2fc9301ebce2a29d30e06e2c2b7c2f;hpb=d6efc901946c91cf26a4436c4b58b1636e4bc9c9;p=friendica.git
diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index 42b1be57dd..0fd7445b15 100644
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -1,4 +1,23 @@
.
+ *
+ */
namespace Friendica\Module;
@@ -6,8 +25,11 @@ use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\Hook;
use Friendica\Core\Renderer;
+use Friendica\Core\System;
+use Friendica\Database\PostUpdate;
use Friendica\DI;
use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
/**
* Prints information about the current node
@@ -74,8 +96,8 @@ class Friendica extends BaseModule
'about' => DI::l10n()->t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
'' . FRIENDICA_VERSION . '',
DI::baseUrl()->get(),
- '' . DB_UPDATE_VERSION . '',
- '' . $config->get('system', 'post_update_version') . ''),
+ '' . DB_UPDATE_VERSION . '/' . $config->get('system', 'build') .'',
+ '' . PostUpdate::VERSION . '/' . $config->get('system', 'post_update_version') . ''),
'friendica' => DI::l10n()->t('Please visit Friendi.ca to learn more about the Friendica project.'),
'bugs' => DI::l10n()->t('Bug reports and issues: please visit') . ' ' . '' . DI::l10n()->t('the bugtracker at github') . '',
'info' => DI::l10n()->t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca'),
@@ -89,6 +111,15 @@ class Friendica extends BaseModule
public static function rawContent(array $parameters = [])
{
+ if (ActivityPub::isRequest()) {
+ $data = ActivityPub\Transmitter::getProfile(0);
+ if (!empty($data)) {
+ header('Access-Control-Allow-Origin: *');
+ header('Cache-Control: max-age=23200, stale-while-revalidate=23200');
+ System::jsonExit($data, 'application/activity+json');
+ }
+ }
+
$app = DI::app();
// @TODO: Replace with parameter from router
@@ -111,21 +142,13 @@ class Friendica extends BaseModule
$register_policy = $register_policies[$register_policy_int];
}
- $condition = [];
- $admin = false;
- if (!empty($config->get('config', 'admin_nickname'))) {
- $condition['nickname'] = $config->get('config', 'admin_nickname');
- }
- if (!empty($config->get('config', 'admin_email'))) {
- $adminList = explode(',', str_replace(' ', '', $config->get('config', 'admin_email')));
- $condition['email'] = $adminList[0];
- $administrator = User::getByEmail($adminList[0], ['username', 'nickname']);
- if (!empty($administrator)) {
- $admin = [
- 'name' => $administrator['username'],
- 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
- ];
- }
+ $admin = [];
+ $administrator = User::getFirstAdmin(['username', 'nickname']);
+ if (!empty($administrator)) {
+ $admin = [
+ 'name' => $administrator['username'],
+ 'profile' => DI::baseUrl()->get() . '/profile/' . $administrator['nickname'],
+ ];
}
$visible_addons = Addon::getVisibleList();