Merge branch 'develop' into mastodon-instance-v2-implementation

[friendica.git] / src / Module / Settings / RemoveMe.php

diff --git a/src/Module/Settings/RemoveMe.php b/src/Module/Settings/RemoveMe.php
index b9a7f5c62d1aaa1c02df11e260d175de219c4e25..1225cc1e2e10eb9384b1cf7551ce81bca0e810cd 100644 (file)
--- a/src/Module/Settings/RemoveMe.php
+++ b/src/Module/Settings/RemoveMe.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -40,8 +40,6 @@ use Psr\Log\LoggerInterface;
 
 class RemoveMe extends BaseSettings
 {
-       /** @var IHandleUserSessions */
-       private $session;
        /** @var IManageConfigValues */
        private $config;
        /** @var Database */
@@ -53,11 +51,10 @@ class RemoveMe extends BaseSettings
        /** @var Cookie */
        private $cookie;
 
-       public function __construct(Cookie $cookie, SystemMessages $systemMessages, Emailer $emailer, Database $database, IManageConfigValues $config, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Cookie $cookie, SystemMessages $systemMessages, Emailer $emailer, Database $database, IManageConfigValues $config, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
+               parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
-               $this->session        = $session;
                $this->config         = $config;
                $this->database       = $database;
                $this->emailer        = $emailer;
@@ -88,14 +85,8 @@ class RemoveMe extends BaseSettings
                }
 
                // send notification to admins so that they can clean up the backups
-               $admin_mails = explode(',', $this->config->get('config', 'admin_email'));
-               foreach ($admin_mails as $mail) {
-                       $admin = $this->database->selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => trim($mail)]);
-                       if (!$admin) {
-                               continue;
-                       }
-
-                       $l10n = $this->l10n->withLang($admin['language']);
+               foreach (User::getAdminListForEmailing(['uid', 'language', 'email']) as $admin) {
+                       $l10n = $this->l10n->withLang($admin['language'] ?: 'en');
 
                        $email = $this->emailer
                                ->newSystemMail()