X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fremoveme.php;h=5dcd33e8f57d2f63b8ae01a7648deb1f21bd3e5e;hb=5a6fa4ae87f7ae5c07672b0fd90fef7c52680818;hp=c181ee6ea1091aad140cc0d2c498db6e02c1cbdf;hpb=bdf42473a0341f291cd256323d122aa80bb0cb0b;p=friendica.git

diff --git a/mod/removeme.php b/mod/removeme.php
index c181ee6ea1..5dcd33e8f5 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,22 +1,33 @@
 <?php
 
-function removeme_post(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
 
-	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;
+	}
+
+	if ($_POST['verify'] !== $_SESSION['remove_account_verify']) {
+		return;
+	}
 
 	$encrypted = hash('whirlpool',trim($_POST['qxz_password']));
 
-	if((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
+	if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
 		require_once('include/Contact.php');
 		user_remove($a->user['uid']);
 		// NOTREACHED
@@ -24,20 +35,22 @@ function removeme_post(&$a) {
 
 }
 
+function removeme_content(App $a) {
 
-
-function removeme_content(&$a) {
-
-	if(! local_user())
-		goaway(z_root());
+	if (! local_user()) {
+		goaway(System::baseUrl());
+	}
 
 	$hash = random_string();
 
+	require_once("mod/settings.php");
+	settings_init($a);
+
 	$_SESSION['remove_account_verify'] = $hash;
 
 	$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 +58,6 @@ function removeme_content(&$a) {
 		'$submit' => t('Remove My Account')
 	));
 
-	return $o;		
+	return $o;
 
-}
\ No newline at end of file
+}