Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index b1ad2e5ca0d2bf8583d403a11e3dff71651b2e7a..bf5969982a2c3cf462029ad5876789c3217ebbb4 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -4,21 +4,21 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Model\User;
 
-function removeme_post(App $a) {
-
-       if (! local_user()) {
+function removeme_post(App $a)
+{
+       if (!local_user()) {
                return;
        }
 
-       if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+       if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
                return;
        }
 
-       if ((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) {
+       if ((!x($_POST, 'qxz_password')) || (!strlen(trim($_POST['qxz_password'])))) {
                return;
        }
 
-       if ((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) {
+       if ((!x($_POST, 'verify')) || (!strlen(trim($_POST['verify'])))) {
                return;
        }
 
@@ -26,18 +26,15 @@ function removeme_post(App $a) {
                return;
        }
 
-       $encrypted = hash('whirlpool',trim($_POST['qxz_password']));
-
-       if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
+       if (User::authenticate($a->user['uid'], trim($_POST['qxz_password']))) {
                User::remove($a->user['uid']);
                // NOTREACHED
        }
-
 }
 
-function removeme_content(App $a) {
-
-       if (! local_user()) {
+function removeme_content(App $a)
+{
+       if (!local_user()) {
                goaway(System::baseUrl());
        }
 
@@ -59,5 +56,4 @@ function removeme_content(App $a) {
        ));
 
        return $o;
-
 }