X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_user.php;h=617549bc50752bff2bd8c98e18f08fb77ccf919f;hb=8ce32e702f3caa76b8d446902948e83e1e6854c8;hp=6b1e9e0a98a1e4853b90319eba56573c352d2c5c;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index 6b1e9e0a98..617549bc50 100644
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -14,13 +14,12 @@
  * $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!!!!!!            *
  * -------------------------------------------------------------------- *
  * @TODO Add support for ext-country                                    *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,16 +43,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Fix a notice
 $result_main = false;
 if (isGetRequestElementSet('userid')) {
 	// Load user entry
 	$result_main = SQL_QUERY_ESC("SELECT
-	`userid`, `gender`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`,
+	`userid`,`gender`,`surname`,`family`,`street_nr`,`zip`,`city`,`country`,
 	`email`,
-	`birth_day`, `birth_month`, `birth_year`,
+	`birth_day`,`birth_month`,`birth_year`,
 	`max_mails`
 FROM
 	`{?_MYSQL_PREFIX?}_user_data`
@@ -65,12 +64,12 @@ LIMIT 1",
 		), __FILE__, __LINE__);
 } // END - if
 
-if ((SQL_NUMROWS($result_main) == 1) || (!isGetRequestElementSet('userid'))) {
+if ((!isGetRequestElementSet('userid')) || (SQL_NUMROWS($result_main) == 1)) {
 	// User found
 	if (!isGetRequestElementSet('userid')) {
 		// Output selection form with all confirmed user accounts listed
 		addMemberSelectionBox();
-	} elseif (isPostRequestElementSet('edit')) {
+	} elseif (isFormSent('edit')) {
 		// Ok, change the account...
 		$updateUser = false; $add = '';
 		if ((!isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
@@ -79,22 +78,26 @@ if ((SQL_NUMROWS($result_main) == 1) || (!isGetRequestElementSet('userid'))) {
 		} elseif ((postRequestElement('pass1') == postRequestElement('pass2'))) {
 			// Change the password
 			$updateUser = true;
-			$add = ", `password`='" . generateHash(postRequestElement('pass1')) . "'";
+			$add = ",`password`='" . generateHash(postRequestElement('pass1')) . "'";
 		}
 
 		if ($updateUser === true) {
 			// We have to add the following things: birthday and max receive mails
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET
-`gender`='%s',
-`surname`='%s',
-`family`='%s',
-`street_nr`='%s',
-`country`='%s',
-`zip`=%s,
-`city`='%s',
-`email`='%s'
-".$add."
-WHERE `userid`=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`gender`='%s',
+	`surname`='%s',
+	`family`='%s',
+	`street_nr`='%s',
+	`country`='%s',
+	`zip`=%s,
+	`city`='%s',
+	`email`='%s'
+	".$add."
+WHERE
+	`userid`=%s
+LIMIT 1",
 			array(
 				substr(postRequestElement('gender'), 0, 1),
 				postRequestElement('surname'),
@@ -106,32 +109,24 @@ WHERE `userid`=%s LIMIT 1",
 				postRequestElement('email'),
 				bigintval(getRequestElement('userid')),
 			), __FILE__, __LINE__);
-			$content = getMessage('USER_ACCOUNT_SAVED');
+			$content = '{--ADMIN_USER_ACCOUNT_SAVED--}';
 		} else {
 			// Problem while saving data
-			$content = getMessage('USER_ACCOUNT_NOT_SAVED');
+			$content = '{--ADMIN_USER_ACCOUNT_NOT_SAVED--}';
 		}
 
 		// Load template
-		loadTemplate('admin_settings_saved', false, $content);
+		displayMessage($content);
 	} else {
 		// Load entry
 		$content = SQL_FETCHARRAY($result_main);
 
-		// Init entries
-		foreach (array('gender_m','gender_f','gender_c') as $entry) {
-			$content[$entry] = '';
-		} // END - foreach
-
-		// Prepare selections
-		$content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
-
 		// Load template
 		loadTemplate('admin_edit_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_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
 }
 
 // Free the result