X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=28a0f11ad17e9ce30c0bb68ab711534a091b217a;hp=adbd169537aa0b8ac910311360359708a7a2faf4;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index adbd169537..28a0f11ad1 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -1,7 +1,7 @@ getUserId() + 'userid' => getMemberId() ); // 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 - 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']); $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, "
".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($content['last_update'] + getConfig('profile_lock'), 0))."
"); + $content['change'] = loadTemplate('admin_settings_saved', true, '
' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '
'); } 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 @@ -144,9 +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'] = 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) { @@ -192,7 +180,7 @@ LIMIT 1", $content['country'] = $OUT; } else { // Ouput default input box - $content['country'] = ""; + $content['country'] = ''; } // Load template @@ -201,45 +189,44 @@ 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()); - $content['last_change'] = $content['last_update'] + getConfig('profile_lock'); + // 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['last_change'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) { - $content['last_change'] = generateDateTime($content['last_change'] + 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 - loadTemplate('member_mydata_locked'); - } 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 @@ -261,19 +248,19 @@ 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')), - getUserId() + 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 @@ -293,19 +280,19 @@ 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')), - getUserId() + 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__); } @@ -329,14 +316,14 @@ 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__); - $URL = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED')); + array(getMemberId()), __FILE__, __LINE__); + $url = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED')); break; } // END - switch -if (!empty($URL)) { +if (!empty($url)) { // Load generated URL - redirectToUrl($URL); + redirectToUrl($url); } // END - if // [EOF]