Move credits out of util/

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 86d46a177b26fc31a5f0bee87ce0dadacef8a1cf..ee0b66db8a3f282703eb52f415ae7518a341a513 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -6,9 +6,11 @@
 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\Model\User;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -55,8 +57,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']);
+               $a->internalRedirect();
                // NOTREACHED
        }
 }
@@ -67,15 +73,15 @@ function removeme_content(App $a)
                $a->internalRedirect();
        }
 
-       $hash = random_string();
+       $hash = Strings::getRandomHex();
 
        require_once("mod/settings.php");
        settings_init($a);
 
        $_SESSION['remove_account_verify'] = $hash;
 
-       $tpl = get_markup_template('removeme.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('removeme.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$basedir' => $a->getBaseURL(),
                '$hash' => $hash,
                '$title' => L10n::t('Remove My Account'),