Merge pull request #8073 from annando/issue-8067

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 44671ef073abae8abb27ddfae953c352b367c01b..ecf65c04c1969747ef9462c1296dd6b14eb20973 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -7,11 +7,10 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
-
-require_once 'include/enotify.php';
+use Friendica\Util\Strings;
 
 function removeme_post(App $a)
 {
@@ -19,15 +18,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;
        }
 
@@ -56,8 +55,12 @@ function removeme_post(App $a)
                ]);
        }
 
-       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']);
+               DI::baseUrl()->redirect();
                // NOTREACHED
        }
 }
@@ -65,7 +68,7 @@ function removeme_post(App $a)
 function removeme_content(App $a)
 {
        if (!local_user()) {
-               $a->internalRedirect();
+               DI::baseUrl()->redirect();
        }
 
        $hash = Strings::getRandomHex();
@@ -77,7 +80,7 @@ function removeme_content(App $a)
 
        $tpl = Renderer::getMarkupTemplate('removeme.tpl');
        $o = Renderer::replaceMacros($tpl, [
-               '$basedir' => $a->getBaseURL(),
+               '$basedir' => DI::baseUrl()->get(),
                '$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.'),