New naming convention applied to many functions, see #118 for details

[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 bcb6b72baa0ac3c7fe9f5149997b28d435f65612..bc5cde104ab3d454a733fc4342c94d31191f8fb0 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -55,7 +55,7 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
                SQL_FREERESULT($result_user);
 
                // Delete user account
-               DELETE_USER_ACCOUNT(REQUEST_GET('uid'), REQUEST_POST('reason'));
+               deleteUserAccount(REQUEST_GET('uid'), REQUEST_POST('reason'));
 
                // Output message
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
@@ -65,7 +65,7 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
        }
 } elseif (REQUEST_ISSET_POST(('no'))) {
        // Do not delete him...
-       LOAD_URL(ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid')));
+       redirectToUrl(ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid')));
 } elseif (!REQUEST_ISSET_GET('uid')) {
        // Output selection form with all confirmed user accounts listed
        ADD_MEMBER_SELECTION_BOX();
@@ -80,11 +80,12 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
 
                // Prepare content
                $content = array(
-                       'email'   => CREATE_EMAIL_LINK($email, "user_data"),
+                       'email'   => generateMemberEmailLink($email, "user_data"),
                        'surname' => $sname,
                        'family'  => $fname,
                        'header'  => sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), REQUEST_GET('uid')),
-                       'text'    => sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), REQUEST_GET('uid'))
+                       'text'    => sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), REQUEST_GET('uid')),
+                       'userid'  => REQUEST_GET('uid')
                );
 
                // Display form