X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_user.php;h=aa5f6ae47822e8a37fe5ff373e4b821ccf688a16;hb=e08c50b31f6e91d76ed5f728b59a391f985e9ee0;hp=6fdc06eabbab21fcc784ab26704defad1ce075a1;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 6fdc06eabb..aa5f6ae478 100644
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -46,17 +44,17 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addMenuDescription('admin', __FILE__);
 
 // User exists..
-if ((isFormSent()) || ((isPostRequestParameterSet('del')) && (isPostRequestParameterSet(('reason'))))) {
+if ((isFormSent()) || ((isFormSent('delete')) && (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_DELETE_COMPLETED--}');
 	} else {
 		// Account does not exists!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } elseif (isPostRequestParameterSet('no')) {
 	// Do not delete him...
@@ -69,19 +67,15 @@ if ((isFormSent()) || ((isPostRequestParameterSet('del')) && (isPostRequestParam
 	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', getRequestParameter('userid')),
-			'text'    => getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', getRequestParameter('userid')),
-			'userid'  => getRequestParameter('userid')
+			'email'  => generateEmailLink(getUserData('email'), 'user_data'),
+			'userid' => bigintval(getRequestParameter('userid'))
 		);
 
 		// Display form
-		loadTemplate('admin_del_user', false, $content);
+		loadTemplate('admin_delete_user', false, $content);
 	} else {
 		// Account does not exists!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 }