X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=5ba0d3f8d912e6b360256d5da0924700922b1980;hb=9dea40187dc40c8e2b642dccae039c681cbc43f9;hp=8e1435575bbc784b2ab413086058ad3e6fdd4a85;hpb=c9eeea4ffb9f186fb8d5207542a0bb0da7028f83;p=mailer.git diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 8e1435575b..5ba0d3f8d9 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -39,33 +39,33 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // 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.""; + $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 @@ -133,9 +133,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 +146,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 +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,6 +221,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 +267,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 +289,23 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p fetchUserData($userid); } - // Load entry + // 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']); // 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 +318,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 +330,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 +345,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 +362,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 +372,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? @@ -406,9 +401,6 @@ 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; @@ -417,8 +409,8 @@ function doNewUserPassword ($email, $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' LIMIT 1", - array($email), __FUNCTION__, __LINE__); + $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",