X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-del_user.php;h=b463096076b6873ca9ca48d8d6044f6cf32079fa;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=7cf903545864bd1631086ab9ce75f5e666fc88a4;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git

diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php
index 7cf9035458..b463096076 100644
--- a/inc/modules/admin/what-del_user.php
+++ b/inc/modules/admin/what-del_user.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mitglieder loeschen                              *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -38,58 +38,66 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-}
+} // END - if
 
 // 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'))))) {
+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'));
+		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'))) {
+} 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'))) {
+	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",
+	$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__);
+
+	// Found a row?
 	if (SQL_NUMROWS($result) == 1) {
 		// Load data
 		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'   => generateEmailLink($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')),
+			'userid'  => 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>");
 	}
+
+	// Free the result
+	SQL_FREERESULT($result);
 }
 
 //