X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=83392c1cb0bf2c145ae91f7c12dec9c3c85a5283;hb=8202991f32bfb2056e94a11746c0b5308fe4a273;hp=04bd239f2207be300980239eb61bbbab8b5918ee;hpb=7a57a2707a3f130bdfb68772b2746c0775e65e31;p=mailer.git diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 04bd239f22..83392c1cb0 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -14,12 +14,10 @@ * $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, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * 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 * @@ -45,10 +43,10 @@ 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')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}'); return; } // END - if @@ -60,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,9 +71,9 @@ switch ($mode) { $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)) { + if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) { // You cannot change your account - $content['change'] = loadTemplate('admin_settings_saved', true, '
' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '
'); + $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); @@ -101,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 @@ -110,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 @@ -125,21 +123,16 @@ LIMIT 1", // Free result SQL_FREERESULT($result); - $content['update_check'] = $content['last_update'] + getConfig('profile_lock'); + $content['update_check'] = $content['last_update'] + getProfileLock(); // How far is last change on his profile away from now? - 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)); + if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) { + $content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}'; // You cannot change your account - loadTemplate('admin_settings_saved', false, $content['update_check']); + 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()) { @@ -169,16 +162,18 @@ 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; } else { // Ouput default input box - $content['country'] = ''; + $content['country'] = ''; } // Load template @@ -191,40 +186,43 @@ LIMIT 1", $content = merge_array($content, getUserDataArray()); // Calculate time to check - $content['update_check'] = $content['last_update'] + getConfig('profile_lock'); + $content['update_check'] = $content['last_update'] + getProfileLock(); // 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); - + if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) { // You cannot change your account - loadTemplate('admin_settings_saved', false, $content['update_check']); - } elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) { + $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0); + + displayMessage($content['update_check']); + } elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) { // Invalid email address! - loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}'); + 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 = ''; // Did the user changed the password? if ($hash != $content['password']) { - $AND = ", `password`='" . $hash . "'"; - $mode = 'pass'; + $AND = ",`password`='" . $hash . "'"; + $mode = 'password'; } // 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 @@ -233,11 +231,11 @@ LIMIT 1", SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', `surname`='%s', `family`='%s', + `gender`='%s',`surname`='%s',`family`='%s', `street_nr`='%s', - `country_code`=%s, `zip`=%s, `city`='%s', + `country_code`=%s,`zip`=%s,`city`='%s', `email`='%s', - `birth_day`=%s, `birth_month`=%s, `birth_year`=%s, + `birth_day`=%s,`birth_month`=%s,`birth_year`=%s, `max_mails`='%s', `last_update`=UNIX_TIMESTAMP()".$AND.", `notified`='N', @@ -246,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 { @@ -265,11 +263,11 @@ LIMIT 1", SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', `surname`='%s', `family`='%s', + `gender`='%s',`surname`='%s',`family`='%s', `street_nr`='%s', - `country`='%s', `zip`=%s, `city`='%s', + `country`='%s',`zip`=%s,`city`='%s', `email`='%s', - `birth_day`=%s, `birth_month`=%s, `birth_year`=%s, + `birth_day`=%s,`birth_month`=%s,`birth_year`=%s, `max_mails`='%s', `last_update`=UNIX_TIMESTAMP()".$AND.", `notified`='N', @@ -278,24 +276,24 @@ 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__); } // Did something change? - if (SQL_AFFECTEDROWS() == 1) { + if (!SQL_HASZEROAFFECTED()) { // Get all modes ... $modes = explode(';', $mode); @@ -303,17 +301,17 @@ LIMIT 1", sendModeMails ('mydata', $modes); } else { // Something went wrong - loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}'); + displayMessage('{--MEMBER_UPDATE_FAILED--}'); } } else { // Entered wrong pass for updating profile - loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}'); + displayMessage('{--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", + 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&what=mydata&code=' . getCode('PROFILE_UPDATED'); break;