X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=ef8c29fa9672373c42f9825beeecfbc2be4abb1e;hb=e9a25aaf7b894880cba6eb65948596aa723adc0c;hp=75d9fe3de1494f7841a8413198543cb2e722032c;hpb=5e74abf01f118440bf188f2b3bdf008d09e360d2;p=mailer.git
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 75d9fe3de1..ef8c29fa96 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -18,6 +18,7 @@
* 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 *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -43,23 +44,23 @@ if (!defined('__SECURITY')) {
// Add links for selecting some users
function alpha ($sortby, $colspan, $return=false) {
- if (!isGetRequestElementSet('offset')) setRequestGetElement('offset', 0);
- $add = '&page='.getRequestElement('page').'&offset='.getRequestElement('offset');
- if (isGetRequestElementSet('mode')) $add .= '&mode='.getRequestElement('mode');
+ if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
+ $add = '&page='.getRequestParameter('page').'&offset='.getRequestParameter('offset');
+ if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('mode');
/* Creates the list of letters and makes them a link. */
$alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
$num = count($alphabet) - 1;
$OUT = '';
while (list($counter, $ltr) = each($alphabet)) {
- if (getRequestElement('letter') == $ltr) {
+ if (getRequestParameter('letter') == $ltr) {
// Current letter is letter from URL
$OUT .= '' . $ltr . '';
} else {
// Output link to letter
- $OUT .= '' . $ltr . '';
+ $OUT .= '' . $ltr . '';
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -83,15 +84,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 +100,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')
);
@@ -113,7 +114,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
if ($sortby == $sort) {
$OUT .= '' . $title . ' | ';
} else {
- $OUT .= '' . $title . ' | ';
+ $OUT .= '' . $title . ' | ';
}
} // END - foreach
@@ -133,9 +134,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
}
// Add page navigation
-function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false) {
+function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) {
// @TODO These two constants are no longer used, maybe we reactivate this code?
- //if ($show_form === true) {
+ //if ($showForm === true) {
// // Load form for changing number of lines
// define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true));
// define('__FORM_FOOTER', '| |
');
@@ -146,33 +147,33 @@ function addPageNavigation ($PAGES, $offset, $show_form, $colspan,$return=false)
//}
$OUT = '';
- for ($page = 1; $page <= $PAGES; $page++) {
- if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+ for ($page = 1; $page <= $pages; $page++) {
+ 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 .= '';
}
- if ($page < $PAGES) $OUT .= ' | ';
+ if ($page < $pages) $OUT .= ' | ';
} // END - for
// Remember the list
@@ -210,7 +211,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,6 +222,7 @@ 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';
@@ -266,12 +268,6 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$errorCode = '0';
$ext = '';
- // Add last_login if available
- $lastOnline = '';
- if (getExtensionVersion('sql_patches') >= '0.2.8') {
- $lastOnline = ', `last_login`';
- } // END - if
-
// Init array
$content = array(
'password' => '',
@@ -294,23 +290,26 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
fetchUserData($userid);
}
- // Load entry
- $content = getUserDataArray();
- if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+ // No error found?
+ if ($errorCode == '0') {
+ // Get user data array and set userid (e.g. important if we login with nickname)
+ $content = getUserDataArray();
+ if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+ } // END - if
// Is there an entry?
- if (((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
+ 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);
@@ -323,8 +322,9 @@ 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'];
+ $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 = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
@@ -334,15 +334,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
} // END - if
- // Calculate new hash with the secret key and master salt together
- $content['hash'] = generatePassString($content['hash']);
-
- // Update global array
// @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+
+ // Set member id
setMemberId($userid);
// Try to set session data (which shall normally always work!)
- if ((setSession('userid', $userid )) && (setSession('u_hash', $content['hash']))) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',hash=' . $content['hash'] . '(' . strlen($content['hash']) . ')');
+ if ((setSession('userid', $userid )) && (setSession('u_hash', encodeHashForCookie($content['hash'])))) {
// Update database records
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
array($userid), __FUNCTION__, __LINE__);
@@ -350,7 +349,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Is a success URL set?
if (empty($successUrl)) {
// Procedure to checking for login data
- if (($GLOBALS['bonus_payed']) && (isExtensionActive('bonus'))) {
+ if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
// Bonus added (just displaying!)
$URL = 'modules.php?module=chk_login&mode=bonus';
} else {
@@ -367,7 +366,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
@@ -377,18 +376,18 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Wrong password!
$errorCode = getCode('WRONG_PASS');
}
- } elseif (((isExtensionActive('nickname')) && (isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $userid)) {
- // Other account status?
- if (fetchUserData($userid)) {
- // Create an error code from given status
- $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
- } else {
- // id not found!
- $errorCode = getCode('WRONG_ID');
- }
- } elseif ($errorCode == '0') {
- // 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?