X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=0ef2a4c9034ee1fd22815d5168325582ba3e7cf1;hp=d343e5269a145606db2412e6c81d9ef3701bc2ac;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=c2e17d983fcbc0c3bd1dd37908d87c678f0367df
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index d343e5269a..0ef2a4c903 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -1,7 +1,7 @@
".$ltr."";
+ $OUT .= '' . $ltr . '';
} else {
// Output link to letter
- $OUT .= "".$ltr."";
+ $OUT .= '' . $ltr . '';
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
- $OUT .= " ]
[ ";
+ $OUT .= ' ]
[ ';
} elseif ( $counter != $num ) {
- $OUT .= " | ";
+ $OUT .= ' | ';
}
} // END - while
@@ -83,15 +83,15 @@ function alpha ($sortby, $colspan, $return=false) {
// Add links for sorting
function addSortLinks ($letter, $sortby, $colspan, $return=false) {
$OUT = '';
- if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0);
- if (!isGetRequestElementSet('page')) setRequestGetElement('page' , 0);
+ if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+ if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 0);
// Add page and offset
- $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset');
+ $add = '&page=' . getRequestParameter('page') . '&offset=' . getRequestParameter('offset');
// Add status or mode
- if (isGetRequestElementSet('status')) $add .= '&mode=' . getRequestElement('status');
- elseif (isGetRequestElementSet('mode')) $add .= '&mode=' . getRequestElement('mode');
+ if (isGetRequestParameterSet('status')) $add .= '&mode=' . getRequestParameter('status');
+ elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
// Makes order by links..
if ($letter == 'front') $letter = getMessage('_ALL2');
@@ -99,8 +99,8 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
// Prepare array with all possible sorters
$list = array(
'userid' => getMessage('_UID'),
- 'family' => getMessage('FAMILY_NAME'),
- 'email' => getMessage('EMAIL_ADDRESS'),
+ 'family' => getMessage('FAMILY'),
+ 'email' => getMessage('EMAIL'),
'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
@@ -111,9 +111,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
foreach ($list as $sort => $title) {
if ($sortby == $sort) {
- $OUT .= "" . $title . " | ";
+ $OUT .= '' . $title . ' | ';
} else {
- $OUT .= "" . $title . " | ";
+ $OUT .= '' . $title . ' | ';
}
} // END - foreach
@@ -138,35 +138,35 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false)
//if ($show_form === true) {
// // Load form for changing number of lines
// define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true));
- // define('__FORM_FOOTER', '
|
');
+ // define('__FORM_FOOTER', ' |
');
//} else {
// // Empty row
// define('__FORM_HEADER', ' |
');
- // define('__FORM_FOOTER', ' |
');
+ // define('__FORM_FOOTER', ' |
');
//}
$OUT = '';
for ($page = 1; $page <= $PAGES; $page++) {
- if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+ if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
$OUT .= '-';
} else {
- if (!isGetRequestElementSet('letter')) setRequestGetElement('letter', getMessage('_ALL2'));
- if (!isGetRequestElementSet('sortby')) setRequestGetElement('sortby', 'userid');
+ if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+ if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
// Base link
- $OUT .= '';
+ $OUT .= '&letter=' . getRequestParameter('letter') . '&sortby=' . getRequestParameter('sortby') . '&page=' . $page . '&offset=' . $offset . '%}">';
}
$OUT .= $page;
- if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+ if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
$OUT .= '-';
} else {
$OUT .= '';
@@ -210,7 +210,7 @@ LIMIT 1",
list($userid) = SQL_FETCHROW($result);
// Rewrite email address to contact link
- $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid);
+ $email = '{%url=modules.php?module=' . $mod . '&what=user_contct&userid=' . bigintval($userid) . '%}';
} // END - if
// Free memory
@@ -221,9 +221,10 @@ LIMIT 1",
}
// Selects a random user id as the new referal id if they have at least X confirmed mails in this run
+// @TODO Double-check configuration entry here
function determineRandomReferalId () {
// Default is zero refid
- $refid = 0;
+ $refid = '0';
// Is the extension version fine?
if (getExtensionVersion('user') >= '0.3.4') {
@@ -261,8 +262,10 @@ function determineRandomReferalId () {
// Do the user login
function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.php?module=index&what=login&login=') {
// Init variables
- $dmy = ''; $add = '';
- $errorCode = 0;
+ $dmy = '';
+ $add = '';
+ $errorCode = '0';
+ $ext = '';
// Add last_login if available
$lastOnline = '';
@@ -280,36 +283,35 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
);
// Check login data
- if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
+ if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
// Nickname entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' AND `status`='CONFIRMED' LIMIT 1",
- array($userid), __FUNCTION__, __LINE__);
+ fetchUserData($userid, 'nickname');
+ } elseif (isNicknameUsed($userid)) {
+ // No nickname installed
+ $errorCode = getCode('EXTENSION_PROBLEM');
+ $ext = 'nickname';
} else {
// Direct userid entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `password`, `last_online`" . $lastOnline . " FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
- array($userid, $content['hash']), __FUNCTION__, __LINE__);
+ fetchUserData($userid);
}
// Load entry
- $content = SQL_FETCHARRAY($result);
+ $content = getUserDataArray();
if (!empty($content['userid'])) $userid = bigintval($content['userid']);
// Is there an entry?
- if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $userid))) {
- // Free result
- SQL_FREERESULT($result);
-
+ if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
// Check for old MD5 passwords
- if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
+ if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
// Just set the hash to the password from DB... :)
- $content['hash'] = $content['password'];
+ $content['hash'] = getUserData('password');
} else {
// Hash password with improved way for comparsion
- $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
+ $content['hash'] = generateHash($passwd, substr(getUserData('password'), 0, -40));
}
// Does the password match the hash?
- if ($content['hash'] == $content['password']) {
+ if ($content['hash'] == getUserData('password')) {
// New hashed password found so let's generate a new one
$content['hash'] = generateHash($passwd);
@@ -322,13 +324,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$GLOBALS['bonus_payed'] = false;
// Probe for last online timemark
- $probe = time() - $content['last_online'];
- if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
- if ((getExtensionVersion('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
+ $probe = time() - getUserData('last_online');
+ if (getUserData('last_login') > 0) $probe = time() - getUserData('last_login');
+
+ if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) {
// Add login bonus to user's account
- $add = sprintf(", `login_bonus`=`login_bonus`+%s",
- (float)getConfig('login_bonus')
- );
+ $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
$GLOBALS['bonus_payed'] = true;
// Subtract login bonus from userid's account or jackpot
@@ -340,7 +341,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Update global array
// @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
- setUserId($userid);
+ setMemberId($userid);
// Try to set session data (which shall normally always work!)
if ((setSession('userid', $userid )) && (setSession('u_hash', $content['hash']))) {
@@ -368,7 +369,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
}
} else {
// Cookies not setable!
- $errorCode = getCode('NO_COOKIES');
+ $errorCode = getCode('COOKIES_DISABLED');
}
} elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
// Update failture counter
@@ -378,32 +379,27 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Wrong password!
$errorCode = getCode('WRONG_PASS');
}
- } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
- // Other account status?
- // @TODO Can this query be merged with above query?
- $result = SQL_QUERY_ESC("SELECT `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
- array($userid), __FUNCTION__, __LINE__);
-
- // Entry found?
- if (SQL_NUMROWS($result) == 1) {
- // Load status
- list($status) = SQL_FETCHROW($result);
-
- // Create an error code from given status
- $errorCode = generateErrorCodeFromUserStatus($status);
- } else {
- // ID not found!
- $errorCode = getCode('WRONG_ID');
- }
- } else {
- // ID not found!
+ } elseif (getUserData('status') != 'CONFIRMED') {
+ // Create an error code from given status
+ $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
+
+ // Set userid in session
+ setSession('current_userid', getUserData('userid'));
+ } elseif (!isUserDataValid()) {
+ // User id not found!
$errorCode = getCode('WRONG_ID');
+ } else {
+ // Unknown error
+ $errorCode = getCode('UNKNOWN_ERROR');
}
// Error code provided?
if ($errorCode > 0) {
// Then reconstruct the URL
$URL = $errorUrl . $errorCode;
+
+ // Extension set? Then add it as well.
+ if (!empty($ext)) $URL .= '&ext=' . $ext;
} // END - if
// Return URL
@@ -412,15 +408,17 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Try to send a new password for the given user account
function doNewUserPassword ($email, $userid) {
- // Compile email when found in address (only secure chars!)
- if (!empty($email)) $email = str_replace('{DOT}', '.', $email);
-
// Init result and error
$errorCode = '';
$result = false;
// Probe userid/nickname
- if ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
+ // @TODO We should try to rewrite this to fetchUserData() somehow
+ if (!empty($email)) {
+ // Email entered
+ $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' OR `email`='%s' LIMIT 1",
+ array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
+ } elseif ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
// Nickname entered
$result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' OR `userid`='%s' OR `email`='%s' LIMIT 1",
array($userid, $userid, $email), __FUNCTION__, __LINE__);
@@ -428,10 +426,6 @@ function doNewUserPassword ($email, $userid) {
// Direct userid entered
$result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
array(bigintval($userid)), __FUNCTION__, __LINE__);
- } elseif (!empty($email)) {
- // Email entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' LIMIT 1",
- array($email), __FUNCTION__, __LINE__);
} else {
// Userid not set!
logDebugMessage(__FUNCTION__, __LINE__, 'Userid is not set! BUG!');
@@ -450,7 +444,7 @@ function doNewUserPassword ($email, $userid) {
array(generateHash($NEW_PASS), $userid), __FUNCTION__, __LINE__);
// Prepare data and message for email
- $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS), $userid);
+ $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
// ... and send it away
sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
@@ -465,7 +459,7 @@ function doNewUserPassword ($email, $userid) {
redirectToUrl('modules.php?module=index&what=login&login='.$errorCode);
}
} else {
- // ID or email is wrong
+ // id or email is wrong
loadTemplate('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}');
}