X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_user.php;h=9c18169179aac2eeb39ce3fdd30a1038aa6a37e1;hb=5298a98f56b4d62bf6a463d5b8a2b63fb0e453c2;hp=6275cc15b0a9b8579c1e02702fc5bbf3b8667d28;hpb=596dc7b01cb00024bfb4eabb4fdb0dd500637f83;p=mailer.git

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 6275cc15b0..9c18169179 100644
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -46,16 +46,16 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // User exists..
-if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {
+if ((isFormSent()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {
 	// Delete users account
 	$result_user = SQL_QUERY_ESC("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-		array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+	array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result_user) == 1) {
 		// Free memory
 		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,14 +65,14 @@ 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();
 } 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(REQUEST_GET('uid'))), __FILE__, __LINE__);
+	array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
 		list ($email, $sname, $fname) = SQL_FETCHROW($result);
@@ -80,7 +80,7 @@ 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')),