X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=9d8d6127dd62cfff6ce390764cd5b97b96ce3c63;hb=c4823d28fd0bd22250b16d73f2034f36fc54abda;hp=061743ca9afbd2dddb5578a21932d3c5eedd6437;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 061743ca9a..9d8d6127dd 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -14,10 +14,9 @@
  * $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!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +43,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Add description as navigation point
-addMenuDescription('member', __FILE__);
+addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
 	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mydata'));
@@ -52,38 +51,29 @@ if ((!isExtensionActive('mydata')) && (!isAdmin())) {
 } // END - if
 
 // Add userid
-$content = array(
-	'userid' => getMemberId()
-);
+$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="notice">' . 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);
@@ -137,10 +127,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) {
@@ -178,15 +168,15 @@ LIMIT 1",
 
 			if (isExtensionActive('country')) {
 				// Generate selection box
-				$OUT  = "<select name=\"country_code\" class=\"member_select\" size=\"1\">\n";
+				$OUT  = '<select name="country_code" class="form_select" size="1">';
 				$whereStatement = "WHERE `is_active`='Y'";
 				if (isAdmin()) $whereStatement = '';
 				$OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement);
-				$OUT .= "</select>";
+				$OUT .= '</select>';
 				$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="form_field" size="2" maxlength="3" value="' . $content['country'] . '" />';
 			}
 
 			// Load template
@@ -195,12 +185,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 +194,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, '{--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 = 'password';
+				} // 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 +244,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,24 +276,24 @@ 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__);
 				}
 
 				// Did something change?
-				if (SQL_AFFECTEDROWS() == 1) {
+				if (!SQL_HASZEROAFFECTED()) {
 					// Get all modes ...
 					$modes = explode(';', $mode);
 
@@ -312,11 +301,11 @@ LIMIT 1",
 					sendModeMails ('mydata', $modes);
 				} else {
 					// Something went wrong
-					loadTemplate('admin_settings_saved', false, getMessage('MEMBER_UPDATE_FAILED'));
+					loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}');
 				}
 			} else {
 				// Entered wrong pass for updating profile
-				loadTemplate('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+				loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}');
 			}
 		}
 		break;
@@ -324,13 +313,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=mydata&amp;code=' . getCode('PROFILE_UPDATED');
 		break;
 } // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
 	// Load generated URL
-	redirectToUrl($URL);
+	redirectToUrl($url);
 } // END - if
 
 // [EOF]