X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fremoveme.php;h=7ed0d1da90244d1688d96576e3d6818da0eb7587;hb=8db9b0987eb6b2bf6f46efcb2a523be240246bdf;hp=26853a38e767e6d5c49eac9b56fde78cc8798229;hpb=ecea7425f8ad11ace4af39d476919e3203bff44f;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index 26853a38e7..7ed0d1da90 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -6,11 +6,10 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
-
-require_once 'include/enotify.php';
+use Friendica\Util\Strings;
 
 function removeme_post(App $a)
 {
@@ -18,15 +17,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;
 	}
 
@@ -38,7 +37,7 @@ function removeme_post(App $a)
 	// send email to admins
 	$admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 	foreach ($admin_mails as $mail) {
-		$admin = DBA::selectFirst('user', ['uid', 'language', 'email'], ['email' => $mail]);
+		$admin = DBA::selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => $mail]);
 		if (!DBA::isResult($admin)) {
 			continue;
 		}
@@ -48,14 +47,19 @@ function removeme_post(App $a)
 			'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'],
+			'to_name'      => $admin['username'],
 			'uid'          => $admin['uid'],
 			'language'     => $admin['language'] ? $admin['language'] : 'en',
 			'show_in_notification_page' => false
 		]);
 	}
 
-	if (User::authenticate($a->user, trim($_POST['qxz_password']))) {
+	if (User::getIdFromPasswordAuthentication($a->user, trim($_POST['qxz_password']))) {
 		User::remove($a->user['uid']);
+
+		unset($_SESSION['authenticated']);
+		unset($_SESSION['uid']);
+		$a->internalRedirect();
 		// NOTREACHED
 	}
 }
@@ -63,19 +67,19 @@ function removeme_post(App $a)
 function removeme_content(App $a)
 {
 	if (!local_user()) {
-		goaway(System::baseUrl());
+		$a->internalRedirect();
 	}
 
-	$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' => $a->getBaseURL(),
 		'$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.'),