X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=27ec77bc17e048f7f5d9202f6d3b70304c6e63e1;hp=c14cb099ce3c5b3bf41f905fcc468da98a7e2f5e;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=ccc4a69ce9b17aa8d7b1554a3b2b017db091821b
diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index c14cb099ce..27ec77bc17 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -1,7 +1,7 @@
time()) && (!IS_ADMIN()) && (getConfig('profile_lock') > 0)) {
+ if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
// You cannot change your account
- define('CHANGE', "
".sprintf(getMessage('MEMBER_PROFILE_LOCKED'), generateDateTime($DATA[13] + getConfig('profile_lock'), '0'))."
");
+ $content['change'] = returnMessage('{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}
');
} 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];
-
+ // @TODO Move this to a function (for better EL code)
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'] = '{%pipe,padLeftZero=' . $content['birth_day'] . '%}.{%pipe,padLeftZero=' . $content['birth_month'] . '%}.' . $content['birth_year']; break;
+ default : $content['dob'] = '{%pipe,padLeftZero=' . $content['birth_month'] . '%}-{%pipe,padLeftZero=' . $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
+ $result = sqlQueryEscaped('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
+ $result = sqlQueryEscaped('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);
- SQL_FREERESULT($result);
- $DATA[13] = $DATA[12] + getConfig('profile_lock');
+ // Get line
+ $content = merge_array($content, sqlFetchArray($result));
+
+ // Free result
+ sqlFreeResult($result);
+
+ $content['update_check'] = $content['last_update'] + getProfileLock();
// 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()) && (getProfileLock() > 0)) {
+ // Profile is locked, so output propper message
+ $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
+
// You cannot change your account
- LOAD_TEMPLATE('member_mydata_locked');
+ displayMessage($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;
+ // Init elements
+ $content['dob'] = '';
- case 'F':
- define('M_DEFAULT', '');
- define('F_DEFAULT', ' selected="selected"');
- define('C_DEFAULT', '');
- break;
-
- 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('da', $content['birth_day']);
// Month
- $DOB .= ADD_SELECTION('month', $DATA[8]);
+ $content['dob'] .= addSelectionBox('mo', $content['birth_month']);
// Year
- $DOB .= ADD_SELECTION('year', $DATA[9]);
+ $content['dob'] .= addSelectionBox('ye', $content['birth_year']);
break;
default: // Default is the US date format... :)
+ // Month
+ $content['dob'] .= addSelectionBox('mo', $content['birth_month']);
+
+ // Day
+ $content['dob'] .= addSelectionBox('da', $content['birth_day']);
+
+ // Year
+ $content['dob'] .= addSelectionBox('ye', $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']);
+
+ if (isExtensionActive('country')) {
+ // Init WHERE statement
+ $whereStatement = " WHERE `is_active`='Y'";
+ if (isAdmin()) $whereStatement = '';
- if (EXT_IS_ACTIVE('country')) {
// Generate selection box
- $OUT = "";
- define('__COUNTRY_CONTENT', $OUT);
+ $OUT = '';
+ $content['country'] = $OUT;
} else {
// Ouput default input box
- define('__COUNTRY_CONTENT', "");
+ $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'] + getProfileLock();
// 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()) && (getProfileLock() > 0)) {
// You cannot change your account
- LOAD_TEMPLATE('member_mydata_locked');
- } elseif (!isEmailValid(REQUEST_POST('addy'))) {
+ $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
+
+ displayMessage($content['update_check']);
+ } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
// Invalid email address!
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('INVALID_EMAIL_ADDRESS_ENTERED'));
+ displayMessage('{--INVALID_EMAIL_ENTERED--}');
+ } elseif ((isExtensionInstalledAndNewer('other', '0.3.0')) && (isCheckDoubleEmailEnabled()) && (!isAdmin()) && (isEmailTaken(postRequestElement('email')))) {
+ // Email address is already registered
+ displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
} 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(postRequestElement('password1'), substr($content['password'], 0, -40));
+ if ((($hash == $content['password']) || (postRequestElement('password1') == postRequestElement('password2'))) && (isPostRequestElementSet('password1'))) {
// 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']) {
+ // Yes
+ $AND = ",`password`='" . $hash . "'";
+ $mode = 'password';
+ } // END - if
+
+ // Or did he changed his email address?
+ if (postRequestElement('email') != $content['email']) {
+ // Yes, but is it maybe blacklisted?
+ $filterData = array(
+ 'init_done' => TRUE,
+ 'post_data' => postRequestArray(),
+ 'blacklisted' => '',
+ 'message' => '{--PRE_UPDATE_USER_DATA_FAILED--}',
+ );
+ $filterData = runFilterChain('pre_update_user_data', $filterData);
+
+ // Is it blacklisted?
+ if ($filterData['init_done'] === FALSE) {
+ // Found something blacklisted
+ displayMessage($filterData['message']);
+ return;
+ } // END - if
- // Or did he changed his password?
- if (REQUEST_POST('addy') != $DATA[0]) {
- // Jupp
if ($mode == 'normal') {
$mode = 'email';
} else {
- $mode .= ";email";
+ $mode .= ';email';
}
- REQUEST_SET_POST('old_addy', $DATA[0]);
+ setPostRequestElement('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",
+ sqlQueryEscaped("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')
+ 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 {
// 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",
+ sqlQueryEscaped("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')
+ 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__);
}
- // Get all modes ...
- $modes = explode(';', $mode);
+ // Did something change?
+ if (!ifSqlHasZeroAffectedRows()) {
+ // Get all modes ...
+ $modes = explode(';', $mode);
- // ... and run them through
- sendModeMails ('mydata', $modes);
+ // ... and run them through
+ sendModeMails ('mydata', $modes);
+ } else {
+ // Something went wrong
+ displayMessage('{--MEMBER_UPDATE_FAILED--}');
+ }
} else {
// Entered wrong pass for updating profile
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('MEBER_UPDATE_PWD_WRONG'));
+ displayMessage('{--MEMBER_UPDATE_WRONG_PASSWORD--}');
}
}
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&what=welcome&msg=' . urlencode(getMessage('PROFILE_UPDATED'));
+ sqlQueryEscaped("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&what=mydata&code=' . getCode('PROFILE_UPDATED');
break;
-}
+} // END - switch
-if (!empty($URL)) {
+if (!empty($url)) {
// Load generated URL
- redirectToUrl($URL);
+ redirectToUrl($url);
} // END - if
-//
+// [EOF]
?>