Merge pull request #3541 from annando/bugfix-poller

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 6c84c41892b9bdb1190cd6a944b53dfffd128ae8..639c9be9f457bafcf704ecaa0e23252e5a377bad 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,49 +1,55 @@
 <?php
 
-if(! function_exists('removeme_post')) {
-function removeme_post(&$a) {
+use Friendica\App;
 
-       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;
+       }
 
-       if($_POST['verify'] !== $_SESSION['remove_account_verify'])
+       if ($_POST['verify'] !== $_SESSION['remove_account_verify']) {
                return;
+       }
 
        $encrypted = hash('whirlpool',trim($_POST['qxz_password']));
 
-       if((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
+       if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
                require_once('include/Contact.php');
                user_remove($a->user['uid']);
                // NOTREACHED
        }
-}
+
 }
 
-if(! function_exists('removeme_content')) {
-function removeme_content(&$a) {
+function removeme_content(App $a) {
 
-       if(! local_user())
+       if (! local_user()) {
                goaway(z_root());
+       }
 
        $hash = random_string();
 
-        require_once("mod/settings.php");
-        settings_init($a);
+       require_once("mod/settings.php");
+       settings_init($a);
 
        $_SESSION['remove_account_verify'] = $hash;
 
        $tpl = get_markup_template('removeme.tpl');
        $o .= replace_macros($tpl, array(
-               '$basedir' => $a->get_baseurl(),
+               '$basedir' => App::get_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.'),
@@ -52,5 +58,5 @@ function removeme_content(&$a) {
        ));
 
        return $o;
-}
+
 }