Some more wrappers added, code cleanups:

[mailer.git] / inc / modules / admin / what-del_user.php

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 17973ef9d844f3b3da4e9a5dadf92e9395e4e704..382787087a9993bc9e40dff37109c36a67e1b4c6 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -46,14 +46,14 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // User exists..
-if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reason'))))) {
+if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet('reason')))) {
        // Is the account there?
        if (fetchUserData(getRequestParameter('userid'))) {
                // Delete user account
                deleteUserAccount(getRequestParameter('userid'), postRequestParameter('reason'));
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_DEL_COMPLETED--}');
        } else {
                // Account does not exists!
                loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
@@ -69,12 +69,8 @@ if ((isFormSent()) || ((isFormSent('del')) && (isPostRequestParameterSet(('reaso
        if (fetchUserData(getRequestParameter('userid'))) {
                // Prepare content
                $content = array(
-                       'email'   => generateEmailLink(getUserData('email'), 'user_data'),
-                       'surname' => getUserData('surname'),
-                       'family'  => getUserData('family'),
-                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', bigintval(getRequestParameter('userid'))),
-                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', bigintval(getRequestParameter('userid'))),
-                       'userid'  => bigintval(getRequestParameter('userid'))
+                       'email'  => generateEmailLink(getUserData('email'), 'user_data'),
+                       'userid' => bigintval(getRequestParameter('userid'))
                );
 
                // Display form