X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=75861062de939c864b922b2aa1e5398816cf4c53;hp=1d39e644e8c7137b035c846dcff87f4d6b57f83d;hb=66b91ce490ab549425619c95fc12086e126d541b;hpb=12d1414024e87153a133bb1d0fe0185ca2c700c5 diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 1d39e644e8..75861062de 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -58,7 +58,7 @@ function alpha ($sortby, $colspan, $return=false) { $OUT .= "".$ltr.""; } else { // Output link to letter - $OUT .= "".$ltr.""; } @@ -93,18 +93,18 @@ function SortLinks ($letter, $sortby, $colspan, $return=false) { $add = "&page=".REQUEST_GET('page')."&offset=".REQUEST_GET('offset'); // Add status or mode - if (REQUEST_ISSET_GET(('status'))) $add .= "&mode=".REQUEST_GET(('status')); - elseif (REQUEST_ISSET_GET('mode')) $add .= "&mode=".REQUEST_GET('mode'); + if (REQUEST_ISSET_GET('status')) $add .= '&mode=' . REQUEST_GET('status'); + elseif (REQUEST_ISSET_GET('mode')) $add .= '&mode=' . REQUEST_GET('mode'); // Makes order by links.. if ($letter == "front") $letter = getMessage('_ALL2'); // Prepare array with all possible sorters $list = array( - 'userid' => getMessage('_UID'), - 'family' => getMessage('FAMILY_NAME'), - 'email' => getMessage('ADDY'), - 'REMOTE_ADDR' => getMessage('REMOTE_IP') + 'userid' => getMessage('_UID'), + 'family' => getMessage('FAMILY_NAME'), + 'email' => getMessage('ADDY'), + 'REMOTE_ADDR' => getMessage('REMOTE_IP') ); // Add nickname if extension is installed @@ -114,16 +114,16 @@ function SortLinks ($letter, $sortby, $colspan, $return=false) { foreach ($list as $sort => $title) { if ($sortby == $sort) { - $OUT .= "".$title." | "; + $OUT .= "" . $title . " | "; } else { - $OUT .= "".$title." | "; + $OUT .= "" . $title . " | "; } } // END - foreach define('__SORT_LIST', substr($OUT, 0, -13)); // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_sort", true); + $OUT = LOAD_TEMPLATE('admin_list_user_sort', true); if ($return === true) { // Return code return $OUT; @@ -135,56 +135,50 @@ function SortLinks ($letter, $sortby, $colspan, $return=false) { // Add page navigation function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) { - if (!$show_form) { - // Empty row - define('__FORM_HEADER', " "); - } else { + if ($show_form) { // Load form for changing number of lines - define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true)); - } - - if (!$show_form) { - // Add line with bottom border - define('__FORM_FOOTER', " "); + define('__FORM_HEADER', LOAD_TEMPLATE('admin_list_user_sort_form', true)); + define('__FORM_FOOTER', ' '); } else { - // Add line without bottom border - define('__FORM_FOOTER', " "); + // Empty row + define('__FORM_HEADER', ' '); + define('__FORM_FOOTER', ' '); } $OUT = ''; for ($page = 1; $page <= $PAGES; $page++) { if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) { - $OUT .= "-"; + $OUT .= '-'; } else { if (!REQUEST_ISSET_GET('letter')) REQUEST_SET_GET('letter', getMessage('_ALL2')); if (!REQUEST_ISSET_GET('sortby')) REQUEST_SET_GET('sortby', 'userid'); // Base link - $OUT .= ""; + $OUT .= '&letter=' . REQUEST_GET('letter') . '&sortby=' . REQUEST_GET('sortby') . '&page=' . $page . '&offset=' . $offset . '">'; } $OUT .= $page; if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET('page')) && ($page == '1'))) { - $OUT .= "-"; + $OUT .= '-'; } else { - $OUT .= ""; + $OUT .= ''; } - if ($page < $PAGES) $OUT .= " | "; + if ($page < $PAGES) $OUT .= ' | '; } // END - for define('__PAGENAV_LIST', $OUT); // Load template - $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true); + $OUT = LOAD_TEMPLATE('admin_list_user_pagenav', true); if ($return === true) { // Return code return $OUT; @@ -195,23 +189,27 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) { } // Create email link to user's account -function USER_generateMemberEmailLink($email, $mod='admin') { +function generateUserEmailLink($email, $mod = 'admin') { // Show contact link only if user is confirmed by default $locked = " AND `status`='CONFIRMED'"; // But admins shall always see it if (IS_ADMIN()) $locked = ''; - $result = SQL_QUERY_ESC("SELECT userid -FROM `{!_MYSQL_PREFIX!}_user_data` -WHERE `email`='%s'".$locked." LIMIT 1", - array($email), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `userid` +FROM + `{!_MYSQL_PREFIX!}_user_data` +WHERE + `email`='%s'" . $locked." +LIMIT 1", + array($email), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load userid list($uid) = SQL_FETCHROW($result); // Rewrite email address to contact link - $email = '{!URL!}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid); + $email = '{?URL?}/modules.php?module=' . $mod . '&what=user_contct&uid=' . bigintval($uid); } // END - if // Free memory @@ -238,7 +236,7 @@ function determineRandomReferalId () { // Look for random user $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1", - array(getConfig('user_min_confirmed'), $randNum), __FUNCTION__, __LINE__); + array(getConfig('user_min_confirmed'), $randNum), __FUNCTION__, __LINE__); // Do we have one entry there? if (SQL_NUMROWS($result) == 1) { @@ -246,8 +244,8 @@ function determineRandomReferalId () { list($refid) = SQL_FETCHROW($result); // Reset this user's counter - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1", - array($refid), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE `userid`=%s LIMIT 1", + array($refid), __FUNCTION__, __LINE__); } // END - if // Free result @@ -260,14 +258,14 @@ function determineRandomReferalId () { } // Do the user login -function USER_DO_LOGIN ($uid, $passwd) { +function USER_DO_LOGIN ($uid, $passwd, $successUrl = '') { // Init variables - $dmy = ''; + $dmy = ''; $add = ''; // Add last_login if available $lastOnline = ''; if (GET_EXT_VERSION('sql_patches') >= '0.2.8') { - $lastOnline = ', last_login'; + $lastOnline = ', `last_login`'; } // END - if // Init array @@ -277,77 +275,79 @@ function USER_DO_LOGIN ($uid, $passwd) { 'last_online' => 0, 'last_login' => 0, 'hash' => '' - ); + ); - // Check login data - if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) { - // 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($uid), __FUNCTION__, __LINE__); - } 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($uid, $content['hash']), __FUNCTION__, __LINE__); - } + // Check login data + if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) { + // 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($uid), __FUNCTION__, __LINE__); + } 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($uid, $content['hash']), __FUNCTION__, __LINE__); + } - // Load entry - $content = SQL_FETCHARRAY($result); - if (!empty($content['userid'])) $uid = bigintval($content['userid']); + // Load entry + $content = SQL_FETCHARRAY($result); + if (!empty($content['userid'])) $uid = bigintval($content['userid']); - // Is there an entry? - if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) { - // Free result - SQL_FREERESULT($result); + // Is there an entry? + if ((SQL_NUMROWS($result) == 1) && ((isNicknameUsed($content['userid'] === true) && (!empty($content['userid']))) || ($content['userid'] == $uid))) { + // Free result + SQL_FREERESULT($result); - // Check for old MD5 passwords - if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { - // Just set the hash to the password from DB... :) - $content['hash'] = $content['password']; - } else { - // Hash password with improved way for comparsion - $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40)); - } + // Check for old MD5 passwords + if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) { + // Just set the hash to the password from DB... :) + $content['hash'] = $content['password']; + } else { + // Hash password with improved way for comparsion + $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40)); + } - // Does the password match the hash? - if ($content['hash'] == $content['password']) { - // New hashed password found so let's generate a new one - $content['hash'] = generateHash($passwd); + // Does the password match the hash? + if ($content['hash'] == $content['password']) { + // New hashed password found so let's generate a new one + $content['hash'] = generateHash($passwd); - // ... and update database - // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1", + // ... and update database + // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1", array($content['hash'], $uid), __FUNCTION__, __LINE__); - // No login bonus by default - $GLOBALS['bonus_payed'] = false; + // No login bonus by default + $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 ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) { - // Add login bonus to user's account - $add = sprintf(", login_bonus=login_bonus+%s", + // Probe for last online timemark + $probe = time() - $content['last_online']; + if (!empty($content['last_login'])) $probe = time() - $content['last_login']; + if ((GET_EXT_VERSION('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') - ); - $GLOBALS['bonus_payed'] = true; + ); + $GLOBALS['bonus_payed'] = true; - // Subtract login bonus from userid's account or jackpot - if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD")) BONUS_POINTS_HANDLER('login_bonus'); - } // END - if + // Subtract login bonus from userid's account or jackpot + if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) BONUS_POINTS_HANDLER('login_bonus'); + } // END - if - // Calculate new hash with the secret key and master salt together - $content['hash'] = generatePassString($content['hash']); + // 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)); - setUserId($uid); + // Update global array + // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON)); + setUserId($uid); - // Try to set session data (which shall normally always work!) - if ((setSession('userid', $uid )) && (setSession('u_hash', $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", + // Try to set session data (which shall normally always work!) + if ((setSession('userid', $uid )) && (setSession('u_hash', $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($uid), __FUNCTION__, __LINE__); - if (SQL_AFFECTEDROWS() == 1) { + if (SQL_AFFECTEDROWS() == 1) { + // Is a success URL set? + if (empty($successUrl)) { // Procedure to checking for login data if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) { // Bonus added (just displaying!) @@ -357,48 +357,52 @@ function USER_DO_LOGIN ($uid, $passwd) { $URL = 'modules.php?module=chk_login&mode=login'; } } else { - // Cannot update counter! - $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED'); + // Use this URL + $URL = $successUrl; } } else { - // Cookies not setable! - $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES'); + // Cannot update counter! + $URL = 'modules.php?module=index&what=login&login='.getCode('CNTR_FAILED'); } - } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') { - // Update failture counter - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1", + } else { + // Cookies not setable! + $URL = 'modules.php?module=index&what=login&login='.getCode('NO_COOKIES'); + } + } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') { + // Update failture counter + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1", array($uid), __FUNCTION__, __LINE__); - // Wrong password! - $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS'); - } - } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) { - // 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", + // Wrong password! + $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_PASS'); + } + } elseif (((isNicknameUsed($content['userid'])) && (!empty($content['userid']))) || ($content['userid'] == $uid)) { + // 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($uid), __FUNCTION__, __LINE__); - // Entry found? - if (SQL_NUMROWS($result) == 1) { - // Load status - list($status) = SQL_FETCHROW($result); + // 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'); - } - - // Construct URL - $URL = 'modules.php?module=index&what=login&login='.$errorCode; + // Create an error code from given status + $errorCode = generateErrorCodeFromUserStatus($status); } else { // ID not found! - $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID'); + $errorCode = getCode('WRONG_ID'); } - // Return URL - return $URL; + // Construct URL + $URL = 'modules.php?module=index&what=login&login='.$errorCode; + } else { + // ID not found! + $URL = 'modules.php?module=index&what=login&login='.getCode('WRONG_ID'); + } + + // Return URL + return $URL; } // Try to send a new password for the given user account @@ -411,18 +415,18 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { $result = false; // Probe userid/nickname - if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) { + if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_IS_ACTIVE($uid))) { // Nickname entered - $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1", - array($uid, $email), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `nickname`='%s' OR `email`='%s' LIMIT 1", + array($uid, $email), __FUNCTION__, __LINE__); } elseif (($uid > 0) && (empty($email))) { // Direct userid entered - $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", - array(bigintval($uid)), __FUNCTION__, __LINE__); + $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1", + array(bigintval($uid)), __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__); + $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! DEBUG_LOG(__FUNCTION__, __LINE__, 'Userid is not set! BUG!'); @@ -437,14 +441,14 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { if ($status == 'CONFIRMED') { // Ooppps, this was missing! ;-) We should update the database... $NEW_PASS = generatePassword(); - SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1", - array(generateHash($NEW_PASS), $uid), __FUNCTION__, __LINE__); + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1", + array(generateHash($NEW_PASS), $uid), __FUNCTION__, __LINE__); // Prepare data and message for email - $msg = LOAD_EMAIL_TEMPLATE('new-pass', array('new_pass' => $NEW_PASS), $uid); + $message = LOAD_EMAIL_TEMPLATE('new-pass', array('new_pass' => $NEW_PASS), $uid); // ... and send it away - sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $msg); + sendEmail($uid, getMessage('GUEST_NEW_PASSWORD'), $message); // Output note to user LOAD_TEMPLATE('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));