X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fremoveme.php;h=0363bf9f32990ad900d182c2c14bd5719b22eaf9;hb=cfb00d811df2a5b41c096e16aab45d2d4ee1dabd;hp=639c9be9f457bafcf704ecaa0e23252e5a377bad;hpb=4a473611163a12b48d3bbad71dc54765be8789f9;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index 639c9be9f4..0363bf9f32 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,22 +1,27 @@
 <?php
-
+/**
+ * @file mod/removeme.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Model\User;
 
-function removeme_post(App $a) {
-
-	if (! local_user()) {
+function removeme_post(App $a)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+	if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
 		return;
 	}
 
-	if ((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) {
+	if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
 		return;
 	}
 
-	if ((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) {
+	if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
 		return;
 	}
 
@@ -24,20 +29,16 @@ function removeme_post(App $a) {
 		return;
 	}
 
-	$encrypted = hash('whirlpool',trim($_POST['qxz_password']));
-
-	if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
-		require_once('include/Contact.php');
-		user_remove($a->user['uid']);
+	if (User::authenticate($a->user, trim($_POST['qxz_password']))) {
+		User::remove($a->user['uid']);
 		// NOTREACHED
 	}
-
 }
 
-function removeme_content(App $a) {
-
-	if (! local_user()) {
-		goaway(z_root());
+function removeme_content(App $a)
+{
+	if (!local_user()) {
+		goaway(System::baseUrl());
 	}
 
 	$hash = random_string();
@@ -48,15 +49,14 @@ function removeme_content(App $a) {
 	$_SESSION['remove_account_verify'] = $hash;
 
 	$tpl = get_markup_template('removeme.tpl');
-	$o .= replace_macros($tpl, array(
-		'$basedir' => App::get_baseurl(),
+	$o = replace_macros($tpl, [
+		'$basedir' => System::baseUrl(),
 		'$hash' => $hash,
-		'$title' => t('Remove My Account'),
-		'$desc' => t('This will completely remove your account. Once this has been done it is not recoverable.'),
-		'$passwd' => t('Please enter your password for verification:'),
-		'$submit' => t('Remove My Account')
-	));
+		'$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')
+	]);
 
 	return $o;
-
 }