X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=28a0f11ad17e9ce30c0bb68ab711534a091b217a;hp=3ae5495f1ff970340eda9e3f82eaa1a2d5ea618a;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=916bba4f00ee924f0d88b8fc273dee5bfb798aed

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 3ae5495f1f..28a0f11ad1 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                                  *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -57,40 +58,33 @@ $content = array(
 );
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (isPostRequestElementSet('save'))   $mode = 'save';   // Save entered data
-if (isPostRequestElementSet('edit'))   $mode = 'edit';   // Edit data
-if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification
+if (isPostRequestParameterSet('save'))   $mode = 'save';   // Save entered data
+if (isFormSent('edit'))   $mode = 'edit';   // Edit data
+if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification
 
 switch ($mode) {
 	case 'show': // Show his data
-		// Get user data
-		if (!fetchUserData(getMemberId())) {
-			// Something really bad happended
-			debug_report_bug('No user account ' . getMemberId() . ' found.');
-		} // END - if
-
 		// Get line
 		$content = merge_array($content, getUserDataArray());
 
 		// Translate some things
-		$content['gender']      = translateGender($content['gender']);
 		$content['last_update'] = generateDateTime($content['last_update'], 0);
 
 		// 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">' . getMaskedMessage('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;
@@ -137,10 +131,10 @@ LIMIT 1",
 
 		// How far is last change on his profile away from now?
 		if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-			$content['update_check'] = sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+			$content['update_check'] = getMaskedMessage('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) {
@@ -186,7 +180,7 @@ LIMIT 1",
 				$content['country'] = $OUT;
 			} else {
 				// Ouput default input box
-				$content['country'] = "<input type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$content['country']."\" />";
+				$content['country'] = '<input type="text" name="cntry" class="member_normal" size="2" maxlength="3" value="' . $content['country'] . '" />';
 			}
 
 			// Load template
@@ -195,12 +189,6 @@ LIMIT 1",
 		break;
 
 	case 'save': // Save entered data
-		// Load old email / password
-		if (!fetchUserData(getMemberId())) {
-			// Something really bad happened
-			debug_report_bug('No user account ' . getMemberId() . ' found.');
-		} // END - if
-
 		// Get line
 		$content = merge_array($content, getUserDataArray());
 
@@ -210,30 +198,35 @@ LIMIT 1",
 		// 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);
-		} elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
+			loadTemplate('admin_settings_saved', false, $content['update_check']);
+		} elseif ((!isEmailValid(postRequestParameter('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));
-			if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) {
+			$hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));
+			if ((($hash == $content['password']) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) && (isPostRequestParameterSet('pass1'))) {
 				// Only on simple changes normal mode is active = no email or password changed
-				$mode = 'normal'; $AND = '';
+				$mode = 'normal';
+				$AND = '';
 
 				// Did the user changed the password?
-				if ($hash != $content['password']) { $AND = ", `password`='".$hash."'"; $mode = 'pass'; }
+				if ($hash != $content['password']) {
+					$AND = ", `password`='" . $hash . "'";
+					$mode = 'pass';
+				} // END - if
 
 				// Or did he changed his password?
-				if (postRequestElement('email') != $content['email']) {
+				if (postRequestParameter('email') != $content['email']) {
 					// Jupp
 					if ($mode == 'normal') {
 						$mode = 'email';
 					} else {
 						$mode .= ';email';
 					}
-					setRequestPostElement('old_email', $content['email']);
+					setPostRequestParameter('old_email', $content['email']);
 				} // END - if
 
 				// Update member's profile
@@ -255,18 +248,18 @@ WHERE
 	`userid`=%s
 LIMIT 1",
 						array(
-							postRequestElement('gender'),
-							postRequestElement('surname'),
-							postRequestElement('family'),
-							postRequestElement('street_nr'),
-							bigintval(postRequestElement('country_code')),
-							bigintval(postRequestElement('zip')),
-							postRequestElement('city'),
-							postRequestElement('email'),
-							bigintval(postRequestElement('day')),
-							bigintval(postRequestElement('month')),
-							bigintval(postRequestElement('year')),
-							bigintval(postRequestElement('max_mails')),
+							postRequestParameter('gender'),
+							postRequestParameter('surname'),
+							postRequestParameter('family'),
+							postRequestParameter('street_nr'),
+							bigintval(postRequestParameter('country_code')),
+							bigintval(postRequestParameter('zip')),
+							postRequestParameter('city'),
+							postRequestParameter('email'),
+							bigintval(postRequestParameter('day')),
+							bigintval(postRequestParameter('month')),
+							bigintval(postRequestParameter('year')),
+							bigintval(postRequestParameter('max_mails')),
 							getMemberId()
 						), __FILE__, __LINE__);
 				} else {
@@ -287,18 +280,18 @@ WHERE
 	`userid`=%s
 LIMIT 1",
 						array(
-							postRequestElement('gender'),
-							postRequestElement('surname'),
-							postRequestElement('family'),
-							postRequestElement('street_nr'),
-							postRequestElement('cntry'),
-							bigintval(postRequestElement('zip')),
-							postRequestElement('city'),
-							postRequestElement('email'),
-							bigintval(postRequestElement('day')),
-							bigintval(postRequestElement('month')),
-							bigintval(postRequestElement('year')),
-							bigintval(postRequestElement('max_mails')),
+							postRequestParameter('gender'),
+							postRequestParameter('surname'),
+							postRequestParameter('family'),
+							postRequestParameter('street_nr'),
+							postRequestParameter('cntry'),
+							bigintval(postRequestParameter('zip')),
+							postRequestParameter('city'),
+							postRequestParameter('email'),
+							bigintval(postRequestParameter('day')),
+							bigintval(postRequestParameter('month')),
+							bigintval(postRequestParameter('year')),
+							bigintval(postRequestParameter('max_mails')),
 							getMemberId()
 						), __FILE__, __LINE__);
 				}
@@ -324,13 +317,13 @@ 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(getMemberId()), __FILE__, __LINE__);
-		$URL = 'modules.php?module=login&amp;what=welcome&amp;code=' . urlencode(getMessage('PROFILE_UPDATED'));
+		$url = 'modules.php?module=login&amp;what=welcome&amp;code=' . urlencode(getMessage('PROFILE_UPDATED'));
 		break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
 	// Load generated URL
-	redirectToUrl($URL);
+	redirectToUrl($url);
 } // END - if
 
 // [EOF]