Merge pull request #4440 from rabuzarus/20180211_-_fix_variables_part_two

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 5dcd33e8f57d2f63b8ae01a7648deb1f21bd3e5e..0363bf9f32990ad900d182c2c14bd5719b22eaf9 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,23 +1,27 @@
 <?php
-
+/**
+ * @file mod/removeme.php
+ */
 use Friendica\App;
+use Friendica\Core\L10n;
 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;
        }
 
@@ -25,19 +29,15 @@ function removeme_post(App $a) {
                return;
        }
 
-       $encrypted = hash('whirlpool',trim($_POST['qxz_password']));
-
-       if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
-               require_once('include/Contact.php');
-               user_remove($a->user['uid']);
+       if (User::authenticate($a->user, 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());
        }
 
@@ -49,15 +49,14 @@ function removeme_content(App $a) {
        $_SESSION['remove_account_verify'] = $hash;
 
        $tpl = get_markup_template('removeme.tpl');
-       $o .= replace_macros($tpl, array(
+       $o = replace_macros($tpl, [
                '$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.'),
-               '$passwd' => t('Please enter your password for verification:'),
-               '$submit' => t('Remove My Account')
-       ));
+               '$title' => L10n::t('Remove My Account'),
+               '$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),
+               '$passwd' => L10n::t('Please enter your password for verification:'),
+               '$submit' => L10n::t('Remove My Account')
+       ]);
 
        return $o;
-
 }