Improved support for Mastodon style content warnings

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index d6b24eb0cc6a245a32f2f3807aaf8ff3c2f50496..ae441e59364d0c5d7b8f820ed0ca69e610ceac19 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,6 +1,22 @@
 <?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;
@@ -42,19 +58,19 @@ function removeme_post(App $a)
                }
 
                $email = DI::emailer()
-                       ->newSystemMail((!empty($admin['language'])) ? DI::l10n()->withLang($admin['language']) : DI::l10n()->withLang('en'))
+                       ->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['uid'] ?? 0)
+                       ->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']);