Catch HTTPExceptions in App::runFrontend()

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index c2ceb7d4cf6d10aee8c66959c223f03fb44a0af7..741a67598a2745b575ff2e8deaa704a6c8d112ed 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -10,8 +10,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 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']);
+               $a->internalRedirect();
                // NOTREACHED
        }
 }
@@ -68,7 +71,7 @@ function removeme_content(App $a)
                $a->internalRedirect();
        }
 
-       $hash = random_string();
+       $hash = Strings::getRandomHex();
 
        require_once("mod/settings.php");
        settings_init($a);