X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fremoveme.php;h=bf5969982a2c3cf462029ad5876789c3217ebbb4;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=62b9a6d13aa561491ca8af6d9f7cfcdfcf6ae84e;hpb=c26463b65b4b98f9aca77781fd74a7fe99f73814;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index 62b9a6d13a..bf5969982a 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,43 +1,53 @@
 <?php
 
-function removeme_post(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Model\User;
 
-	if(! local_user())
+function removeme_post(App $a)
+{
+	if (!local_user()) {
 		return;
+	}
 
-	if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
+	if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
 		return;
+	}
 
-	if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
+	if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
 		return;
+	}
 
-	if($_POST['verify'] !== $_SESSION['remove_account_verify'])
+	if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
 		return;
+	}
 
-	$encrypted = hash('whirlpool',trim($_POST['qxz_password']));
+	if ($_POST['verify'] !== $_SESSION['remove_account_verify']) {
+		return;
+	}
 
-	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(&$a) {
-
-	if(! local_user())
-		goaway($a->get_baseurl());
+function removeme_content(App $a)
+{
+	if (!local_user()) {
+		goaway(System::baseUrl());
+	}
 
 	$hash = random_string();
 
+	require_once("mod/settings.php");
+	settings_init($a);
+
 	$_SESSION['remove_account_verify'] = $hash;
 
-	$tpl = load_view_file('view/removeme.tpl');
+	$tpl = get_markup_template('removeme.tpl');
 	$o .= replace_macros($tpl, array(
-		'$basedir' => $a->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.'),
@@ -45,6 +55,5 @@ function removeme_content(&$a) {
 		'$submit' => t('Remove My Account')
 	));
 
-	return $o;		
-
-}
\ No newline at end of file
+	return $o;
+}