'close' not 'Close' and PagePeel added to ext-network

[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 56e14dfc3a8521b49b3a5ebe8d8bf4ba835d82ad..c455bbaed2336a7c4d9f4fc1e92a963240f03b15 100644 (file)
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 06/10/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 06/10/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-del_user.php                                *
@@ -46,13 +46,8 @@ addMenuDescription('admin', __FILE__);
 
 // User exists..
 if ((isFormSent()) || ((isPostRequestElementSet('del')) && (isPostRequestElementSet(('reason'))))) {
-       // Delete users account
-       $result_user = SQL_QUERY_ESC("SELECT userid FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-       array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_user) == 1) {
-               // Free memory
-               SQL_FREERESULT($result_user);
-
+       // Is the account there?
+       if (fetchUserData(getRequestElement('userid'))) {
                // Delete user account
                deleteUserAccount(getRequestElement('userid'), postRequestElement('reason'));
 
@@ -60,7 +55,7 @@ if ((isFormSent()) || ((isPostRequestElementSet('del')) && (isPostRequestElement
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
        }
 } elseif (isPostRequestElementSet('no')) {
        // Do not delete him...
@@ -70,21 +65,14 @@ if ((isFormSent()) || ((isPostRequestElementSet('del')) && (isPostRequestElement
        addMemberSelectionBox();
 } else {
        // Realy want to delete?
-       $result = SQL_QUERY_ESC("SELECT `email`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-               array(bigintval(getRequestElement('userid'))), __FILE__, __LINE__);
-
-       // Found a row?
-       if (SQL_NUMROWS($result) == 1) {
-               // Load data
-               list ($email, $surname, $family) = SQL_FETCHROW($result);
-
+       if (fetchUserData(getRequestElement('userid'))) {
                // Prepare content
                $content = array(
-                       'email'   => generateEmailLink($email, 'user_data'),
-                       'surname' => $surname,
-                       'family'  => $family,
-                       'header'  => sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), getRequestElement('userid')),
-                       'text'    => sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), getRequestElement('userid')),
+                       'email'   => generateEmailLink(getUserData('email'), 'user_data'),
+                       'surname' => getUserData('surname'),
+                       'family'  => getUserData('family'),
+                       'header'  => getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', getRequestElement('userid')),
+                       'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', getRequestElement('userid')),
                        'userid'  => getRequestElement('userid')
                );
 
@@ -92,12 +80,9 @@ if ((isFormSent()) || ((isPostRequestElementSet('del')) && (isPostRequestElement
                loadTemplate('admin_del_user', false, $content);
        } else {
                // Account does not exists!
-               loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
+               loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
        }
-
-       // Free the result
-       SQL_FREERESULT($result);
 }
 
-//
+// [EOF]
 ?>