X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=0f21b5b461313087cca56fbfe1e161b8adc17230;hp=14cb33b936efb6e2545e291465cea39721a5fe07;hb=20741b93fd58620af677a7f1039ffd16ea6ec689;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 14cb33b936..0f21b5b461 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -17,7 +17,7 @@ * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('mydata')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('mydata')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}'); return; } // END - if @@ -58,9 +58,9 @@ $url = ''; // Detect what the member wants to do $mode = 'show'; // Show his data -if (isPostRequestParameterSet('save')) $mode = 'save'; // Save entered data +if (isPostRequestElementSet('save')) $mode = 'save'; // Save entered data if (isFormSent('edit')) $mode = 'edit'; // Edit data -if (isPostRequestParameterSet('notify')) $mode = 'notify'; // Switch off notification +if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification switch ($mode) { case 'show': // Show his data @@ -73,7 +73,7 @@ switch ($mode) { // How far is last change on his profile away from now? if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) { // You cannot change your account - $content['change'] = displayMessage('
' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getProfileLock(), 0)) . '
', true); + $content['change'] = displayMessage('
{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}
', true); } else { // He is allowed to change his profile $content['change'] = loadTemplate('member_mydata_button', true); @@ -99,7 +99,7 @@ switch ($mode) { case 'edit': // Edit data 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` + $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 @@ -108,7 +108,7 @@ 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` + $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 @@ -127,17 +127,12 @@ LIMIT 1", // How far is last change on his profile away from now? if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) { - $content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getProfileLock(), 0)); + $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}'; // You cannot change your account displayMessage($content['update_check']); } else { - // He is allowed to change his profile - foreach (array('gender_m','gender_f','gender_c') as $entry) { - $content[$entry] = ''; - } // END - foreach - - $content['gender_' . strtolower($content['gender'])] = ' selected="selected"'; + // Init elements $content['dob'] = ''; switch (getLanguage()) { @@ -167,10 +162,12 @@ LIMIT 1", $content['max_receive_list'] = addMaxReceiveList('member', $content['max_mails'], true); if (isExtensionActive('country')) { - // Generate selection box - $OUT = ''; $OUT .= generateOptionList('countries', 'id', 'descr', $content['country_code'], 'code', $whereStatement); $OUT .= ''; $content['country'] = $OUT; @@ -193,17 +190,20 @@ LIMIT 1", // How far is last change on his profile away from now? if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) { + // You cannot change your account $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0); - // You cannot change your account displayMessage($content['update_check']); - } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) { + } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) { // Invalid email address! displayMessage('{--INVALID_EMAIL_ENTERED--}'); + } elseif ((isEmailTaken(postRequestElement('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) { + // Email address is already registered + displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}'); } else { // Generate hash - $hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40)); - if ((($hash == $content['password']) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) && (isPostRequestParameterSet('pass1'))) { + $hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40)); + if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) { // Only on simple changes normal mode is active = no email or password changed $mode = 'normal'; $AND = ''; @@ -215,14 +215,14 @@ LIMIT 1", } // END - if // Or did he changed his password? - if (postRequestParameter('email') != $content['email']) { + if (postRequestElement('email') != $content['email']) { // Jupp if ($mode == 'normal') { $mode = 'email'; } else { $mode .= ';email'; } - setPostRequestParameter('old_email', $content['email']); + setPostRequestElement('old_email', $content['email']); } // END - if // Update member's profile @@ -244,18 +244,18 @@ WHERE `userid`=%s LIMIT 1", array( - 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')), + 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')), getMemberId() ), __FILE__, __LINE__); } else { @@ -276,18 +276,18 @@ WHERE `userid`=%s LIMIT 1", array( - 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')), + 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')), getMemberId() ), __FILE__, __LINE__); }