From 1301a53f20a5164d484a3a83368d4eb9174523ae Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 29 May 2022 13:14:31 -0400 Subject: [PATCH] Remove relocation form from Admin Site settings --- src/Core/Relocate.php | 95 ------------------------ src/Module/Admin/Site.php | 24 +----- view/templates/admin/site.tpl | 12 +-- view/theme/frio/templates/admin/site.tpl | 22 ++---- 4 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 src/Core/Relocate.php diff --git a/src/Core/Relocate.php b/src/Core/Relocate.php deleted file mode 100644 index 951bbaa037..0000000000 --- a/src/Core/Relocate.php +++ /dev/null @@ -1,95 +0,0 @@ -. - * - */ - -namespace Friendica\Core; - -use Friendica\App; -use Friendica\Database; -use Friendica\Util\Strings; -use Friendica\Worker\Delivery; - -class Relocate -{ - /** - * @var App\BaseURL - */ - private $baseUrl; - /** - * @var Database\Database - */ - private $database; - /** - * @var Config\Capability\IManageConfigValues - */ - private $config; - - public function __construct(App\BaseURL $baseUrl, Database\Database $database, Config\Capability\IManageConfigValues $config) - { - $this->baseUrl = $baseUrl; - $this->database = $database; - $this->config = $config; - } - - /** - * Performs relocation - * - * @param string $new_url The new node URL, including the scheme - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ - public function run(string $new_url) - { - $new_url = rtrim($new_url, '/'); - - $parsed = @parse_url($new_url); - if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { - throw new \InvalidArgumentException('Can not parse base URL. Must have at least ://'); - } - - /* steps: - * replace all "baseurl" to "new_url" in config, profile, term, items and contacts - * send relocate for every local user - * */ - $old_url = $this->baseUrl->get(true); - - // Generate host names for relocation the addresses in the format user@address.tld - $new_host = str_replace('http://', '@', Strings::normaliseLink($new_url)); - $old_host = str_replace('http://', '@', Strings::normaliseLink($old_url)); - - // update tables - // update profile links in the format "http://server.tld" - $this->database->replaceInTableFields('profile', ['photo', 'thumb'], $old_url, $new_url); - $this->database->replaceInTableFields('contact', ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); - $this->database->replaceInTableFields('post-content', ['body'], $old_url, $new_url); - - // update profile addresses in the format "user@server.tld" - $this->database->replaceInTableFields('contact', ['addr'], $old_host, $new_host); - - // update config - $this->config->set('system', 'url', $new_url); - $this->baseUrl->saveByURL($new_url); - - // send relocate - $users = $this->database->selectToArray('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); - foreach ($users as $user) { - Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $user['uid']); - } - } -} diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 50289ff21f..36824d5119 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -61,23 +61,6 @@ class Site extends BaseAdmin return; } - if (!empty($_POST['relocate']) && !empty($_POST['relocate_url'])) { - try { - $relocate = new Relocate(DI::baseUrl(), DI::dba(), DI::config()); - $relocate->run($_POST['relocate_url']); - - info(DI::l10n()->t('Relocation started. Could take a while to complete.')); - } catch (\InvalidArgumentException $e) { - notice(DI::l10n()->t('Can not parse base url. Must have at least ://')); - } catch (\Throwable $e) { - notice(DI::l10n()->t('Unable to perform the relocation, please retry later or check the application logs.')); - notice($e->getMessage()); - } - - DI::baseUrl()->redirect('admin/site'); - } - // end relocate - $sitename = (!empty($_POST['sitename']) ? trim($_POST['sitename']) : ''); $sender_email = (!empty($_POST['sender_email']) ? trim($_POST['sender_email']) : ''); $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); @@ -462,8 +445,9 @@ class Site extends BaseAdmin '$no_relay_list' => DI::l10n()->t('The system is not subscribed to any relays at the moment.'), '$relay_list_title' => DI::l10n()->t('The system is currently subscribed to the following relays:'), '$relay_list' => Relay::getList(['url']), - '$relocate' => DI::l10n()->t('Relocate Instance'), - '$relocate_warning' => DI::l10n()->t('Warning! Advanced function. Could make this server unreachable.'), + '$relocate' => DI::l10n()->t('Relocate Node'), + '$relocate_msg' => DI::l10n()->t('Relocating your node enables you to change the DNS domain of this node and keep all the existing users and posts. This process takes a while and can only be started from the relocate console command like this:'), + '$relocate_cmd' => DI::l10n()->t('(Friendica directory)# bin/console relocate https://newdomain.com'), '$baseurl' => DI::baseUrl()->get(true), // name, label, value, help string, extra data... @@ -551,8 +535,6 @@ class Site extends BaseAdmin '$temppath' => ['temppath', DI::l10n()->t('Temp path'), DI::config()->get('system', 'temppath'), DI::l10n()->t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], '$only_tag_search' => ['only_tag_search', DI::l10n()->t('Only search in tags'), DI::config()->get('system', 'only_tag_search'), DI::l10n()->t('On large systems the text search can slow down the system extremely.')], - '$relocate_url' => ['relocate_url', DI::l10n()->t('New base url'), DI::baseUrl()->get(), DI::l10n()->t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], - '$worker_queues' => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], '$worker_fastlane' => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 6e2958b978..f23cc521e7 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -148,14 +148,10 @@ - {{* separate form for relocate... *}} -
- +

{{$relocate}}

-

{{$relocate_warning nofilter}}

- {{include file="field_input.tpl" field=$relocate_url}} - -
- +

{{$relocate_msg}}

+

{{$relocate_cmd}}

+
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 3bd1a49af2..f6a01b541a 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -321,14 +321,7 @@ - -
- - - +
-
- {{$relocate_warning nofilter}} -
- {{include file="field_input.tpl" field=$relocate_url}} -
-
- +

+ {{$relocate_msg}} +

+

{{$relocate_cmd}}

- +
-- 2.39.5