X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=799efbc9109816279258892fd5ddea69c8425c9a;hp=79a408a4d926548dc81bd693a5e33e4498e618d0;hb=d897dae9f3b01f17fb59f2b96ba067b1a0f417b0;hpb=f353f4311bb8e2473781b7415b516f1aed8a6e8c

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 79a408a4d9..799efbc910 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/16/2003 *
- * ===============                              Last change: 06/30/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 10/16/2003 *
+ * ===================                          Last change: 06/30/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-mydata.php                                  *
@@ -53,7 +53,7 @@ if ((!isExtensionActive('mydata')) && (!isAdmin())) {
 
 // Add userid
 $content = array(
-	'userid' => getUserId()
+	'userid' => getMemberId()
 );
 
 // Init variable to prevent notices
@@ -67,21 +67,8 @@ if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notificat
 
 switch ($mode) {
 	case 'show': // Show his data
-		if (isExtensionActive('country', true)) {
-			// New way                          1          2            3             4         5      6        7           8            9              10         11         12               13            14
-			$result = SQL_QUERY_ESC("SELECT `surname`, `family`, `street_nr`, `country_code`, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `gender`, `max_mails`, `receive_mails`, `last_update` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
-		} else {
-			// Old way                          1          2            3        4         5      6        7           8            9              10         11         12               13            14
-			$result = SQL_QUERY_ESC("SELECT `surname`, `family`, `street_nr`, `country`, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `gender`, `max_mails`, `receive_mails`, `last_update` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
-		}
-
 		// Get line
-		$content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
-
-		// Free result
-		SQL_FREERESULT($result);
+		$content = merge_array($content, getUserDataArray());
 
 		// Translate some things
 		$content['gender']      = translateGender($content['gender']);
@@ -90,14 +77,14 @@ switch ($mode) {
 		// How far is last change on his profile away from now?
 		if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
 			// You cannot change your account
-			$content['change'] = loadTemplate('admin_settings_saved', true, "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0))."</div>");
+			$content['change'] = loadTemplate('admin_settings_saved', true, '<div class="member_failed">' . sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
 		} else {
 			// He is allowed to change his profile
 			$content['change'] = loadTemplate('member_mydata_button', true);
 		}
 
-		if (strlen($content['birth_day'])   == 1) $content['birth_day']   = 0 . $content['birth_day'];
-		if (strlen($content['birth_month']) == 1) $content['birth_month'] = 0 . $content['birth_month'];
+		if (strlen($content['birth_day'])   == 1) $content['birth_day']   = '0' . $content['birth_day'];
+		if (strlen($content['birth_month']) == 1) $content['birth_month'] = '0' . $content['birth_month'];
 
 		switch (getLanguage()) {
 			case 'de': $content['dob'] = $content['birth_day']   . '.' . $content['birth_month'] . '.' . $content['birth_year']; break;
@@ -122,7 +109,7 @@ FROM
 WHERE
 	`userid`=%s
 LIMIT 1",
-			array(getUserId()), __FILE__, __LINE__);
+			array(getMemberId()), __FILE__, __LINE__);
 		} else {
 			// Old way                          0          1            2          3       4       5       6           7            8              9          10         11               12            13
 			$result = SQL_QUERY_ESC("SELECT `surname`, `family`, `street_nr`, `country`, `zip`, `city`, `email`, `birth_day`, `birth_month`, `birth_year`, `gender`, `max_mails`, `receive_mails`, `last_update`
@@ -131,7 +118,7 @@ FROM
 WHERE
 	`userid`=%s
 LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
+				array(getMemberId()), __FILE__, __LINE__);
 		}
 
 		// Get line
@@ -147,7 +134,7 @@ LIMIT 1",
 			$content['update_check'] = sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
 
 			// You cannot change your account
-			loadTemplate('member_mydata_locked', false, $content);
+			loadTemplate('admin_settings_saved', false, $content['update_check']);
 		} else {
 			// He is allowed to change his profile
 			foreach (array('gender_m','gender_f','gender_c') as $entry) {
@@ -202,26 +189,21 @@ LIMIT 1",
 		break;
 
 	case 'save': // Save entered data
-		// Load old email / password:      0          1           2
-		$result = SQL_QUERY_ESC("SELECT `email`, `password`, `last_update` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
-			array(getUserId()), __FILE__, __LINE__);
-
 		// Get line
-		$content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
-
-		// Free result
-		SQL_FREERESULT($result);
+		$content = merge_array($content, getUserDataArray());
 
+		// Calculate time to check
 		$content['update_check'] = $content['last_update'] + getConfig('profile_lock');
 
 		// How far is last change on his profile away from now?
 		if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
 			$content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
+
 			// You cannot change your account
-			loadTemplate('member_mydata_locked', false, $content);
+			loadTemplate('admin_settings_saved', false, $content['update_check']);
 		} elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
 			// Invalid email address!
-			loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+			loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
 		} else {
 			// Generate hash
 			$hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
@@ -274,7 +256,7 @@ LIMIT 1",
 							bigintval(postRequestElement('month')),
 							bigintval(postRequestElement('year')),
 							bigintval(postRequestElement('max_mails')),
-							getUserId()
+							getMemberId()
 						), __FILE__, __LINE__);
 				} else {
 					// Old way
@@ -306,7 +288,7 @@ LIMIT 1",
 							bigintval(postRequestElement('month')),
 							bigintval(postRequestElement('year')),
 							bigintval(postRequestElement('max_mails')),
-							getUserId()
+							getMemberId()
 						), __FILE__, __LINE__);
 				}
 
@@ -330,7 +312,7 @@ LIMIT 1",
 
 	case 'notify': // Switch off notfication
 		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N', `last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
-			array(getUserId()), __FILE__, __LINE__);
+			array(getMemberId()), __FILE__, __LINE__);
 		$URL = 'modules.php?module=login&amp;what=welcome&amp;code=' . urlencode(getMessage('PROFILE_UPDATED'));
 		break;
 } // END - switch