X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=39b6d3f0a9c2359062efed44934c0fd4b2630bbb;hb=4b93525eb57c07b89c127494a45ec3d5666fa71a;hp=ab440d29bea8b2650edcd539e4143912132daba3;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;p=mailer.git
diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index ab440d29be..39b6d3f0a9 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -14,11 +14,9 @@
* $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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -45,17 +43,15 @@ 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
// Add userid
-$content = array(
- 'userid' => getMemberId()
-);
+$content = array();
// Init variable to prevent notices
$url = '';
@@ -75,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);
@@ -127,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()) {
@@ -172,15 +163,15 @@ LIMIT 1",
if (isExtensionActive('country')) {
// Generate selection box
- $OUT = "';
$content['country'] = $OUT;
} else {
// Ouput default input box
- $content['country'] = '';
+ $content['country'] = '';
}
// Load template
@@ -193,17 +184,20 @@ 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']);
+ $content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
+
+ displayMessage($content['update_check']);
} elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
// Invalid email address!
- loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}');
+ displayMessage('{--INVALID_EMAIL_ENTERED--}');
+ } elseif ((isEmailTaken(postRequestParameter('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));
@@ -215,7 +209,7 @@ LIMIT 1",
// Did the user changed the password?
if ($hash != $content['password']) {
$AND = ", `password`='" . $hash . "'";
- $mode = 'pass';
+ $mode = 'password';
} // END - if
// Or did he changed his password?
@@ -297,7 +291,7 @@ LIMIT 1",
}
// Did something change?
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
// Get all modes ...
$modes = explode(';', $mode);
@@ -305,11 +299,11 @@ 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;
@@ -317,7 +311,7 @@ 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(getMemberId()), __FILE__, __LINE__);
- $url = 'modules.php?module=login&what=welcome&code=' . urlencode(getMessage('PROFILE_UPDATED'));
+ $url = 'modules.php?module=login&what=mydata&code=' . getCode('PROFILE_UPDATED');
break;
} // END - switch