X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fremoveme.php;h=bf5969982a2c3cf462029ad5876789c3217ebbb4;hb=63622966666729ba82fef8f12484e022500ff867;hp=fe3770842d1848eeb61a63faceaea8c138dc95c7;hpb=3c24bed412235cf8c7a3f16b46fed18004abf87b;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index fe3770842d..bf5969982a 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -2,22 +2,23 @@
 
 use Friendica\App;
 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;
 	}
 
@@ -25,20 +26,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['uid'], 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();
@@ -50,7 +47,7 @@ function removeme_content(App $a) {
 
 	$tpl = get_markup_template('removeme.tpl');
 	$o .= replace_macros($tpl, array(
-		'$basedir' => App::get_baseurl(),
+		'$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.'),
@@ -59,5 +56,4 @@ function removeme_content(App $a) {
 	));
 
 	return $o;
-
 }