X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fremoveme.php;h=ae441e59364d0c5d7b8f820ed0ca69e610ceac19;hb=989ac2fda800b826addbf70eff4feccde1c352ba;hp=adc788983efd9a5ef3381e41f1e5e7be5334cf22;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index adc788983e..ae441e5936 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,17 +1,30 @@
 <?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\L10n;
-use Friendica\Core\System;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
-
-require_once 'include/enotify.php';
+use Friendica\Util\Strings;
 
 function removeme_post(App $a)
 {
@@ -19,15 +32,15 @@ function removeme_post(App $a)
 		return;
 	}
 
-	if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
+	if (!empty($_SESSION['submanage'])) {
 		return;
 	}
 
-	if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
+	if (empty($_POST['qxz_password'])) {
 		return;
 	}
 
-	if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
+	if (empty($_POST['verify'])) {
 		return;
 	}
 
@@ -37,26 +50,31 @@ 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'], ['email' => $mail]);
-		if (!DBM::is_result($admin)) {
+		$admin = DBA::selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => $mail]);
+		if (!DBA::isResult($admin)) {
 			continue;
 		}
-		notification([
-			'type'         => SYSTEM_EMAIL,
-			'subject'      => L10n::t('[Friendica System Notify]') . ' ' . L10n::t('User deleted their account'),
-			'preamble'     => L10n::t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
-			'body'         => L10n::t('The user id is %d', local_user()),
-			'to_email'     => $admin['email'],
-			'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::authenticate($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']);
+		DI::baseUrl()->redirect();
 		// NOTREACHED
 	}
 }
@@ -64,24 +82,24 @@ function removeme_post(App $a)
 function removeme_content(App $a)
 {
 	if (!local_user()) {
-		goaway(System::baseUrl());
+		DI::baseUrl()->redirect();
 	}
 
-	$hash = random_string();
+	$hash = Strings::getRandomHex();
 
 	require_once("mod/settings.php");
 	settings_init($a);
 
 	$_SESSION['remove_account_verify'] = $hash;
 
-	$tpl = get_markup_template('removeme.tpl');
-	$o = replace_macros($tpl, [
-		'$basedir' => System::baseUrl(),
+	$tpl = Renderer::getMarkupTemplate('removeme.tpl');
+	$o = Renderer::replaceMacros($tpl, [
+		'$basedir' => DI::baseUrl()->get(),
 		'$hash' => $hash,
-		'$title' => L10n::t('Remove My Account'),
-		'$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),
-		'$passwd' => L10n::t('Please enter your password for verification:'),
-		'$submit' => L10n::t('Remove My Account')
+		'$title' => DI::l10n()->t('Remove My Account'),
+		'$desc' => DI::l10n()->t('This will completely remove your account. Once this has been done it is not recoverable.'),
+		'$passwd' => DI::l10n()->t('Please enter your password for verification:'),
+		'$submit' => DI::l10n()->t('Remove My Account')
 	]);
 
 	return $o;