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

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 7323139365..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                                  *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * 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 *
@@ -38,277 +39,292 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('mydata')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('mydata'));
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('mydata')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mydata'));
+	return;
+} // END - if
 
-// @TODO Try to rewrite this constant
-define('UID_VALUE', getUserId());
+// Add userid
+$content = array(
+	'userid' => getMemberId()
+);
 
 // Init variable to prevent notices
-$URL = '';
+$url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (REQUEST_ISSET_POST('save'))   $mode = 'save';   // Save entered data
-if (REQUEST_ISSET_POST('edit'))   $mode = 'edit';   // Edit data
-if (REQUEST_ISSET_POST('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
-		if (EXT_IS_ACTIVE('country', true)) {
-			// New 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_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                         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 FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
-		}
-		$DATA = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		// Get line
+		$content = merge_array($content, getUserDataArray());
 
-		// Translate / add some things
-		$DATA[10] = translateGender($DATA[10]);
-		$DATA[13] = generateDateTime($DATA[13], '0');
+		// Translate some things
+		$content['last_update'] = generateDateTime($content['last_update'], 0);
 
 		// How far is last change on his profile away from now?
-		if ((($DATA[13] + getConfig('profile_lock')) > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
+		if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
 			// You cannot change your account
-			define('CHANGE', "<div class=\"member_failed\">".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($DATA[13] + 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
-			define('CHANGE', LOAD_TEMPLATE("member_mydata_button", true));
+			$content['change'] = loadTemplate('member_mydata_button', true);
 		}
 
-		if (strlen($DATA[7]) == 1) $DATA[7] = '0'.$DATA[7];
-		if (strlen($DATA[8]) == 1) $DATA[8] = '0'.$DATA[8];
+		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': define('DOB', $DATA[7].'.'.$DATA[8].'.'.$DATA[9]); break;
-			default  : define('DOB', $DATA[8].'-'.$DATA[7].'-'.$DATA[9]); break;
+			case 'de': $content['dob'] = $content['birth_day']   . '.' . $content['birth_month'] . '.' . $content['birth_year']; break;
+			default  : $content['dob'] = $content['birth_month'] . '-' . $content['birth_day']   . '-' . $content['birth_year']; break;
 		} // END - switch
 
-		if (EXT_IS_ACTIVE('country')) {
+		if (isExtensionActive('country')) {
 			// Load country's description and code
-			$DATA[3] = COUNTRY_GENERATE_INFO($DATA[3]);
+			$content['country'] = generateCountryInfo($content['country_code']);
 		} // END - if
 
 		// Load template
-		LOAD_TEMPLATE('member_mydata_overview');
+		loadTemplate('member_mydata_overview', false, $content);
 		break;
 
 	case 'edit': // Edit data
-		if (EXT_IS_ACTIVE('country', true)) {
-			// New 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_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__);
+		if (isExtensionActive('country', true)) {
+			// New 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_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(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
-FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-				array(getUserId()), __FILE__, __LINE__);
+			// 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`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`userid`=%s
+LIMIT 1",
+				array(getMemberId()), __FILE__, __LINE__);
 		}
 
-		$DATA = SQL_FETCHROW($result);
+		// Get line
+		$content = merge_array($content, SQL_FETCHARRAY($result, 0, false));
+
+		// Free result
 		SQL_FREERESULT($result);
-		$DATA[13] = $DATA[12] + getConfig('profile_lock');
+
+		$content['update_check'] = $content['last_update'] + getConfig('profile_lock');
 
 		// How far is last change on his profile away from now?
-		if (($DATA[13] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
-			$DATA[13] = generateDateTime($DATA[13] + getConfig('profile_lock'), '0');
+		if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
+			$content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+
 			// You cannot change your account
-			LOAD_TEMPLATE('member_mydata_locked');
+			loadTemplate('admin_settings_saved', false, $content['update_check']);
 		} else {
 			// He is allowed to change his profile
-			switch ($DATA[10])
-			{
-				case 'M':
-					define('M_DEFAULT', ' selected="selected"');
-					define('F_DEFAULT', '');
-					define('C_DEFAULT', '');
-					break;
+			foreach (array('gender_m','gender_f','gender_c') as $entry) {
+				$content[$entry] = '';
+			} // END - foreach
 
-				case 'F':
-					define('M_DEFAULT', '');
-					define('F_DEFAULT', ' selected="selected"');
-					define('C_DEFAULT', '');
-					break;
+			$content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
+			$content['dob'] = '';
 
-				case 'C':
-					define('M_DEFAULT', '');
-					define('F_DEFAULT', '');
-					define('C_DEFAULT', ' selected="selected"');
-					break;
-			}
-			$DOB = '';
 			switch (getLanguage()) {
 				case 'de': // German date format
 					// Day
-					$DOB .= ADD_SELECTION('day', $DATA[7]);
+					$content['dob'] .= addSelectionBox('day', $content['birth_day']);
 
 					// Month
-					$DOB .= ADD_SELECTION('month', $DATA[8]);
+					$content['dob'] .= addSelectionBox('month', $content['birth_month']);
 
 					// Year
-					$DOB .= ADD_SELECTION('year', $DATA[9]);
+					$content['dob'] .= addSelectionBox('year', $content['birth_year']);
 					break;
 
 				default: // Default is the US date format... :)
+					// Month
+					$content['dob'] .= addSelectionBox('month', $content['birth_month']);
+
+					// Day
+					$content['dob'] .= addSelectionBox('day', $content['birth_day']);
+
+					// Year
+					$content['dob'] .= addSelectionBox('year', $content['birth_year']);
 					break;
 			} // END - if
 
-			define('DOB', $DOB);
-			define('MAX_REC_LIST', addMaxReceiveList('member', $DATA[11], true));
+			$content['max_receive_list'] = addMaxReceiveList('member', $content['max_mails'], true);
 
-			if (EXT_IS_ACTIVE('country')) {
+			if (isExtensionActive('country')) {
 				// Generate selection box
 				$OUT  = "<select name=\"country_code\" class=\"member_select\" size=\"1\">\n";
 				$whereStatement = "WHERE `is_active`='Y'";
-				if (IS_ADMIN()) $whereStatement = '';
-				$OUT .= generateOptionList("countries", 'id', "descr", $DATA[3], "code", $whereStatement);
+				if (isAdmin()) $whereStatement = '';
+				$OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement);
 				$OUT .= "</select>";
-				define('__COUNTRY_CONTENT', $OUT);
+				$content['country'] = $OUT;
 			} else {
 				// Ouput default input box
-				define('__COUNTRY_CONTENT', "<input type=\"text\" name=\"cntry\" class=\"member_normal\" size=\"2\" maxlength=\"3\" value=\"".$DATA[3]."\" />");
+				$content['country'] = '<input type="text" name="cntry" class="member_normal" size="2" maxlength="3" value="' . $content['country'] . '" />';
 			}
 
 			// Load template
-			LOAD_TEMPLATE('member_mydata_edit');
+			loadTemplate('member_mydata_edit', false, $content);
 		}
 		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__);
-		$DATA = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
-		$DATA[3] = $DATA[2] + getConfig('profile_lock');
+		// Get line
+		$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 (($DATA[3] > time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
-			$DATA[3] = generateDateTime($DATA[3] + getConfig('profile_lock'), '0');
+		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
-			LOAD_TEMPLATE('member_mydata_locked');
-		} elseif (!isEmailValid(REQUEST_POST('addy'))) {
+			loadTemplate('admin_settings_saved', false, $content['update_check']);
+		} elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
 			// Invalid email address!
-			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+			loadTemplate('admin_settings_saved', false, getMessage('INVALID_EMAIL_ENTERED'));
 		} else {
 			// Generate hash
-			$hash = generateHash(REQUEST_POST('pass1'), substr($DATA[1], 0, -40));
-			if ((($hash == $DATA[1]) || (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) && (REQUEST_ISSET_POST('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 != $DATA[1]) { $AND = ", password='".$hash."'"; $mode = 'pass'; }
+				if ($hash != $content['password']) {
+					$AND = ", `password`='" . $hash . "'";
+					$mode = 'pass';
+				} // END - if
 
 				// Or did he changed his password?
-				if (REQUEST_POST('addy') != $DATA[0]) {
+				if (postRequestParameter('email') != $content['email']) {
 					// Jupp
 					if ($mode == 'normal') {
 						$mode = 'email';
 					} else {
-						$mode .= ";email";
+						$mode .= ';email';
 					}
-					REQUEST_SET_POST('old_addy', $DATA[0]);
+					setPostRequestParameter('old_email', $content['email']);
 				} // END - if
 
 				// Update member's profile
-				if (EXT_IS_ACTIVE('country')) {
+				if (isExtensionActive('country')) {
 					// New way
-					SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET
-`gender`='%s', `surname`='%s', `family`='%s',
-`street_nr`='%s',
-`country_code`=%s, `zip`=%s, `city`='%s',
-`email`='%s',
-`birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
-`max_mails`=%s,
-`last_update`=UNIX_TIMESTAMP()".$AND.",
-`notified`='N',
-`last_profile_sent`=UNIX_TIMESTAMP()
-WHERE `userid`=%s AND `password`='%s' LIMIT 1",
+					SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_user_data`
+SET
+	`gender`='%s', `surname`='%s', `family`='%s',
+	`street_nr`='%s',
+	`country_code`=%s, `zip`=%s, `city`='%s',
+	`email`='%s',
+	`birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
+	`max_mails`='%s',
+	`last_update`=UNIX_TIMESTAMP()".$AND.",
+	`notified`='N',
+	`last_profile_sent`=UNIX_TIMESTAMP()
+WHERE
+	`userid`=%s
+LIMIT 1",
 						array(
-							REQUEST_POST('gender'),
-							REQUEST_POST('surname'),
-							REQUEST_POST('family'),
-							REQUEST_POST('street_nr'),
-							bigintval(REQUEST_POST('country_code')),
-							bigintval(REQUEST_POST('zip')),
-							REQUEST_POST('city'),
-							REQUEST_POST('addy'),
-							bigintval(REQUEST_POST('day')),
-							bigintval(REQUEST_POST('month')),
-							bigintval(REQUEST_POST('year')),
-							bigintval(REQUEST_POST('max_mails')),
-							getUserId(),
-							getSession('u_hash')
+							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 {
 					// Old way
-					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',
-`birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
-`max_mails`='%s',
-`last_update`=UNIX_TIMESTAMP()".$AND.",
-`notified`='N',
-`last_profile_sent`=UNIX_TIMESTAMP()
-WHERE `userid`=%s AND `password`='%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',
+	`birth_day`=%s, `birth_month`=%s, `birth_year`=%s,
+	`max_mails`='%s',
+	`last_update`=UNIX_TIMESTAMP()".$AND.",
+	`notified`='N',
+	`last_profile_sent`=UNIX_TIMESTAMP()
+WHERE
+	`userid`=%s
+LIMIT 1",
 						array(
-							REQUEST_POST('gender'),
-							REQUEST_POST('surname'),
-							REQUEST_POST('family'),
-							REQUEST_POST('street_nr'),
-							REQUEST_POST('cntry'),
-							bigintval(REQUEST_POST('zip')),
-							REQUEST_POST('city'),
-							REQUEST_POST('addy'),
-							bigintval(REQUEST_POST('day')),
-							bigintval(REQUEST_POST('month')),
-							bigintval(REQUEST_POST('year')),
-							bigintval(REQUEST_POST('max_mails')),
-							getUserId(),
-							getSession('u_hash')
+							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__);
 				}
 
-				// Get all modes ...
-				$modes = explode(';', $mode);
+				// Did something change?
+				if (SQL_AFFECTEDROWS() == 1) {
+					// Get all modes ...
+					$modes = explode(';', $mode);
 
-				// ... and run them through
-				sendModeMails ('mydata', $modes);
+					// ... and run them through
+					sendModeMails ('mydata', $modes);
+				} else {
+					// Something went wrong
+					loadTemplate('admin_settings_saved', false, getMessage('MEMBER_UPDATE_FAILED'));
+				}
 			} else {
 				// Entered wrong pass for updating profile
-				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+				loadTemplate('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
 			}
 		}
 		break;
 
 	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__);
-		$URL = 'modules.php?module=login&amp;what=welcome&amp;msg=' . urlencode(getMessage('PROFILE_UPDATED'));
+		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'));
 		break;
-}
+} // END - switch
 
-if (!empty($URL)) {
+if (!empty($url)) {
 	// Load generated URL
-	redirectToUrl($URL);
+	redirectToUrl($url);
 } // END - if
 
-//
+// [EOF]
 ?>