X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_user.php;h=3c72c1e8453650fea6ef6333cb85e037f484ef97;hb=5d9f65a4efafdeda1f03cf03fc95421bc600b9dc;hp=adedc495557f11acea01cccbad92b0b746e9e45e;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index adedc49555..3c72c1e845 100644
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Display only title when no form was submitted
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // User exists..
 if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('reason'))))) {
@@ -58,15 +58,15 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
 		DELETE_USER_ACCOUNT(REQUEST_GET('uid'), REQUEST_POST('reason'));
 
 		// Output message
-		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_DEL_COMPLETED'));
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_DEL_COMPLETED'));
 	} else {
 		// Account does not exists!
-		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+		LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
 	}
 } elseif (REQUEST_ISSET_POST(('no'))) {
 	// Do not delete him...
-	LOAD_URL("modules.php?module=admin&amp;what=list_user&amp;uid=".REQUEST_GET('uid'));
-} elseif (!REQUEST_ISSET_GET(('uid'))) {
+	LOAD_URL(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 {
@@ -78,17 +78,20 @@ if ((IS_FORM_SENT()) || ((REQUEST_ISSET_POST('del')) && (REQUEST_ISSET_POST(('re
 		list ($email, $sname, $fname) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
-		// Transfer data to constants for the template
-		define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
-		define('__SNAME', $sname);
-		define('__FNAME', $fname);
-		define('__UID'  , REQUEST_GET('uid'));
+		// Prepare content
+		$content = array(
+			'email'   => CREATE_EMAIL_LINK($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'))
+		);
 
 		// Display form
-		LOAD_TEMPLATE("admin_del_user");
+		LOAD_TEMPLATE("admin_del_user", false, $content);
 	} else {
 		// Account does not exists!
-		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+		LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
 	}
 }