Merge pull request #6170 from annando/safe-save

[friendica.git] / mod / removeme.php

diff --git a/mod/removeme.php b/mod/removeme.php
index 1676b7b5713d5e79d74d25801f85e14afdce4e4f..49b8f6d5345d4478ecb83582c02f3b989ea9cec2 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -6,10 +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\Database\DBM;
 use Friendica\Model\User;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -39,8 +40,8 @@ function removeme_post(App $a)
        // send email to admins
        $admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
        foreach ($admin_mails as $mail) {
-               $admin = DBA::selectFirst('user', ['uid', 'language', 'email'], ['email' => $mail]);
-               if (!DBM::is_result($admin)) {
+               $admin = DBA::selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => $mail]);
+               if (!DBA::isResult($admin)) {
                        continue;
                }
                notification([
@@ -49,6 +50,7 @@ function removeme_post(App $a)
                        'preamble'     => L10n::t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
                        'body'         => L10n::t('The user id is %d', local_user()),
                        'to_email'     => $admin['email'],
+                       'to_name'      => $admin['username'],
                        'uid'          => $admin['uid'],
                        'language'     => $admin['language'] ? $admin['language'] : 'en',
                        'show_in_notification_page' => false
@@ -64,19 +66,19 @@ function removeme_post(App $a)
 function removeme_content(App $a)
 {
        if (!local_user()) {
-               goaway(System::baseUrl());
+               $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, [
-               '$basedir' => System::baseUrl(),
+       $tpl = Renderer::getMarkupTemplate('removeme.tpl');
+       $o = Renderer::replaceMacros($tpl, [
+               '$basedir' => $a->getBaseURL(),
                '$hash' => $hash,
                '$title' => L10n::t('Remove My Account'),
                '$desc' => L10n::t('This will completely remove your account. Once this has been done it is not recoverable.'),