Merge pull request #11241 from annando/timing

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 0e90bc197e495a61e0a6dbf24ebdca779dc9bb71..ae441e59364d0c5d7b8f820ed0ca69e610ceac19 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,10 +1,25 @@
 <?php
 /**
- * @file mod/removeme.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -35,27 +50,27 @@ function removeme_post(App $a)
 
        // send notification to admins so that they can clean um the backups
        // send email to admins
-       $admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
+       $admin_mails = explode(",", str_replace(" ", "", DI::config()->get('config', 'admin_email')));
        foreach ($admin_mails as $mail) {
                $admin = DBA::selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => $mail]);
                if (!DBA::isResult($admin)) {
                        continue;
                }
-               notification([
-                       'type'         => SYSTEM_EMAIL,
-                       'subject'      => DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
-                       'preamble'     => DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
-                       'body'         => DI::l10n()->t('The user id is %d', local_user()),
-                       'to_email'     => $admin['email'],
-                       'to_name'      => $admin['username'],
-                       'uid'          => $admin['uid'],
-                       'language'     => $admin['language'] ? $admin['language'] : 'en',
-                       'show_in_notification_page' => false
-               ]);
+
+               $email = DI::emailer()
+                       ->newSystemMail()
+                       ->withMessage(
+                               DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
+                               DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
+                               DI::l10n()->t('The user id is %d', local_user()))
+                       ->forUser($admin)
+                       ->withRecipient($admin['email'])
+                       ->build();
+               DI::emailer()->send($email);
        }
 
-       if (User::getIdFromPasswordAuthentication($a->user, trim($_POST['qxz_password']))) {
-               User::remove($a->user['uid']);
+       if (User::getIdFromPasswordAuthentication($a->getLoggedInUserId(), trim($_POST['qxz_password']))) {
+               User::remove($a->getLoggedInUserId());
 
                unset($_SESSION['authenticated']);
                unset($_SESSION['uid']);